From 4884f2bc65c73ce5c25f8efee0d1f2a27663a57e Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 02 四月 2024 17:16:27 +0800
Subject: [PATCH] zjh 2024/04/02-1
---
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
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 910b304..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 {
//鐧诲綍瀵嗙爜瑙ｅ瘑
String s = RsaUtils.decryptByPrivateKey(password);
+// String s = password;
if(username.equals("10001")){
s=username+s;
}
@@ -153,7 +154,7 @@
if(!SecurityUtils.isAdmin(user.getUserId())){
if(dictHosp.getSecretKey() != null && dictHosp.getExpirationTime() != null){
if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),
- dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
+ dictHosp.getExpirationTime(),dictHosp.getSecretKey()) || new Date().after(DateUtil.endOfDay(dictHosp.getExpirationTime()))) {
throw new SecretKeyException("鍟嗗宸茶繃鏈熻缁垂浣跨敤");
}
long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
@@ -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