From b4b962e1ca05abd8bfc63c80f1adc3df5cfa1a24 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 26 六月 2023 13:00:06 +0800
Subject: [PATCH] 增加电能和蒸汽消耗，完善工单机器状态
---
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
index e9a5feb..80fbe0e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
@@ -88,26 +88,26 @@
//update-begin--Author:scott Date:20190805 for锛氭殏鏃舵敞閲婃帀瀵嗙爜鍔犲瘑閫昏緫锛屾湁鐐归棶棰�
//update-begin-author:taoyan date:20190828 for:鏍￠獙楠岃瘉鐮�
- String captcha = sysLoginModel.getCaptcha();
- if(captcha==null){
- result.error500("楠岃瘉鐮佹棤鏁�");
- return result;
- }
- String lowerCaseCaptcha = captcha.toLowerCase();
+// String captcha = sysLoginModel.getCaptcha();
+// if(captcha==null){
+// result.error500("楠岃瘉鐮佹棤鏁�");
+// return result;
+// }
+// String lowerCaseCaptcha = captcha.toLowerCase();
//update-begin-author:taoyan date:2022-9-13 for: VUEN-2245 銆愭紡娲炪�戝彂鐜版柊婕忔礊寰呭鐞�20220906
// 鍔犲叆瀵嗛挜浣滀负娣锋穯锛岄伩鍏嶇畝鍗曠殑鎷兼帴锛岃澶栭儴鍒╃敤锛岀敤鎴疯嚜瀹氫箟璇ュ瘑閽ュ嵆鍙�
- String origin = lowerCaseCaptcha+sysLoginModel.getCheckKey()+jeecgBaseConfig.getSignatureSecret();
+ String origin = sysLoginModel.getCheckKey()+jeecgBaseConfig.getSignatureSecret();
String realKey = Md5Util.md5Encode(origin, "utf-8");
//update-end-author:taoyan date:2022-9-13 for: VUEN-2245 銆愭紡娲炪�戝彂鐜版柊婕忔礊寰呭鐞�20220906
Object checkCode = redisUtil.get(realKey);
//褰撹繘鍏ョ櫥褰曢〉鏃讹紝鏈変竴瀹氬嚑鐜囧嚭鐜伴獙璇佺爜閿欒 #1714
- if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
- log.warn("楠岃瘉鐮侀敊璇紝key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode);
- result.error500("楠岃瘉鐮侀敊璇�");
- // 鏀规垚鐗规畩鐨刢ode 渚夸簬鍓嶇鍒ゆ柇
- result.setCode(HttpStatus.PRECONDITION_FAILED.value());
- return result;
- }
+// if(checkCode==null || !checkCode.toString().equals(lowerCaseCaptcha)) {
+// log.warn("楠岃瘉鐮侀敊璇紝key= {} , Ui checkCode= {}, Redis checkCode = {}", sysLoginModel.getCheckKey(), lowerCaseCaptcha, checkCode);
+// result.error500("楠岃瘉鐮侀敊璇�");
+// // 鏀规垚鐗规畩鐨刢ode 渚夸簬鍓嶇鍒ゆ柇
+// result.setCode(HttpStatus.PRECONDITION_FAILED.value());
+// return result;
+// }
//update-end-author:taoyan date:20190828 for:鏍￠獙楠岃瘉鐮�
//1. 鏍￠獙鐢ㄦ埛鏄惁鏈夋晥
--
Gitblit v1.9.3