liyudong/defence_strong_enemy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: liyudong:d44b61e03022f755a4ba45ec49674a769de842f2
Branches Tags
liyudong:main
..
compare: liyudong:8fea8b75dc997b0853fea0c8b7eac7bd15d36e3e
Branches Tags
liyudong:main

2 Commits
d44b61e030 ... 8fea8b75dc

Author SHA1 Message Date
wangwenhua
8fea8b75dc Merge branch 'main' of http://git.hivekion.com:3000/liyudong/defence_strong_enemy 2025-09-28 16:55:02 +08:00
wangwenhua
c9fba53a60 第三方登录 2025-09-28 16:54:34 +08:00
2 changed files with 6 additions and 2 deletions
Show Stats Expand all files Collapse all files

6
src/main/java/com/hshh/nation/login/controller/LoginController.java
View File

@ -217,6 +217,7 @@ public class LoginController extends BaseController {
newUser.setUserName(user.getUserName()); newUser.setUserName(user.getUserName());
newUser.setPassword(new BCryptPasswordEncoder().encode(user.getPassword())); newUser.setPassword(new BCryptPasswordEncoder().encode(user.getPassword()));
newUser.setNickName(user.getNickName()); newUser.setNickName(user.getNickName());
newUser.setOriginalPassword("");
newUser.setSuperFlag(1); newUser.setSuperFlag(1);
userService.save(newUser); userService.save(newUser);
} else { } else {
@ -225,7 +226,7 @@ public class LoginController extends BaseController {
} }
LoginForm loginForm = new LoginForm(); LoginForm loginForm = new LoginForm();
loginForm.setUsername(user.getUserName()); loginForm.setUsername(user.getUserName());
loginForm.setPassword(user.getPassword()); loginForm.setPassword(user.getOriginalPassword());
return loginForm; return loginForm;
} }
} }
@ -242,7 +243,8 @@ public class LoginController extends BaseController {
user.setUserName(userObject.getString("userName")); user.setUserName(userObject.getString("userName"));
user.setNickName(userObject.getString("nickName")); user.setNickName(userObject.getString("nickName"));
user.setPassword(userObject.getString("password")); // user.setPassword(userObject.getString("password"));
user.setPassword("");
return user; return user;
} }

2
src/main/java/com/hshh/nation/user/entity/User.java
View File

@ -46,4 +46,6 @@ public class User implements Serializable {
private int superFlag; private int superFlag;
private String userId; private String userId;
private String originalPassword;
} }