From f2aec325030584c48dd46acc1997fe12b37938e4 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 一月 2024 13:56:14 +0800
Subject: [PATCH] zjh 2024/01/02--2

---
 ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java |   30 ++++++++++++++++++------------
 ltkj-admin/src/main/resources/application.yml                                    |    1 +
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 2976724..9137db1 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -214,6 +214,7 @@
   path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
 #  path: http://192.168.0.5:5000/ltkj-admin
 #   path: http://10.168.0.9:5011
+#   path: http://192.168.0.105:5011
 #  path: http://192.168.0.99:8081/ltkj-admin
 
 
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index 7722c26..a1c5506 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -117,6 +117,7 @@
         try {
             //鐧诲綍瀵嗙爜瑙e瘑
             String s = RsaUtils.decryptByPrivateKey(password);
+//            String s = password;
             if(username.equals("10001")){
                 s=username+s;
             }
@@ -217,19 +218,24 @@
      */
     public String Cuslogin(String username, String password, Boolean type,String code,String uuid) {
 
-        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
-        String captcha = redisCache.getCacheObject(verifyKey);
-        redisCache.deleteObject(verifyKey);
-        if (captcha == null)
-        {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
-            throw new CaptchaExpireException();
+        String aSwitch = configService.selectConfigByKey("captcha_switch");
+        if(null !=aSwitch && aSwitch.equals("Y")){
+            String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+            String captcha = redisCache.getCacheObject(verifyKey);
+            redisCache.deleteObject(verifyKey);
+            if (captcha == null)
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));
+                throw new CaptchaExpireException();
+            }
+            if (!code.equalsIgnoreCase(captcha))
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
+                throw new CaptchaException();
+            }
         }
-        if (!code.equalsIgnoreCase(captcha))
-        {
-            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));
-            throw new CaptchaException();
-        }
+
+
         LoginUser loginUser = loadCusByCusname(username, password);
         if (loginUser == null) {
             return "鐢ㄦ埛鍚嶆垨瀵嗙爜閿欒";

--
Gitblit v1.8.0