|
@@ -102,11 +102,11 @@ public class SysLoginService {
|
|
|
throw new WeComException("密码解密失败!");
|
|
throw new WeComException("密码解密失败!");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-// if ("admin".equals(userName)) {
|
|
|
|
|
-// if (!SecurityUtils.matchesPassword(password, sysUser.getPassword())) {
|
|
|
|
|
-// throw new WeComException("用户名或密码错误,请重新输入");
|
|
|
|
|
-// }
|
|
|
|
|
-// }else {
|
|
|
|
|
|
|
+ if ("admin".equals(userName)) {
|
|
|
|
|
+ if (!SecurityUtils.matchesPassword(password, sysUser.getPassword())) {
|
|
|
|
|
+ throw new WeComException("用户名或密码错误,请重新输入");
|
|
|
|
|
+ }
|
|
|
|
|
+ }else {
|
|
|
if (StringUtils.isEmpty(sysUser.getPassword())) {
|
|
if (StringUtils.isEmpty(sysUser.getPassword())) {
|
|
|
// 设置默认密码
|
|
// 设置默认密码
|
|
|
sysUser.setPassword(new BCryptPasswordEncoder().encode("zmbx@Z023"));
|
|
sysUser.setPassword(new BCryptPasswordEncoder().encode("zmbx@Z023"));
|
|
@@ -117,7 +117,7 @@ public class SysLoginService {
|
|
|
throw new WeComException("用户名或密码错误,请重新输入");
|
|
throw new WeComException("用户名或密码错误,请重新输入");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-// }
|
|
|
|
|
|
|
+ }
|
|
|
LoginUser sysUserVo = findLoginUser(sysUser);
|
|
LoginUser sysUserVo = findLoginUser(sysUser);
|
|
|
|
|
|
|
|
// 生成token
|
|
// 生成token
|