From f94eaf7b0207339876e7deab0d2db2c37ef17101 Mon Sep 17 00:00:00 2001 From: Nice-2-CU <81088875+Nice-2-CU@users.noreply.github.com> Date: Mon, 13 Feb 2023 19:47:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=AF=84=E8=AE=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctgu/lost_found/controller/CommentController.java | 7 +++++-- .../com/ctgu/lost_found/entity/request/post/ToUser.java | 2 ++ .../ctgu/lost_found/service/Impl/PostServiceImpl.java | 9 +++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ctgu/lost_found/controller/CommentController.java b/src/main/java/com/ctgu/lost_found/controller/CommentController.java index ab7e2c0..41a3f67 100644 --- a/src/main/java/com/ctgu/lost_found/controller/CommentController.java +++ b/src/main/java/com/ctgu/lost_found/controller/CommentController.java @@ -33,10 +33,13 @@ public class CommentController { return Result.error("发评论请求体不能为null"); } String content = addCommentVO.getContent(); + if (StringUtil.isNull(content)) { + return Result.error("评论内容不能为空"); + } Integer fid = addCommentVO.getFid(); Integer pid = addCommentVO.getPid(); - if (StringUtil.isNull(content) || pid == null) { - return Result.error("评论内容或pid(帖子id)不能为null"); + if (pid == null) { + return Result.error("pid(帖子id)不能为null"); } //登录用户即发评用户 int loginId = StpUtil.getLoginIdAsInt(); diff --git a/src/main/java/com/ctgu/lost_found/entity/request/post/ToUser.java b/src/main/java/com/ctgu/lost_found/entity/request/post/ToUser.java index 7d15d25..09b6154 100644 --- a/src/main/java/com/ctgu/lost_found/entity/request/post/ToUser.java +++ b/src/main/java/com/ctgu/lost_found/entity/request/post/ToUser.java @@ -24,4 +24,6 @@ public class ToUser implements Serializable { private String qqEmail; + private String phone; + } diff --git a/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java b/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java index b3d5c16..1a3d0e2 100644 --- a/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java +++ b/src/main/java/com/ctgu/lost_found/service/Impl/PostServiceImpl.java @@ -1,6 +1,7 @@ package com.ctgu.lost_found.service.Impl; import com.ctgu.lost_found.common.util.EmailUtil; +import com.ctgu.lost_found.common.util.RegexUtil; import com.ctgu.lost_found.common.util.Result; import com.ctgu.lost_found.common.util.redis.RedisCacheUtil; import com.ctgu.lost_found.common.util.redis.RedisConstants; @@ -106,6 +107,10 @@ public class PostServiceImpl implements PostService { ToUser toUser = postVO.getToUser(); String nickname = toUser.getNickname(); String qqEmail = toUser.getQqEmail(); + String phone = toUser.getPhone(); + if(RegexUtil.isPhoneInvalid(phone)){ + phone = "无"; + } //修改帖子状态与寻物/认领人id this.updatePost(Post.builder().id(postVO.getId()).state(1).toUser(User.builder().id(toUser.getToUserId()).build()).build()); //删除redis缓存 @@ -118,7 +123,7 @@ public class PostServiceImpl implements PostService { if (type == 0) { //发送失物找回通知 try { - EmailUtil.sendSimpleEmail(fromUserQqEmail, "【失物招领系统】——失物找回通知", "尊敬的用户，您好！您丢失的物品已经找到了！拾取人的信息如下: 昵称: " + nickname + "， 联系QQ: " + qqEmail + "， 找回时间: " + nowDate + "。 请主动与拾取人联系，拾取人也可能会联系您！"); + EmailUtil.sendSimpleEmail(fromUserQqEmail, "【失物招领系统】——失物找回通知", "尊敬的用户，您好！您丢失的物品已经找到了！拾取人的信息如下: 昵称: " + nickname + "， 联系QQ: " + qqEmail + "， 联系电话: " + phone + "， 找回时间: " + nowDate + "。 请主动与拾取人联系，拾取人也可能会联系您！"); } catch (Exception e) { e.printStackTrace(); return Result.error("通知邮件发送出错"); @@ -126,7 +131,7 @@ public class PostServiceImpl implements PostService { } else { //发送失物认领通知 try { - EmailUtil.sendSimpleEmail(fromUserQqEmail, "【失物招领系统】——失物认领通知", "尊敬的用户，您好！您捡到的物品已经被认领了！失主的信息如下: 昵称: " + nickname + "， 联系QQ: " + qqEmail + "， 认领时间: " + nowDate + "。 失主会尽快与您联系，您也可以主动联系失主！"); + EmailUtil.sendSimpleEmail(fromUserQqEmail, "【失物招领系统】——失物认领通知", "尊敬的用户，您好！您捡到的物品已经被认领了！失主的信息如下: 昵称: " + nickname + "， 联系QQ: " + qqEmail + "， 联系电话: " + phone + "， 认领时间: " + nowDate + "。 失主会尽快与您联系，您也可以主动联系失主！"); } catch (Exception e) { e.printStackTrace(); return Result.error("通知邮件发送出错"); -- Gitee