201206030/novel-plus
1
0
Fork 0
mirror of https://github.com/201206030/novel-plus.git synced 2025-06-24 04:46:37 +00:00
Code Issues Packages Releases Wiki Activity

fix: 会员注册验证码

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

41
novel-front/src/main/java/com/java2nb/novel/controller/FileController.java
View File

@ -5,6 +5,7 @@ import com.java2nb.novel.core.cache.CacheService;
import com.java2nb.novel.core.enums.ResponseStatus;
import com.java2nb.novel.core.utils.Constants;
import com.java2nb.novel.core.utils.FileUtil;
import com.java2nb.novel.core.utils.IpUtil;
import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
import io.github.xxyopen.model.resp.RestResult;
import io.github.xxyopen.util.UUIDUtil;
@ -41,24 +42,25 @@ public class FileController {
* 生成验证码
*/
@GetMapping(value = "getVerify")
@SneakyThrows
public void getVerify(HttpServletRequest request, HttpServletResponse response) {
try {
//设置相应类型,告诉浏览器输出的内容为图片
response.setContentType("image/jpeg");
//设置响应头信息，告诉浏览器不要缓存此内容
response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache");
response.setDateHeader("Expire", 0);
RandomValidateCodeUtil randomValidateCode = new RandomValidateCodeUtil();
//输出验证码图片方法
randomValidateCode.getRandcode(cacheService, response);
} catch (Exception e) {
log.error("获取验证码失败>>>> ", e);
}
//设置相应类型,告诉浏览器输出的内容为图片
response.setContentType("image/jpeg");
//设置响应头信息，告诉浏览器不要缓存此内容
response.setHeader("Pragma", "No-cache");
response.setHeader("Cache-Control", "no-cache");
response.setDateHeader("Expire", 0);
RandomValidateCodeUtil randomValidateCode = new RandomValidateCodeUtil();
//输出验证码图片方法
String randomString = randomValidateCode.genRandCodeImage(response.getOutputStream());
//将生成的随机字符串保存到缓存中
cacheService.set(RandomValidateCodeUtil.RANDOM_CODE_KEY + ":" + IpUtil.getRealIp(request), randomString,
60 * 5);
}
/**
* 图片上传
*
* @return
*/
@SneakyThrows
@ -67,25 +69,26 @@ public class FileController {
RestResult<String> upload(@RequestParam("file") MultipartFile file) {
Date currentDate = new Date();
String savePath =
Constants.LOCAL_PIC_PREFIX + DateUtils.formatDate(currentDate, "yyyy") + "/" +
DateUtils.formatDate(currentDate, "MM") + "/" +
DateUtils.formatDate(currentDate, "dd");
Constants.LOCAL_PIC_PREFIX + DateUtils.formatDate(currentDate, "yyyy") + "/" +
DateUtils.formatDate(currentDate, "MM") + "/" +
DateUtils.formatDate(currentDate, "dd");
String oriName = file.getOriginalFilename();
assert oriName != null;
String saveFileName = UUIDUtil.getUUID32() + oriName.substring(oriName.lastIndexOf("."));
File saveFile = new File(picSavePath + savePath, saveFileName);
if (!saveFile.getParentFile().exists()) {
boolean isSuccess = saveFile.getParentFile().mkdirs();
if(!isSuccess){
if (!isSuccess) {
throw new BusinessException(ResponseStatus.FILE_DIR_MAKE_FAIL);
}
}
file.transferTo(saveFile);
if(!FileUtil.isImage(saveFile)){
if (!FileUtil.isImage(saveFile)) {
//上传的文件不是图片
saveFile.delete();
throw new BusinessException(ResponseStatus.FILE_NOT_IMAGE);
};
}
;
return RestResult.ok(savePath + "/" + saveFileName);
}

80
novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
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();
}
}