From 4a00e4c9b1747912b4cf49a07504d8485d076869 Mon Sep 17 00:00:00 2001
From: JackyTang <5206969+jackytang_520@user.noreply.gitee.com>
Date: 星期六, 03 九月 2022 14:14:06 +0800
Subject: [PATCH] update 修复镜像标签命名与docker-compose不一致
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index f4e7dff..60c632a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -54,8 +54,8 @@
@GetMapping("/captchaSms")
public R<Void> smsCaptcha(@NotBlank(message = "{user.phonenumber.not.blank}")
String phonenumber) {
- if (smsProperties.getEnabled()) {
- R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
+ if (!smsProperties.getEnabled()) {
+ return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚煭淇″姛鑳斤紒");
}
String key = CacheConstants.CAPTCHA_CODE_KEY + phonenumber;
String code = RandomUtil.randomNumbers(4);
@@ -79,9 +79,9 @@
@GetMapping("/captchaImage")
public R<Map<String, Object>> getCode() {
Map<String, Object> ajax = new HashMap<>();
- boolean captchaOnOff = configService.selectCaptchaOnOff();
- ajax.put("captchaOnOff", captchaOnOff);
- if (!captchaOnOff) {
+ boolean captchaEnabled = configService.selectCaptchaEnabled();
+ ajax.put("captchaEnabled", captchaEnabled);
+ if (!captchaEnabled) {
return R.ok(ajax);
}
// 淇濆瓨楠岃瘉鐮佷俊鎭�
--
Gitblit v1.9.3