|
@@ -71,46 +71,46 @@ public class AppLoginController extends AppBaseController{
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private OpenIMService openIMService;
|
|
private OpenIMService openIMService;
|
|
|
|
|
|
|
|
- @ApiOperation("注册app用户")
|
|
|
|
|
- @PostMapping("/register")
|
|
|
|
|
- @RepeatSubmit
|
|
|
|
|
- public R registerDoctor(@Validated @RequestBody FsUserRegisterParam param){
|
|
|
|
|
- FsUser fsUser = findUserByPhone(param.getPhone());
|
|
|
|
|
-
|
|
|
|
|
-// if (fsUser == null) {
|
|
|
|
|
-// // 尝试使用加密后的手机号查询
|
|
|
|
|
-// fsUser = userService.selectFsUserByPhone(encryptPhone(param.getPhone()));
|
|
|
|
|
|
|
+// @ApiOperation("注册app用户")
|
|
|
|
|
+// @PostMapping("/register")
|
|
|
|
|
+// @RepeatSubmit
|
|
|
|
|
+// public R registerDoctor(@Validated @RequestBody FsUserRegisterParam param){
|
|
|
|
|
+// FsUser fsUser = findUserByPhone(param.getPhone());
|
|
|
|
|
+//
|
|
|
|
|
+//// if (fsUser == null) {
|
|
|
|
|
+//// // 尝试使用加密后的手机号查询
|
|
|
|
|
+//// fsUser = userService.selectFsUserByPhone(encryptPhone(param.getPhone()));
|
|
|
|
|
+//// }
|
|
|
|
|
+//
|
|
|
|
|
+// if (fsUser != null && StringUtils.isNotEmpty(fsUser.getPassword())) {
|
|
|
|
|
+// return R.error("此账号已经注册");
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
- if (fsUser != null && StringUtils.isNotEmpty(fsUser.getPassword())) {
|
|
|
|
|
- return R.error("此账号已经注册");
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- FsUser user = new FsUser();
|
|
|
|
|
- if (fsUser != null) {
|
|
|
|
|
- // 更新已有用户的密码
|
|
|
|
|
- user.setUserId(fsUser.getUserId());
|
|
|
|
|
- user.setPassword(Md5Utils.hash(param.getPassword()));
|
|
|
|
|
- user.setUpdateTime(new DateTime());
|
|
|
|
|
- userService.updateFsUser(user);
|
|
|
|
|
- return R.ok("注册成功");
|
|
|
|
|
- } else {
|
|
|
|
|
- // 创建新用户
|
|
|
|
|
- user.setPhone(param.getPhone());
|
|
|
|
|
- user.setNickName("app用户" + param.getPhone().substring(param.getPhone().length() - 4));
|
|
|
|
|
- user.setStatus(1);
|
|
|
|
|
- user.setAvatar("https://cos.his.cdwjyyh.com/fs/20240926/420728ee06e54575ba82665dedb4756b.png");
|
|
|
|
|
- user.setPassword(Md5Utils.hash(param.getPassword()));
|
|
|
|
|
- user.setCreateTime(new Date());
|
|
|
|
|
-
|
|
|
|
|
- if (userService.insertFsUser(user) > 0) {
|
|
|
|
|
- return R.ok("注册成功");
|
|
|
|
|
- } else {
|
|
|
|
|
- return R.error("注册失败");
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- }
|
|
|
|
|
|
|
+//
|
|
|
|
|
+// FsUser user = new FsUser();
|
|
|
|
|
+// if (fsUser != null) {
|
|
|
|
|
+// // 更新已有用户的密码
|
|
|
|
|
+// user.setUserId(fsUser.getUserId());
|
|
|
|
|
+// user.setPassword(Md5Utils.hash(param.getPassword()));
|
|
|
|
|
+// user.setUpdateTime(new DateTime());
|
|
|
|
|
+// userService.updateFsUser(user);
|
|
|
|
|
+// return R.ok("注册成功");
|
|
|
|
|
+// } else {
|
|
|
|
|
+// // 创建新用户
|
|
|
|
|
+// user.setPhone(param.getPhone());
|
|
|
|
|
+// user.setNickName("app用户" + param.getPhone().substring(param.getPhone().length() - 4));
|
|
|
|
|
+// user.setStatus(1);
|
|
|
|
|
+// user.setAvatar("https://cos.his.cdwjyyh.com/fs/20240926/420728ee06e54575ba82665dedb4756b.png");
|
|
|
|
|
+// user.setPassword(Md5Utils.hash(param.getPassword()));
|
|
|
|
|
+// user.setCreateTime(new Date());
|
|
|
|
|
+//
|
|
|
|
|
+// if (userService.insertFsUser(user) > 0) {
|
|
|
|
|
+// return R.ok("注册成功");
|
|
|
|
|
+// } else {
|
|
|
|
|
+// return R.error("注册失败");
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
+//
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
@ApiOperation("登录")
|
|
@ApiOperation("登录")
|
|
|
@PostMapping("/login")
|
|
@PostMapping("/login")
|