chore(service): 注释掉邮件相关功能并清理用户模型字段
This commit is contained in:
@@ -110,10 +110,6 @@ public class UserController {
|
||||
// 创建一个临时model
|
||||
UserModel tempModel = new UserModel();
|
||||
tempModel.setId(Integer.valueOf(param.get("id").toString()));
|
||||
tempModel.setOpenid(openId);
|
||||
tempModel.setHeaderIcon(param.get("headerIcon").toString());
|
||||
tempModel.setNickName(param.get("nickName").toString());
|
||||
tempModel.setSessionKey(sessionKey);
|
||||
tempModel.setUserChatId(openId);
|
||||
int i = userDao.updateById(tempModel);
|
||||
if (i == 1) {
|
||||
@@ -162,8 +158,6 @@ public class UserController {
|
||||
return ResponseData.success(result);
|
||||
}else{ // 新用户
|
||||
UserModel tempModel = new UserModel();
|
||||
tempModel.setPhoneNumber(phoneNumber);
|
||||
tempModel.setCreateTime(VVTools.currentTimeStamp());
|
||||
//设置状态为正常
|
||||
tempModel.setStatus(0);
|
||||
//设置积分为0
|
||||
@@ -196,8 +190,9 @@ public class UserController {
|
||||
// 修改用户信息
|
||||
@PostMapping("updateUserInfo")
|
||||
public ResponseData<Object> updateUserInfo(@RequestBody UserModelDTO userModelDTO) {
|
||||
UserModelVO userModelVO = userService.updateUserInfo( userModelDTO);
|
||||
return ResponseData.success(userModelVO);
|
||||
// UserModelVO userModelVO = userService.updateUserInfo( userModelDTO);
|
||||
// return ResponseData.success(userModelVO);
|
||||
return null;
|
||||
}
|
||||
|
||||
// 获取用户信息
|
||||
@@ -211,7 +206,6 @@ public class UserController {
|
||||
throw new BusinessException(ErrorCode.USER_DOES_NOT_EXIST);
|
||||
}
|
||||
UserModelVO userModelVO = BeanUtil.copyProperties(userModel, UserModelVO.class);
|
||||
userModelVO.setHavaPassword(userModel.getPassword() != null);
|
||||
return ResponseData.success(userModelVO);
|
||||
}
|
||||
|
||||
@@ -385,101 +379,101 @@ public class UserController {
|
||||
return ResponseData.success(coinRecords);
|
||||
}
|
||||
|
||||
// 邮件登录接口
|
||||
@PostMapping("/loginWithMail")
|
||||
public ResponseData<Object> loginWithMail(@RequestBody UserModelDTO model) {
|
||||
return ResponseData.success(userService.loginWithMail(model));
|
||||
}
|
||||
|
||||
//邮件注册接口
|
||||
@PostMapping("/registerWithMail")
|
||||
public ResponseData<Object> mailRegister(@RequestBody UserModelDTO model){
|
||||
return ResponseData.success(userService.addUserWithMail(model));
|
||||
}
|
||||
|
||||
// 用户邮件激活
|
||||
@GetMapping("/activate")
|
||||
public ResponseData<Object> activateAccount(@RequestParam("token") String token){
|
||||
return ResponseData.success(userService.activateAccount(token));
|
||||
}
|
||||
|
||||
// 重发邮件接口
|
||||
@PostMapping("/resendMail")
|
||||
public ResponseData<Object> resendMail(@RequestBody MailModel mailModel){
|
||||
return ResponseData.success(mailService.resendMail(mailModel));
|
||||
}
|
||||
|
||||
// 验证邮箱链接
|
||||
@GetMapping("/verificationMail")
|
||||
public ResponseData<Object> verificationMail(@RequestParam("token") String token){
|
||||
return ResponseData.success(userService.verificationMail(token));
|
||||
}
|
||||
|
||||
// 发送忘记密码邮件
|
||||
@PostMapping("/forgetMail")
|
||||
public ResponseData<Object> sendForgetPassWordMail(@RequestBody MailModel mailModel){
|
||||
return ResponseData.success(userService.sendForgetPassWordMail(mailModel));
|
||||
}
|
||||
|
||||
// 生成二维码登录接口
|
||||
@GetMapping("/qrcode")
|
||||
public ResponseData<Object> generatedQrcode(){
|
||||
return ResponseData.success(userService.generatedQrcode());
|
||||
}
|
||||
|
||||
// 检查二维码状态接口
|
||||
@GetMapping("/check/{uuid}")
|
||||
public ResponseData<Object> checkQrcode(@PathVariable String uuid){
|
||||
return ResponseData.success(userService.checkQrcode(uuid));
|
||||
}
|
||||
|
||||
// 二维码扫描状态
|
||||
@PostMapping("/scan")
|
||||
public ResponseData<?> scanQrCode(@RequestBody ScanInfoDTO scanInfoDTO) {
|
||||
return ResponseData.success( userService.scanQrcode(scanInfoDTO));
|
||||
}
|
||||
|
||||
//二维码扫描确认
|
||||
@PostMapping("/confirm")
|
||||
public ResponseData<?> confirm(@RequestBody ScanInfoDTO scanInfoDTO) {
|
||||
userService.confirm(scanInfoDTO);
|
||||
return ResponseData.success("");
|
||||
}
|
||||
|
||||
// 注销接口
|
||||
@PostMapping("/logout")
|
||||
public ResponseData<Object> logOut(@RequestBody UserModelDTO userModelDTO){
|
||||
userService.logOut(userModelDTO.getId());
|
||||
return ResponseData.success("");
|
||||
}
|
||||
|
||||
// 设置密码接口
|
||||
@PostMapping("/setPassword")
|
||||
public ResponseData<Object>setPassWord(@RequestBody UserModelDTO userModelDTO){
|
||||
return ResponseData.success(userService.setPassWord(userModelDTO));
|
||||
}
|
||||
|
||||
// 用户通过邮件验证链接重设密码接口
|
||||
@PostMapping("/resetPassword")
|
||||
public ResponseData<Object>resetPassWord(@RequestBody UserModelDTO userModelDTO){
|
||||
return ResponseData.success(userService.resetPassWord(userModelDTO));
|
||||
}
|
||||
|
||||
// 设置新邮箱接口
|
||||
@PostMapping("/updateUserMail")
|
||||
public ResponseData<Object>updateUserMail(@RequestBody MailModel mailModel){
|
||||
return ResponseData.success(userService.updateUserMail(mailModel));
|
||||
}
|
||||
|
||||
// 发送更新邮箱验证邮件接口
|
||||
@PostMapping("/sendUpdateMailConfirmMail")
|
||||
public ResponseData<Object>sendUpdateMailConfirmMail(@RequestBody MailModel mailModel){
|
||||
return ResponseData.success(mailService.sendUpdateConfirmMail(mailModel));
|
||||
}
|
||||
|
||||
// 检查重复用户名接口
|
||||
@PostMapping("/checkUserName")
|
||||
public ResponseData<Boolean>checkUserName(@RequestBody UserModelDTO userModelDTO){
|
||||
return ResponseData.success(userService.checkUserName(userModelDTO));
|
||||
}
|
||||
//// 邮件登录接口
|
||||
// @PostMapping("/loginWithMail")
|
||||
// public ResponseData<Object> loginWithMail(@RequestBody UserModelDTO model) {
|
||||
// return ResponseData.success(userService.loginWithMail(model));
|
||||
// }
|
||||
//
|
||||
////邮件注册接口
|
||||
// @PostMapping("/registerWithMail")
|
||||
// public ResponseData<Object> mailRegister(@RequestBody UserModelDTO model){
|
||||
// return ResponseData.success(userService.addUserWithMail(model));
|
||||
// }
|
||||
//
|
||||
//// 用户邮件激活
|
||||
// @GetMapping("/activate")
|
||||
// public ResponseData<Object> activateAccount(@RequestParam("token") String token){
|
||||
// return ResponseData.success(userService.activateAccount(token));
|
||||
// }
|
||||
//
|
||||
//// 重发邮件接口
|
||||
// @PostMapping("/resendMail")
|
||||
// public ResponseData<Object> resendMail(@RequestBody MailModel mailModel){
|
||||
// return ResponseData.success(mailService.resendMail(mailModel));
|
||||
// }
|
||||
//
|
||||
//// 验证邮箱链接
|
||||
// @GetMapping("/verificationMail")
|
||||
// public ResponseData<Object> verificationMail(@RequestParam("token") String token){
|
||||
// return ResponseData.success(userService.verificationMail(token));
|
||||
// }
|
||||
//
|
||||
//// 发送忘记密码邮件
|
||||
// @PostMapping("/forgetMail")
|
||||
// public ResponseData<Object> sendForgetPassWordMail(@RequestBody MailModel mailModel){
|
||||
// return ResponseData.success(userService.sendForgetPassWordMail(mailModel));
|
||||
// }
|
||||
//
|
||||
//// 生成二维码登录接口
|
||||
// @GetMapping("/qrcode")
|
||||
// public ResponseData<Object> generatedQrcode(){
|
||||
// return ResponseData.success(userService.generatedQrcode());
|
||||
// }
|
||||
//
|
||||
//// 检查二维码状态接口
|
||||
// @GetMapping("/check/{uuid}")
|
||||
// public ResponseData<Object> checkQrcode(@PathVariable String uuid){
|
||||
// return ResponseData.success(userService.checkQrcode(uuid));
|
||||
// }
|
||||
//
|
||||
//// 二维码扫描状态
|
||||
// @PostMapping("/scan")
|
||||
// public ResponseData<?> scanQrCode(@RequestBody ScanInfoDTO scanInfoDTO) {
|
||||
// return ResponseData.success( userService.scanQrcode(scanInfoDTO));
|
||||
// }
|
||||
//
|
||||
////二维码扫描确认
|
||||
// @PostMapping("/confirm")
|
||||
// public ResponseData<?> confirm(@RequestBody ScanInfoDTO scanInfoDTO) {
|
||||
// userService.confirm(scanInfoDTO);
|
||||
// return ResponseData.success("");
|
||||
// }
|
||||
//
|
||||
//// 注销接口
|
||||
// @PostMapping("/logout")
|
||||
// public ResponseData<Object> logOut(@RequestBody UserModelDTO userModelDTO){
|
||||
// userService.logOut(userModelDTO.getId());
|
||||
// return ResponseData.success("");
|
||||
// }
|
||||
//
|
||||
//// 设置密码接口
|
||||
// @PostMapping("/setPassword")
|
||||
// public ResponseData<Object>setPassWord(@RequestBody UserModelDTO userModelDTO){
|
||||
// return ResponseData.success(userService.setPassWord(userModelDTO));
|
||||
// }
|
||||
//
|
||||
//// 用户通过邮件验证链接重设密码接口
|
||||
// @PostMapping("/resetPassword")
|
||||
// public ResponseData<Object>resetPassWord(@RequestBody UserModelDTO userModelDTO){
|
||||
// return ResponseData.success(userService.resetPassWord(userModelDTO));
|
||||
// }
|
||||
//
|
||||
//// 设置新邮箱接口
|
||||
// @PostMapping("/updateUserMail")
|
||||
// public ResponseData<Object>updateUserMail(@RequestBody MailModel mailModel){
|
||||
// return ResponseData.success(userService.updateUserMail(mailModel));
|
||||
// }
|
||||
//
|
||||
//// 发送更新邮箱验证邮件接口
|
||||
// @PostMapping("/sendUpdateMailConfirmMail")
|
||||
// public ResponseData<Object>sendUpdateMailConfirmMail(@RequestBody MailModel mailModel){
|
||||
// return ResponseData.success(mailService.sendUpdateConfirmMail(mailModel));
|
||||
// }
|
||||
//
|
||||
//// 检查重复用户名接口
|
||||
// @PostMapping("/checkUserName")
|
||||
// public ResponseData<Boolean>checkUserName(@RequestBody UserModelDTO userModelDTO){
|
||||
// return ResponseData.success(userService.checkUserName(userModelDTO));
|
||||
// }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user