fix：登录密码忽略大小写

hs-admin/src/main/java/com/hs/admin/service/impl/LoginServiceImpl.java

@@ -32,8 +32,8 @@ public class LoginServiceImpl implements LoginService {
         LoginInfo loginInfo = new LoginInfo();
 
         SysUser user = userServiceImpl.findByLoginName(logName);
-        if(user != null && user.getPassword().equals(AESUtil.encrypt(password))){
-            String token = TokenUtil.getToken(AESUtil.encrypt(password),user);
+        if(user != null && AESUtil.decrypt(user.getPassword()).equalsIgnoreCase(password)){
+            String token = TokenUtil.getToken(String.valueOf(user.getId()),user);
             //修改ip以及最后登录时间
             user.setLastIp(ip);
             user.setLastTime(new Date());

hs-api/src/main/java/com/hs/api/service/Impl/LoginServiceImpl.java

@@ -18,6 +18,7 @@ import com.hs.api.service.SysConfigService;
 import com.hs.api.service.UserService;
 import com.hs.common.utils.RedisUtil;
 import com.hs.common.utils.StringUtil;
+import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -64,8 +65,8 @@ public class LoginServiceImpl implements LoginService {
         if(sysConfigService.getStateByKey(SysConfigKeyType.PWD_TIME_LIMIT.getCode())
                 && DateUtils.getDaysBetween(user.getLastUpdatePwdTime(), new Date()) > 90)
             throw new DBConfigurationError("您已经超过90天没有更换密码，请修改密码后再登录！");
-        if (user != null && user.getPassword().equals(AESUtil.encrypt(password)) && (user.getMacAddress() == null || user.getMacAddress().equals(macAddrss))) {
-            String token = TokenUtil.getToken(AESUtil.encrypt(password), user);
+        if (user != null && AESUtil.decrypt(user.getPassword()).equalsIgnoreCase(password) && (user.getMacAddress() == null || user.getMacAddress().equals(macAddrss))) {
+            String token = TokenUtil.getToken(String.valueOf(user.getId()), user);
             setUserTokenList(token, user);
             //修改ip以及最后登录时间、MAC地址
             user.setLastIp(ip);
@@ -94,12 +95,6 @@ public class LoginServiceImpl implements LoginService {
 
             //查询病案信息
             SysVersion version = sysVersionMapper.selectLastDate();
-            //add 检查发布功能  by mengchao 2021-05-24 begin
-            if(sysConfigService.getStateByKey(SysConfigKeyType.BAH_CXRQ_CONTROL.getCode()) && !user.getIsAdmin())
-            {
-                version.setBahDate(version.getBahDate()-1);
-            }
-            // add end
             loginInfo.setVersion(version);
             RedisUtil.del(user.getUserCode());
         } else {
@@ -172,7 +167,7 @@ public class LoginServiceImpl implements LoginService {
     public boolean updatePass(String logName, String oldPassword, String newPassword) {
         int result = 0;
         SysUser user = userServiceImpl.findByLoginName(logName);
-        if (user != null && user.getPassword().equals(AESUtil.encrypt(oldPassword))) {
+        if (user != null && AESUtil.decrypt(user.getPassword()).equalsIgnoreCase(oldPassword)) {
             user.setPassword(AESUtil.encrypt(newPassword));
             user.setLastUpdatePwdTime(new Date());
             result = sysUserMapper.updateByPrimaryKey(user);