diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java index 4f317bf99..1f8f0099d 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java @@ -210,22 +210,23 @@ public class ThirdPartyOAth2Cotroller { r=remoteTokenService.generateToken(userTokenDTO); }else { //自动注册 - UserDTO userDTO = new UserDTO(); -// userDTO.setDeptId(1865990541445263361L); - userDTO.setName(zzdUserDTO.getUsername()); - userDTO.setNickname(zzdUserDTO.getUsername()); - userDTO.setSystemType("2"); - userDTO.setPhone(mobile); - userDTO.setCreateBy("诗画自动创建"); - //赋予随机密码 - userDTO.setPassword("pj*"+ UUID.randomUUID()); - R booleanR = remoteUserService.registerUser(userDTO); - R> userByMobile=remoteUserService.getUserByMobile(mobile); - SysUser sysUser = userByMobile.getData().get(0); - UserTokenDTO userTokenDTO = new UserTokenDTO(); - userTokenDTO.setSysUser(sysUser); -// //登录成功,根据新注册的用户信息返回token - r=remoteTokenService.generateToken(userTokenDTO); +// UserDTO userDTO = new UserDTO(); +//// userDTO.setDeptId(1865990541445263361L); +// userDTO.setName(zzdUserDTO.getUsername()); +// userDTO.setNickname(zzdUserDTO.getUsername()); +// userDTO.setSystemType("2"); +// userDTO.setPhone(mobile); +// userDTO.setCreateBy("诗画自动创建"); +// //赋予随机密码 +// userDTO.setPassword("pj*"+ UUID.randomUUID()); +// R booleanR = remoteUserService.registerUser(userDTO); +// R> userByMobile=remoteUserService.getUserByMobile(mobile); +// SysUser sysUser = userByMobile.getData().get(0); +// UserTokenDTO userTokenDTO = new UserTokenDTO(); +// userTokenDTO.setSysUser(sysUser); +//// //登录成功,根据新注册的用户信息返回token +// r=remoteTokenService.generateToken(userTokenDTO); + return R.failed("系统中没有当前用户信息,请联系管理员进行申请!"); } return r; }