From afb74b6bb1dbb3ea0c0f4eb206d803f30c60ffc2 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 30 十二月 2022 16:15:17 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/sys/UserService.java | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
index 8d49085..7603f23 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -1,19 +1,19 @@
package com.lf.server.service.sys;
-import com.lf.server.entity.all.RedisCacheKey;
-import com.lf.server.entity.all.SettingData;
+import com.lf.server.entity.sys.RoleEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.Md5Helper;
import com.lf.server.helper.RsaHelper;
import com.lf.server.helper.StringHelper;
import com.lf.server.mapper.sys.UserMapper;
+import com.lf.server.service.all.CommonsFileuploadService;
import com.lf.server.service.all.RedisService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.cache.RedisCache;
import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.concurrent.TimeUnit;
/**
* 鐢ㄦ埛琛�
@@ -28,6 +28,14 @@
@Autowired
RedisService redisService;
+
+ @Autowired
+ LoginService loginService;
+
+ @Autowired
+ TokenService tokenService;
+
+ private final static Log log = LogFactory.getLog(UserService.class);
@Override
public Integer selectCount(String uname) {
@@ -61,6 +69,26 @@
@Override
public UserEntity selectByToken(String token) {
return userMapper.selectByToken(token);
+ }
+
+ @Override
+ public Integer selectForIsAdmin(Integer id) {
+ return userMapper.selectForIsAdmin(id);
+ }
+
+ @Override
+ public List<UserEntity> selectAdminUsers(Integer type) {
+ return userMapper.selectAdminUsers(type);
+ }
+
+ @Override
+ public List<RoleEntity> selectRoleByUserId(Integer id) {
+ return userMapper.selectRoleByUserId(id);
+ }
+
+ @Override
+ public List<UserEntity> selectUserByRoleId(Integer roleId) {
+ return userMapper.selectUserByRoleId(roleId);
}
@Override
@@ -125,9 +153,9 @@
}
/**
- * 楠岃瘉鏂扮敤鎴峰瘑鐮�
+ * 楠岃瘉鐧诲綍鐢ㄦ埛瀵嗙爜
*/
- public String validateNewPwd(UserEntity entity) {
+ public String validateLoginPwd(UserEntity entity) {
try {
String str = validateUserEntity(entity);
if (str != null) {
@@ -137,17 +165,47 @@
// 瑙ｅ瘑
String uid = RsaHelper.decrypt(entity.getUid());
String pwd = RsaHelper.decrypt(entity.getPwd());
+
+ entity.setUid(uid);
+ entity.setPwd(pwd);
+
+ if (tokenService.isUidDisable(entity)) {
+ return "鐢ㄦ埛ID宸茬鐢�";
+ }
+
+ return null;
+ } catch (Exception ex) {
+ log.error(ex.getMessage(), ex);
+ return "瑙ｅ瘑澶辫触";
+ }
+ }
+
+ /**
+ * 楠岃瘉鏂扮敤鎴峰瘑鐮�
+ */
+ @SuppressWarnings("AlibabaRemoveCommentedCode")
+ public String validateNewPwd(UserEntity entity) {
+ try {
+ String str = validateUserEntity(entity);
+ if (str != null) {
+ return str;
+ }
+
+ // 瑙ｅ瘑
+ String uid = RsaHelper.decrypt(entity.getUid());
+ /*String pwd = RsaHelper.decrypt(entity.getPwd());
if (!StringHelper.checkPwdValid(pwd)) {
return "瀵嗙爜涓嶇鍚堣姹�";
}
String newPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
- entity.setPwd(newPwd);
+ entity.setPwd(newPwd);*/
entity.setUid(uid);
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ log.error(ex.getMessage(), ex);
+ return "瑙ｅ瘑澶辫触";
}
}
@@ -173,8 +231,8 @@
return "娌℃湁鎵惧埌鐢ㄦ埛";
}
if (!Md5Helper.validatePassword(pwd, ue.getPwd())) {
- //
- return "鏃у瘑鐮佽緭鍏ラ敊璇�";
+ tokenService.setPwdErrCache(ue);
+ return "鏃у瘑鐮佷笉姝ｇ‘";
}
if (!StringHelper.checkPwdValid(salt)) {
return "瀵嗙爜涓嶇鍚堣姹�";
@@ -187,7 +245,8 @@
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ log.error(ex.getMessage(), ex);
+ return "瑙ｅ瘑澶辫触";
}
}
@@ -205,12 +264,13 @@
try {
String pwd = RsaHelper.decrypt(adminPwd);
if (!Md5Helper.validatePassword(pwd, ue.getPwd())) {
+ tokenService.setPwdErrCache(ue);
return "绠＄悊鍛樺瘑鐮佷笉姝ｇ‘";
}
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ return "瑙ｅ瘑澶辫触";
}
}
@@ -233,7 +293,8 @@
return null;
} catch (Exception ex) {
- return "瀵嗙爜瑙ｅ瘑澶辫触";
+ log.error(ex.getMessage(), ex);
+ return "瑙ｅ瘑澶辫触";
}
}
}
--
Gitblit v1.9.3