Merge branch 'zouxuan_saas_2022_0606' of http://git.dayaedu.com/yonge/mec into master_saas

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -136,9 +136,8 @@ public class UserController extends BaseController {
 
 	@ApiOperation(value = "设置密码")
 	@PostMapping(value = "/setPassword", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-	@ApiImplicitParams({@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String"),
-			@ApiImplicitParam(name = "username", value = "用户名", required = true, dataType = "String") })
-	public Object setPassword(String password, String username) {
+	@ApiImplicitParam(name = "password", value = "密码", required = true, dataType = "String")
+	public Object setPassword(String password) {
 		if (StringUtils.isEmpty(password)) {
 			return failed("参数校验失败");
 		}
@@ -150,19 +149,13 @@ public class UserController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户不存在");
 		}
-		if(sysUser.getUserType().contains("TEACHER") || sysUser.getUserType().contains("SYSTEM")){
-			sysUser.setRealName(username);
-		}else {
-			sysUser.setUsername(username);
-		}
 		if(StringUtils.isEmpty(sysUser.getImToken())){
+			String username = sysUser.getUsername();
+			if(sysUser.getUserType().contains("TEACHER") || sysUser.getUserType().contains("SYSTEM")){
+				username = sysUser.getRealName();
+			}
 			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
 			sysUser.setImToken(register.getToken());
-		}else {
-			imFeignService.update(new ImUserModel(sysUser.getId().toString(),username,sysUser.getAvatar()));
-		}
-		if(StringUtils.isNotEmpty(username)){
-			webFeignService.updateNickName(sysUser.getId(),username);
 		}
 		password = new BCryptPasswordEncoder().encode(password);
 		sysUser.setPassword(password);