|  | @@ -6,11 +6,14 @@ import com.ym.mec.auth.service.SysUserRoleService;
 | 
											
												
													
														|  |  import com.ym.mec.auth.service.SysUserService;
 |  |  import com.ym.mec.auth.service.SysUserService;
 | 
											
												
													
														|  |  import com.ym.mec.auth.web.controller.queryInfo.SysUserQueryInfo;
 |  |  import com.ym.mec.auth.web.controller.queryInfo.SysUserQueryInfo;
 | 
											
												
													
														|  |  import com.ym.mec.common.controller.BaseController;
 |  |  import com.ym.mec.common.controller.BaseController;
 | 
											
												
													
														|  | 
 |  | +import com.ym.mec.common.entity.ImResult;
 | 
											
												
													
														|  | 
 |  | +import com.ym.mec.common.entity.ImUserModel;
 | 
											
												
													
														|  |  import com.ym.mec.common.exception.BizException;
 |  |  import com.ym.mec.common.exception.BizException;
 | 
											
												
													
														|  |  import com.ym.mec.common.security.AuthUser;
 |  |  import com.ym.mec.common.security.AuthUser;
 | 
											
												
													
														|  |  import com.ym.mec.common.security.SecurityConstants;
 |  |  import com.ym.mec.common.security.SecurityConstants;
 | 
											
												
													
														|  |  import com.ym.mec.common.security.SecurityUtils;
 |  |  import com.ym.mec.common.security.SecurityUtils;
 | 
											
												
													
														|  |  import com.ym.mec.common.service.IdGeneratorService;
 |  |  import com.ym.mec.common.service.IdGeneratorService;
 | 
											
												
													
														|  | 
 |  | +import com.ym.mec.im.ImFeignService;
 | 
											
												
													
														|  |  import com.ym.mec.util.date.DateUtil;
 |  |  import com.ym.mec.util.date.DateUtil;
 | 
											
												
													
														|  |  import io.swagger.annotations.Api;
 |  |  import io.swagger.annotations.Api;
 | 
											
												
													
														|  |  import io.swagger.annotations.ApiImplicitParam;
 |  |  import io.swagger.annotations.ApiImplicitParam;
 | 
											
										
											
												
													
														|  | @@ -35,6 +38,8 @@ public class UserController extends BaseController {
 | 
											
												
													
														|  |  	@Autowired
 |  |  	@Autowired
 | 
											
												
													
														|  |  	private SysRoleService sysRoleService;
 |  |  	private SysRoleService sysRoleService;
 | 
											
												
													
														|  |  	@Autowired
 |  |  	@Autowired
 | 
											
												
													
														|  | 
 |  | +	private ImFeignService imFeignService;
 | 
											
												
													
														|  | 
 |  | +	@Autowired
 | 
											
												
													
														|  |  	private SysUserRoleService sysUserRoleService;
 |  |  	private SysUserRoleService sysUserRoleService;
 | 
											
												
													
														|  |  	@Autowired
 |  |  	@Autowired
 | 
											
												
													
														|  |  	private IdGeneratorService smsCodeService;
 |  |  	private IdGeneratorService smsCodeService;
 | 
											
										
											
												
													
														|  | @@ -123,6 +128,10 @@ public class UserController extends BaseController {
 | 
											
												
													
														|  |  		}else {
 |  |  		}else {
 | 
											
												
													
														|  |  			sysUser.setUsername(username);
 |  |  			sysUser.setUsername(username);
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  | 
 |  | +		if(StringUtils.isEmpty(sysUser.getImToken())){
 | 
											
												
													
														|  | 
 |  | +			ImResult register = imFeignService.register(new ImUserModel(sysUser.getId().toString(), username, sysUser.getAvatar()));
 | 
											
												
													
														|  | 
 |  | +			sysUser.setImToken(register.getToken());
 | 
											
												
													
														|  | 
 |  | +		}
 | 
											
												
													
														|  |  		password = new BCryptPasswordEncoder().encode(password);
 |  |  		password = new BCryptPasswordEncoder().encode(password);
 | 
											
												
													
														|  |  		sysUser.setPassword(password);
 |  |  		sysUser.setPassword(password);
 | 
											
												
													
														|  |  		sysUser.setUpdateTime(new Date());
 |  |  		sysUser.setUpdateTime(new Date());
 |