File tree Expand file tree Collapse file tree 2 files changed +27
-13
lines changed
main/java/io/github/talelin/latticy/service/impl
test/java/io/github/talelin/latticy/service/impl Expand file tree Collapse file tree 2 files changed +27
-13
lines changed Original file line number Diff line number Diff line change @@ -101,10 +101,27 @@ public UserDO updateUserInfo(UpdateInfoDTO dto) {
101
101
if (exist ) {
102
102
throw new ForbiddenException (10071 );
103
103
}
104
+
105
+ boolean changeSuccess = userIdentityService .changeUsername (user .getId (), dto .getUsername ());
106
+ if (changeSuccess ) {
107
+ user .setUsername (dto .getUsername ());
108
+ }
109
+ }
110
+
111
+ // todo 增加工具类实现忽略 null 的 BeanCopy,简化这段代码
112
+ if (dto .getUsername () != null ) {
104
113
user .setUsername (dto .getUsername ());
105
- userIdentityService .changeUsername (user .getId (), dto .getUsername ());
106
114
}
107
- BeanUtils .copyProperties (dto , user );
115
+ if (dto .getAvatar () != null ) {
116
+ user .setAvatar (dto .getAvatar ());
117
+ }
118
+ if (dto .getEmail () != null ) {
119
+ user .setEmail (dto .getEmail ());
120
+ }
121
+ if (dto .getNickname () != null ) {
122
+ user .setNickname (dto .getNickname ());
123
+ }
124
+
108
125
this .baseMapper .updateById (user );
109
126
return user ;
110
127
}
Original file line number Diff line number Diff line change @@ -134,16 +134,13 @@ public void updateUserInfoNoUsername() {
134
134
135
135
@ Test
136
136
public void changeUserPassword () {
137
- // TODO 待解决 单独执行不会抛出空指针异常,批量执行则会抛出空指针异常。
138
- assertThrows (NullPointerException .class , () -> {
139
- ChangePasswordDTO dto = new ChangePasswordDTO ();
140
- dto .setNewPassword ("147258" );
141
- dto .setConfirmPassword ("147258" );
142
- dto .setOldPassword ("123456" );
143
- UserDO user = userService .changeUserPassword (dto );
144
- boolean b = userIdentityService .verifyUsernamePassword (user .getId (), "pedro" , "147258" );
145
- assertTrue (b );
146
- });
137
+ ChangePasswordDTO dto = new ChangePasswordDTO ();
138
+ dto .setNewPassword ("147258" );
139
+ dto .setConfirmPassword ("147258" );
140
+ dto .setOldPassword ("123456" );
141
+ UserDO user = userService .changeUserPassword (dto );
142
+ boolean b = userIdentityService .verifyUsernamePassword (user .getId (), "pedro" , "147258" );
143
+ assertTrue (b );
147
144
}
148
145
149
146
@ Test
@@ -204,4 +201,4 @@ public void checkCreateAndDeleteUser() {
204
201
UserDO newUser = userService .createUser (dto );
205
202
assertEquals (newUser .getUsername (), "pedro111" );
206
203
}
207
- }
204
+ }
You can’t perform that action at this time.
0 commit comments