Commit ffd41ff4 by songzhenmin

fix:登录密码忽略大小写

parent 5f27f44a
...@@ -46,7 +46,7 @@ public class TokenUtil { ...@@ -46,7 +46,7 @@ public class TokenUtil {
*/ */
public static boolean checkToken(String token) { public static boolean checkToken(String token) {
SysUser user = (SysUser)RedisUtil.get(token); SysUser user = (SysUser)RedisUtil.get(token);
boolean result = user != null && JWTUtil.verifier(token,user.getPassword()); boolean result = user != null && JWTUtil.verifier(token,String.valueOf(user.getId()));
if(result){ if(result){
RedisUtil.expire(token,TOKEN_TIME_OUT); RedisUtil.expire(token,TOKEN_TIME_OUT);
} }
......
...@@ -32,8 +32,8 @@ public class LoginServiceImpl implements LoginService { ...@@ -32,8 +32,8 @@ public class LoginServiceImpl implements LoginService {
LoginInfo loginInfo = new LoginInfo(); LoginInfo loginInfo = new LoginInfo();
SysUser user = userServiceImpl.findByLoginName(logName); SysUser user = userServiceImpl.findByLoginName(logName);
if(user != null && user.getPassword().equals(AESUtil.encrypt(password))){ if(user != null && AESUtil.decrypt(user.getPassword()).equalsIgnoreCase(password)){
String token = TokenUtil.getToken(AESUtil.encrypt(password),user); String token = TokenUtil.getToken(String.valueOf(user.getId()),user);
//修改ip以及最后登录时间 //修改ip以及最后登录时间
user.setLastIp(ip); user.setLastIp(ip);
user.setLastTime(new Date()); user.setLastTime(new Date());
......
...@@ -64,7 +64,7 @@ public class TokenUtil { ...@@ -64,7 +64,7 @@ public class TokenUtil {
*/ */
public static boolean checkToken(String token) { public static boolean checkToken(String token) {
SysUser user = (SysUser)RedisUtil.get(token); SysUser user = (SysUser)RedisUtil.get(token);
boolean result = user != null && JWTUtil.verifier(token,user.getPassword()); boolean result = user != null && JWTUtil.verifier(token,String.valueOf(user.getId()));
if(result){ if(result){
RedisUtil.expire(token,TOKEN_TIME_OUT); RedisUtil.expire(token,TOKEN_TIME_OUT);
} }
......
...@@ -64,8 +64,8 @@ public class LoginServiceImpl implements LoginService { ...@@ -64,8 +64,8 @@ public class LoginServiceImpl implements LoginService {
if(sysConfigService.getStateByKey(SysConfigKeyType.PWD_TIME_LIMIT.getCode()) if(sysConfigService.getStateByKey(SysConfigKeyType.PWD_TIME_LIMIT.getCode())
&& DateUtils.getDaysBetween(user.getLastUpdatePwdTime(), new Date()) > 90) && DateUtils.getDaysBetween(user.getLastUpdatePwdTime(), new Date()) > 90)
throw new DBConfigurationError("您已经超过90天没有更换密码,请修改密码后再登录!"); throw new DBConfigurationError("您已经超过90天没有更换密码,请修改密码后再登录!");
if (user != null && user.getPassword().equals(AESUtil.encrypt(password)) && (user.getMacAddress() == null || user.getMacAddress().equals(macAddrss))) { if (user != null && AESUtil.decrypt(user.getPassword()).equalsIgnoreCase(password) && (user.getMacAddress() == null || user.getMacAddress().equals(macAddrss))) {
String token = TokenUtil.getToken(AESUtil.encrypt(password), user); String token = TokenUtil.getToken(String.valueOf(user.getId()), user);
setUserTokenList(token, user); setUserTokenList(token, user);
//修改ip以及最后登录时间、MAC地址 //修改ip以及最后登录时间、MAC地址
user.setLastIp(ip); user.setLastIp(ip);
...@@ -172,7 +172,7 @@ public class LoginServiceImpl implements LoginService { ...@@ -172,7 +172,7 @@ public class LoginServiceImpl implements LoginService {
public boolean updatePass(String logName, String oldPassword, String newPassword) { public boolean updatePass(String logName, String oldPassword, String newPassword) {
int result = 0; int result = 0;
SysUser user = userServiceImpl.findByLoginName(logName); 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.setPassword(AESUtil.encrypt(newPassword));
user.setLastUpdatePwdTime(new Date()); user.setLastUpdatePwdTime(new Date());
result = sysUserMapper.updateByPrimaryKey(user); result = sysUserMapper.updateByPrimaryKey(user);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment