okooooooo/novel-plus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 会员注册验证码

Browse Source
This commit is contained in:
xiongxiaoyang committed 2023-04-18 09:17:30 +08:00
1 parent cab350dbb2
commit 281561c85b
3 files changed
+81 -80
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
+42 -38
View File
@@ -4,6 +4,7 @@ package com.java2nb.novel.controller;
import com.java2nb.novel.core.bean.UserDetails;
import com.java2nb.novel.core.cache.CacheService;
import com.java2nb.novel.core.enums.ResponseStatus;
import com.java2nb.novel.core.utils.IpUtil;
import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
import com.java2nb.novel.entity.User;
import com.java2nb.novel.entity.UserBuyRecord;
@@ -59,11 +60,12 @@ public class UserController extends BaseController {
* 注册
*/
@PostMapping("register")
public RestResult<?> register(@Validated({AddGroup.class}) User user, @RequestParam(value = "velCode", defaultValue = "") String velCode) {
public RestResult<?> register(@Validated({AddGroup.class}) User user,
@RequestParam(value = "velCode", defaultValue = "") String velCode, HttpServletRequest request) {
//判断验证码是否正确
if (!velCode.equals(cacheService.get(RandomValidateCodeUtil.RANDOM_CODE_KEY))) {
if (!velCode.equals(
cacheService.get(RandomValidateCodeUtil.RANDOM_CODE_KEY + ":" + IpUtil.getRealIp(request)))) {
return RestResult.fail(ResponseStatus.VEL_CODE_ERROR);
}
@@ -113,95 +115,98 @@ public class UserController extends BaseController {
/**
* 加入书架
* */
*/
@PostMapping("addToBookShelf")
public RestResult<Void> addToBookShelf(Long bookId,Long preContentId, HttpServletRequest request) {
public RestResult<Void> addToBookShelf(Long bookId, Long preContentId, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
userService.addToBookShelf(userDetails.getId(),bookId,preContentId);
userService.addToBookShelf(userDetails.getId(), bookId, preContentId);
return RestResult.ok();
}
/**
* 移出书架
* */
*/
@DeleteMapping("removeFromBookShelf/{bookId}")
public RestResult<?> removeFromBookShelf(@PathVariable("bookId") Long bookId, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
userService.removeFromBookShelf(userDetails.getId(),bookId);
userService.removeFromBookShelf(userDetails.getId(), bookId);
return RestResult.ok();
}
/**
* 分页查询书架
* */
*/
@GetMapping("listBookShelfByPage")
public RestResult<?> listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
public RestResult<?> listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
@RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
return RestResult.ok(userService.listBookShelfByPage(userDetails.getId(),page,pageSize));
return RestResult.ok(userService.listBookShelfByPage(userDetails.getId(), page, pageSize));
}
/**
* 分页查询阅读记录
* */
*/
@GetMapping("listReadHistoryByPage")
public RestResult<?> listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize,HttpServletRequest request) {
public RestResult<?> listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
@RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
return RestResult.ok(userService.listReadHistoryByPage(userDetails.getId(),page,pageSize));
return RestResult.ok(userService.listReadHistoryByPage(userDetails.getId(), page, pageSize));
}
/**
* 添加阅读记录
* */
*/
@PostMapping("addReadHistory")
public RestResult<?> addReadHistory(Long bookId,Long preContentId, HttpServletRequest request) {
public RestResult<?> addReadHistory(Long bookId, Long preContentId, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
userService.addReadHistory(userDetails.getId(),bookId,preContentId);
userService.addReadHistory(userDetails.getId(), bookId, preContentId);
return RestResult.ok();
}
/**
* 添加反馈
* */
*/
@PostMapping("addFeedBack")
public RestResult<?> addFeedBack(String content, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
userService.addFeedBack(userDetails.getId(),content);
userService.addFeedBack(userDetails.getId(), content);
return RestResult.ok();
}
/**
* 分页查询我的反馈列表
* */
*/
@GetMapping("listUserFeedBackByPage")
public RestResult<?> listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request){
public RestResult<?> listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
@RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
return RestResult.ok(userService.listUserFeedBackByPage(userDetails.getId(),page,pageSize));
return RestResult.ok(userService.listUserFeedBackByPage(userDetails.getId(), page, pageSize));
}
/**
* 查询个人信息
* */
*/
@GetMapping("userInfo")
public RestResult<?> userInfo(HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
@@ -213,15 +218,15 @@ public class UserController extends BaseController {
/**
* 更新个人信息
* */
*/
@PostMapping("updateUserInfo")
public RestResult<?> updateUserInfo(@Validated({UpdateGroup.class}) User user, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
userService.updateUserInfo(userDetails.getId(),user);
if(user.getNickName() != null){
userService.updateUserInfo(userDetails.getId(), user);
if (user.getNickName() != null) {
userDetails.setNickName(user.getNickName());
Map<String, Object> data = new HashMap<>(1);
data.put("token", jwtTokenUtil.generateToken(userDetails));
@@ -233,36 +238,38 @@ public class UserController extends BaseController {
/**
* 更新密码
* */
*/
@PostMapping("updatePassword")
public RestResult<?> updatePassword(String oldPassword,String newPassword1,String newPassword2,HttpServletRequest request) {
public RestResult<?> updatePassword(String oldPassword, String newPassword1, String newPassword2,
HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
if(!(StringUtils.isNotBlank(newPassword1) && newPassword1.equals(newPassword2))){
if (!(StringUtils.isNotBlank(newPassword1) && newPassword1.equals(newPassword2))) {
RestResult.fail(ResponseStatus.TWO_PASSWORD_DIFF);
}
userService.updatePassword(userDetails.getId(),oldPassword,newPassword1);
userService.updatePassword(userDetails.getId(), oldPassword, newPassword1);
return RestResult.ok();
}
/**
* 分页查询用户书评
* */
*/
@GetMapping("listCommentByPage")
public RestResult<?> listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,HttpServletRequest request) {
public RestResult<?> listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page,
@RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
if (userDetails == null) {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
return RestResult.ok(bookService.listCommentByPage(userDetails.getId(),null,page,pageSize));
return RestResult.ok(bookService.listCommentByPage(userDetails.getId(), null, page, pageSize));
}
/**
* 购买小说章节
* */
*/
@PostMapping("buyBookIndex")
public RestResult<?> buyBookIndex(UserBuyRecord buyRecord, HttpServletRequest request) {
UserDetails userDetails = getUserDetails(request);
@@ -270,12 +277,9 @@ public class UserController extends BaseController {
return RestResult.fail(ResponseStatus.NO_LOGIN);
}
buyRecord.setBuyAmount(bookService.queryBookIndex(buyRecord.getBookIndexId()).getBookPrice());
userService.buyBookIndex(userDetails.getId(),buyRecord);
userService.buyBookIndex(userDetails.getId(), buyRecord);
return RestResult.ok();
}
}