From 8cdd6aa032dd72c5101099b7e8f156394e90b83c Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 30 一月 2023 16:15:41 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/service/sys/UserService.java |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 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 8e539b6..5e6c186 100644
--- a/src/main/java/com/lf/server/service/sys/UserService.java
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -1,11 +1,14 @@
 package com.lf.server.service.sys;
 
+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.RedisService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +33,8 @@
 
     @Autowired
     TokenService tokenService;
+
+    private final static Log log = LogFactory.getLog(UserService.class);
 
     @Override
     public Integer selectCount(String uname) {
@@ -63,6 +68,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
@@ -149,6 +174,7 @@
 
             return null;
         } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             return "瑙ｅ瘑澶辫触";
         }
     }
@@ -156,6 +182,7 @@
     /**
      * 楠岃瘉鏂扮敤鎴峰瘑鐮�
      */
+    @SuppressWarnings("AlibabaRemoveCommentedCode")
     public String validateNewPwd(UserEntity entity) {
         try {
             String str = validateUserEntity(entity);
@@ -165,17 +192,18 @@
 
             // 瑙ｅ瘑
             String uid = RsaHelper.decrypt(entity.getUid());
-            String pwd = RsaHelper.decrypt(entity.getPwd());
-            if (!StringHelper.checkPwdValid(pwd)) {
+            /*String pwd = RsaHelper.decrypt(entity.getPwd());
+            if (!StringHelper.isPwdValid(pwd)) {
                 return "瀵嗙爜涓嶇鍚堣姹�";
             }
 
             String newPwd = Md5Helper.reverse(Md5Helper.generate(pwd));
-            entity.setPwd(newPwd);
+            entity.setPwd(newPwd);*/
             entity.setUid(uid);
 
             return null;
         } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             return "瑙ｅ瘑澶辫触";
         }
     }
@@ -205,7 +233,7 @@
                 tokenService.setPwdErrCache(ue);
                 return "鏃у瘑鐮佷笉姝ｇ‘";
             }
-            if (!StringHelper.checkPwdValid(salt)) {
+            if (StringHelper.isPwdInvalid(salt)) {
                 return "瀵嗙爜涓嶇鍚堣姹�";
             }
 
@@ -216,6 +244,7 @@
 
             return null;
         } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             return "瑙ｅ瘑澶辫触";
         }
     }
@@ -254,7 +283,7 @@
 
         try {
             String pwd = RsaHelper.decrypt(newPwd);
-            if (!StringHelper.checkPwdValid(pwd)) {
+            if (StringHelper.isPwdInvalid(pwd)) {
                 return "瀵嗙爜涓嶇鍚堣姹�";
             }
 
@@ -263,6 +292,7 @@
 
             return null;
         } catch (Exception ex) {
+            log.error(ex.getMessage(), ex);
             return "瑙ｅ瘑澶辫触";
         }
     }

--
Gitblit v1.9.3