From aaa628466962b9e91ee4e88dd5de408dbf732f19 Mon Sep 17 00:00:00 2001 From: ronger Date: Thu, 28 Jan 2021 09:16:52 +0800 Subject: [PATCH 01/27] update finalName --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9af47d..69e23de 100644 --- a/pom.xml +++ b/pom.xml @@ -219,7 +219,7 @@ spring-boot-maven-plugin - vertical-console + forest From f6e00e61ced8135b5ada0384e322fac999db66a1 Mon Sep 17 00:00:00 2001 From: ronger Date: Fri, 29 Jan 2021 16:20:06 +0800 Subject: [PATCH 02/27] update README.md --- README.md | 308 +++++++++++++----------------------------------------- 1 file changed, 70 insertions(+), 238 deletions(-) diff --git a/README.md b/README.md index 810561c..5e88293 100644 --- a/README.md +++ b/README.md @@ -8,246 +8,74 @@ forest（[ˈfôrəst]，n.森林）是一款现代化的知识社区项目，使 ## ⚡ 动机 -在 2019 年的某一天,受到 [Hugh](https://rymcu.com/user/RYMCU-J) 的邀请, 构建一个开源嵌入式知识学习交流平台。因此就有了 forest 这个项目。 -forest 在很多方面受到了 [Symphony](https://github.com/88250/symphony) 的启发,并尝试着在 [Symphony](https://github.com/88250/symphony) 和 [B3log 思想](https://ld246.com/article/1546941897596) 的基础上进一步探索。 +在 2019 年的某一天,受到 [Hugh](https://rymcu.com/user/RYMCU-J) 的邀请, 构建一个开源嵌入式知识学习交流平台。因此就有了 forest 这个项目。 forest +在很多方面受到了 [Symphony](https://github.com/88250/symphony) 的启发,并尝试着在 [Symphony](https://github.com/88250/symphony) +和 [B3log 思想](https://ld246.com/article/1546941897596) 的基础上进一步探索。 -## ✨ 特性 +## ✨ 特性 -``` -内容编辑器 - Markdown（GFM） - Emoji - 上传文件 - 图片 - 文件 - 单独渲染 MP3 - 单独渲染视频 - 剪贴板处理 - 粘贴内容处理为 Markdown - 粘贴图片自动重新上传 - 数学公式（LaTeX）、流程图支持 - 快捷键支持 - 工具栏 - 表情 - 粗体 - 斜体 - 引用 - 无序列表 - 有序列表 - 链接 - 上传 - 预览 - 全屏 - 编辑模式 - 传统的 Markdown 分屏编辑预览 - 保留 Markdown 标记符的即时渲染 - 类富文本编辑器的所见即所得 -注册 - 用户名 - Email - 验证码 - 邮件验证 - 新手向导 - 上传头像 - 关注标签 - 关注用户 - 帮助指引 -登录 - 账户（用户名/Email） - 密码 - 忘记密码 - Email - 验证码 -发帖 - 帖子类型 - 普通帖子 - 标题 - 正文 - 内容编辑器 - 本地存储 - 标签 - 使用已有（选择、自动完成）或创建 - 过滤 - 黑白名单 - 规范化 - 默认“待分类” - 发布后 - 可更新 - 可删除 -回帖 - 内容编辑器 - 本地存储 - 回复（回复针对回帖） -货币 - 货币规则 -浏览帖子 - 实时热度 - 编辑自己的帖子 - 发布时间/浏览数/回帖数/标签 - 上一篇/下一篇 - 分享 - 微信 - QQ - 分享链接（带用户标识） - 相关帖子 - 缩略摘要 -帖子列表 - 专题 - 相关标签 - 最新 - 优选 - 搜索 - 标签 - 相关标签 - 创建者 - 贡献者 - 关注/引用/回帖数 - 所属专题 - 关注 - 排序 - 默认（按发布时间降序） - 热议（按回帖数降序） - 好评（按评分降序） - 最近回帖（按最近回帖时间降序） - 首图 - 实时热度 - 最新回复 - 回帖数 - 创建时间 -后台管理 - 后台首页 - 数据统计 - 当前在线 - 会员在线 - 最高在线 - 会员 - 帖子 - 专题 - 标签 - 回帖 - 用户管理 - 按用户名/邮件搜索 - 添加新用户 - 用户数据维护 - 各字段数据 - 用户状态 - 正常 - 未验证 - 限制登录 - 封禁 - 高级更新 - 用户名 - 邮箱地址 - 帖子管理 - 按 id 搜索帖子 - 重建所有帖子搜索索引 - 添加新帖 - 帖子数据维护 - 锁定帖子 - 删除帖子 - 专题管理 - 按名称搜索专题 - 添加专题 - 专题数据维护 - 添加/移除相关标签 - 名称 - URI - 描述 - 图标 - 是否用于导航 - 状态 - CSS - SEO - title - keywords - description - 删除专题 - 标签管理 - 按名称搜索标签 - 添加标签 - 标签数据维护 - 名称 - URI - 描述 - 图标 - 状态 - CSS - SEO - title - keywords - description - 角色管理 - 内建角色 - 管理员 - 社区管理员 - 作者 - 普通用户 - 创建角色 - 功能权限 -浏览统计 - 实时统计 - 会员 - 帖子 - 专题 - 标签 - 回帖 - 数据统计 - 最近 30 天 - 历史 - 新发贴数 - 新用户数 -消息通知 - 消息数 - 标记已读 - 消息类别 - 收到的回帖 - 收到的回复 - 收到的评论 - 提及我的 - 关注 - 我关注的 - 关注的用户发帖 -个人主页 - 用户统计数据 - 积分 - 关注标签 - 收藏帖子 - 关注者 - 关注用户 - 站点连接 -首页 - 专题、发帖、通知、个人等入口 - 专题导航列表 - 对搜索引擎爬虫友好 -用户设置 - 基本信息 - 昵称 - URL - 个性签名 - 个人主页背景图 - 个人卡片背景图 - 站点连接 - GitHub - 微博 - QQ - 微信 - 头像 - 账号 - 绑定邮箱 - 更新密码 - 更新用户名 - 永久停用账号 - 钱包 - 交易记录 - 帮助 - 使用入门 - 基础知识 - Markdown 教程 -评论 - 发布评论 -``` +- 内容编辑器 + - Markdown（GFM） + - emoji + - 上传文件 + - 图片 + - 文件 + - 单独渲染 MP3 文件 + - 单独渲染视频文件 + - 剪切板处理 + - 粘贴内容处理为 Markdown + - 粘贴图片自动重新上传 + - 数学公式（LaTeX）、流程图支持 + - 工具栏 + - 表情 + - 粗体 + - 斜体 + - 引用 + - 无序列表 + - 有序列表 + - 链接 + - 上传 + - 预览 + - 全屏 + - 编辑模式 + - 传统的 Markdown 分屏编辑预览 + - 保留 Markdown 标记符的即时渲染 + - 类富文本编辑器的所见即所得 +- 注册 + - 用户名 + - 邮箱 + - 验证码 +- 登录 + - 账户(用户名/邮箱) + - 密码 + - 忘记密码 + - 邮箱 + - 邮箱验证 +- 发帖 + - 帖子类型 + - 普通帖子 + - 标题 + - 正文 + - 内容编辑器 + - 标签 + - 使用已有（选择、自动完成）或创建 + - 默认“待分类” + - 发布后 + - 可更新 + - 可删除 +- 回帖 + - 内容编辑器 + - 回复（回复针对回帖） +- 货币 + - 货币规则 +- 浏览贴子 + - 编辑自己的帖子 + - 发布时间/浏览数/标签 + - 分享 + - 微信 + - 分享链接（带用户标识） -## 报告缺陷 +## 报告缺陷 > 社区系统可能存在一些潜在的缺陷，大家如果有空的话可以帮助我们一起解决。 @@ -260,4 +88,8 @@ forest 在很多方面受到了 [Symphony](https://github.com/88250/symphony) 欢迎对社区提出功能特性方面的建议，我们一起讨论，如果有可能我们会尽快实现。 -在提功能建议前可以先看一下 [计划表](https://rymcu.com/article/29) ，避免重复提议 \ No newline at end of file +在提功能建议前可以先看一下 [计划表](https://rymcu.com/article/29) ，避免重复提议 + +## 鸣谢 +- 感谢 `JetBrains` 对本项目的帮助,为作者提供了开源许可版 `JetBrains` 全家桶 +![JetBrains](src/main/resources/static/jetbrains.png) \ No newline at end of file From f43689a7e9dc42fbc2a1edbff7b14e427560006b Mon Sep 17 00:00:00 2001 From: ronger Date: Mon, 1 Feb 2021 18:12:13 +0800 Subject: [PATCH 03/27] :bug: https://github.com/rymcu/forest/issues/30 --- .../rymcu/forest/config/BaseShiroRealm.java | 19 ++-- .../forest/core/constant/ShiroConstants.java | 8 +- .../core/exception/TransactionException.java | 35 ++++++++ .../rymcu/forest/core/result/ResultCode.java | 24 ++--- .../forest/core/service/AbstractService.java | 9 +- .../rymcu/forest/core/service/Service.java | 89 ++++++++++++++++--- .../forest/enumerate/TransactionCode.java | 28 ++++++ ...{SponsorEnum.java => TransactionEnum.java} | 12 +-- .../service/impl/SponsorServiceImpl.java | 10 ++- 9 files changed, 190 insertions(+), 44 deletions(-) create mode 100644 src/main/java/com/rymcu/forest/core/exception/TransactionException.java create mode 100644 src/main/java/com/rymcu/forest/enumerate/TransactionCode.java rename src/main/java/com/rymcu/forest/enumerate/{SponsorEnum.java => TransactionEnum.java} (57%) diff --git a/src/main/java/com/rymcu/forest/config/BaseShiroRealm.java b/src/main/java/com/rymcu/forest/config/BaseShiroRealm.java index 46aa766..bdd6323 100644 --- a/src/main/java/com/rymcu/forest/config/BaseShiroRealm.java +++ b/src/main/java/com/rymcu/forest/config/BaseShiroRealm.java @@ -29,7 +29,7 @@ import java.util.List; * @author ronger * @since 2018/05/28 11:00 * 自定义权限匹配和账号密码匹配 - * */ + */ public class BaseShiroRealm extends AuthorizingRealm { @Resource private RoleService roleService; @@ -43,13 +43,13 @@ public class BaseShiroRealm extends AuthorizingRealm { @Override protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) { SimpleAuthorizationInfo authorizationInfo = new SimpleAuthorizationInfo(); - Principal principal = (Principal)principals.getPrimaryPrincipal(); + Principal principal = (Principal) principals.getPrimaryPrincipal(); User user = new User(); user.setIdUser(principal.getId()); try { List roles = roleService.selectRoleByUser(user); for (Role role : roles) { - if(StringUtils.isNotBlank(role.getInputCode())){ + if (StringUtils.isNotBlank(role.getInputCode())) { authorizationInfo.addRole(role.getInputCode()); } } @@ -70,7 +70,7 @@ public class BaseShiroRealm extends AuthorizingRealm { /** * 认证回调函数, 登录时调用，主要是用来进行身份认证的，也就是说验证用户输入的账号和密码是否正确。 - * */ + */ @Override protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken) throws AuthenticationException { UsernamePasswordToken token = (UsernamePasswordToken) authcToken; @@ -90,10 +90,11 @@ public class BaseShiroRealm extends AuthorizingRealm { if (user == null) { return null; } - if (!"0".equals(user.getStatus())) { //账户冻结(是否允许登陆) + // 账户冻结(是否允许登陆) + if (!"0".equals(user.getStatus())) { throw new LockedAccountException(); } - byte[] salt = Encodes.decodeHex(user.getPassword().substring(0,16)); + byte[] salt = Encodes.decodeHex(user.getPassword().substring(0, 16)); return new SimpleAuthenticationInfo(new Principal(user, token.isMobileLogin()), user.getPassword().substring(16), ByteSource.Util.bytes(salt), getName()); } @@ -101,7 +102,7 @@ public class BaseShiroRealm extends AuthorizingRealm { /** * 授权用户信息 */ - public static class Principal implements Serializable { + public static class Principal implements Serializable { private static final long serialVersionUID = 1L; @@ -139,9 +140,9 @@ public class BaseShiroRealm extends AuthorizingRealm { * 获取SESSIONID */ public String getSessionid() { - try{ + try { return (String) Utils.getSession().getId(); - }catch (Exception e) { + } catch (Exception e) { return ""; } } diff --git a/src/main/java/com/rymcu/forest/core/constant/ShiroConstants.java b/src/main/java/com/rymcu/forest/core/constant/ShiroConstants.java index 8b7476d..1c5d116 100644 --- a/src/main/java/com/rymcu/forest/core/constant/ShiroConstants.java +++ b/src/main/java/com/rymcu/forest/core/constant/ShiroConstants.java @@ -2,10 +2,10 @@ package com.rymcu.forest.core.constant; /** * Shiro通用常量 - * + * + * @author ronger */ -public interface ShiroConstants -{ +public interface ShiroConstants { /** * 当前登录的用户 */ @@ -54,7 +54,7 @@ public interface ShiroConstants /** * 验证码 */ - public static final String CURRENT_VALIDATECODE = "validateCode"; + public static final String CURRENT_VALIDATE_CODE = "validateCode"; /** * 验证码错误 diff --git a/src/main/java/com/rymcu/forest/core/exception/TransactionException.java b/src/main/java/com/rymcu/forest/core/exception/TransactionException.java new file mode 100644 index 0000000..16e66b2 --- /dev/null +++ b/src/main/java/com/rymcu/forest/core/exception/TransactionException.java @@ -0,0 +1,35 @@ +package com.rymcu.forest.core.exception; + +import com.rymcu.forest.enumerate.TransactionCode; + +/** + * @author ronger + */ +public class TransactionException extends Exception { + + private int code; + + private String message; + + public TransactionException(TransactionCode transactionCode) { + super(transactionCode.getMessage()); + this.code = transactionCode.getCode(); + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + @Override + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } +} diff --git a/src/main/java/com/rymcu/forest/core/result/ResultCode.java b/src/main/java/com/rymcu/forest/core/result/ResultCode.java index c0f894e..40c43fe 100644 --- a/src/main/java/com/rymcu/forest/core/result/ResultCode.java +++ b/src/main/java/com/rymcu/forest/core/result/ResultCode.java @@ -2,18 +2,22 @@ package com.rymcu.forest.core.result; /** * 响应码枚举，参考HTTP状态码的语义 + * + * @author ronger */ public enum ResultCode { - SUCCESS(1, "SUCCESS"),//成功 - FAIL(400, "访问失败"),//失败 - UNAUTHORIZED(401, "签名错误"),//未认证（签名错误） - NOT_FOUND(404, "此接口不存在"),//接口不存在 - INTERNAL_SERVER_ERROR(500, "系统繁忙,请稍后再试"),//服务器内部错误 - INVALID_PARAM(10000, "参数错误"), - - - - ; + // 成功 + SUCCESS(1, "SUCCESS"), + // 失败 + FAIL(400, "访问失败"), + // 未认证（签名错误） + UNAUTHORIZED(401, "签名错误"), + // 接口不存在 + NOT_FOUND(404, "此接口不存在"), + // 服务器内部错误 + INTERNAL_SERVER_ERROR(500, "系统繁忙,请稍后再试"), + // 参数错误 + INVALID_PARAM(10000, "参数错误"); private int code; private String message; diff --git a/src/main/java/com/rymcu/forest/core/service/AbstractService.java b/src/main/java/com/rymcu/forest/core/service/AbstractService.java index a1e2eb2..e973449 100644 --- a/src/main/java/com/rymcu/forest/core/service/AbstractService.java +++ b/src/main/java/com/rymcu/forest/core/service/AbstractService.java @@ -7,19 +7,24 @@ import org.apache.ibatis.exceptions.TooManyResultsException; import org.springframework.beans.factory.annotation.Autowired; import tk.mybatis.mapper.entity.Condition; +import javax.annotation.Resource; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.util.List; /** * 基于通用MyBatis Mapper插件的Service接口的实现 + * + * @author ronger */ public abstract class AbstractService implements Service { @Autowired protected Mapper mapper; - - private Class modelClass; // 当前泛型真实类型的Class + /** + * 当前泛型真实类型的Class + */ + private Class modelClass; public AbstractService() { ParameterizedType pt = (ParameterizedType) this.getClass().getGenericSuperclass(); diff --git a/src/main/java/com/rymcu/forest/core/service/Service.java b/src/main/java/com/rymcu/forest/core/service/Service.java index bf69a13..b755c14 100644 --- a/src/main/java/com/rymcu/forest/core/service/Service.java +++ b/src/main/java/com/rymcu/forest/core/service/Service.java @@ -8,16 +8,85 @@ import java.util.List; /** * Service 层 基础接口，其他Service 接口 请继承该接口 + * + * @author ronger */ public interface Service { - void save(T model);//持久化 - void save(List models);//批量持久化 - void deleteById(String id);//通过主鍵刪除 - void deleteByIds(String ids);//批量刪除 eg：ids -> “1,2,3,4” - void update(T model);//更新 - T findById(String id);//通过ID查找 - T findBy(String fieldName, Object value) throws TooManyResultsException, ServiceException; //通过Model中某个成员变量名称（非数据表中column的名称）查找,value需符合unique约束 - List findByIds(String ids);//通过多个ID查找//eg：ids -> “1,2,3,4” - List findByCondition(Condition condition);//根据条件查找 - List findAll();//获取所有 + /** + * 持久化 + * + * @param model + */ + void save(T model); + + /** + * 批量持久化 + * + * @param models + */ + void save(List models); + + /** + * 通过主鍵刪除 + * + * @param id + */ + void deleteById(String id); + + /** + * 批量刪除 eg：ids -> “1,2,3,4” + * + * @param ids + */ + void deleteByIds(String ids); + + /** + * 更新 + * + * @param model + */ + void update(T model); + + /** + * 通过ID查找 + * + * @param id + * @return + */ + T findById(String id); + + /** + * 通过Model中某个成员变量名称（非数据表中column的名称）查找,value需符合unique约束 + * + * @param fieldName + * @param value + * @return + * @throws TooManyResultsException + * @throws ServiceException + */ + T findBy(String fieldName, Object value) throws TooManyResultsException, ServiceException; + + + /** + * 通过多个ID查找//eg：ids -> “1,2,3,4” + * + * @param ids + * @return + */ + List findByIds(String ids); + + /** + * 根据条件查找 + * + * @param condition + * @return + */ + List findByCondition(Condition condition); + + /** + * 获取所有 + * + * @return + */ + List findAll(); } diff --git a/src/main/java/com/rymcu/forest/enumerate/TransactionCode.java b/src/main/java/com/rymcu/forest/enumerate/TransactionCode.java new file mode 100644 index 0000000..233331a --- /dev/null +++ b/src/main/java/com/rymcu/forest/enumerate/TransactionCode.java @@ -0,0 +1,28 @@ +package com.rymcu.forest.enumerate; + +/** + * @author ronger + */ + +public enum TransactionCode { + + InsufficientBalance(901, "余额不足"); + + private int code; + + private String message; + + TransactionCode(int code, String message) { + this.code = code; + this.message = message; + } + + + public String getMessage() { + return this.message; + } + + public int getCode() { + return this.code; + } +} diff --git a/src/main/java/com/rymcu/forest/enumerate/SponsorEnum.java b/src/main/java/com/rymcu/forest/enumerate/TransactionEnum.java similarity index 57% rename from src/main/java/com/rymcu/forest/enumerate/SponsorEnum.java rename to src/main/java/com/rymcu/forest/enumerate/TransactionEnum.java index 7efc1e7..2eb7202 100644 --- a/src/main/java/com/rymcu/forest/enumerate/SponsorEnum.java +++ b/src/main/java/com/rymcu/forest/enumerate/TransactionEnum.java @@ -4,14 +4,16 @@ package com.rymcu.forest.enumerate; * @author ronger */ -public enum SponsorEnum { - Article("0", 20); +public enum TransactionEnum { + ArticleSponsor("0", 20), + Answer("1", 30), + CorrectAnswer("2", 50); private String dataType; private Integer money; - SponsorEnum(String dataType, Integer money) { + TransactionEnum(String dataType, Integer money) { this.dataType = dataType; this.money = money; } @@ -24,7 +26,7 @@ public enum SponsorEnum { return this.money; } - public boolean isArticle() { - return Article.equals(this); + public boolean isArticleSponsor() { + return ArticleSponsor.equals(this); } } diff --git a/src/main/java/com/rymcu/forest/service/impl/SponsorServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/SponsorServiceImpl.java index 8b1e589..9401c38 100644 --- a/src/main/java/com/rymcu/forest/service/impl/SponsorServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/SponsorServiceImpl.java @@ -1,11 +1,13 @@ package com.rymcu.forest.service.impl; +import com.rymcu.forest.core.exception.TransactionException; import com.rymcu.forest.core.service.AbstractService; import com.rymcu.forest.dto.ArticleDTO; import com.rymcu.forest.entity.Sponsor; import com.rymcu.forest.entity.TransactionRecord; import com.rymcu.forest.entity.User; -import com.rymcu.forest.enumerate.SponsorEnum; +import com.rymcu.forest.enumerate.TransactionCode; +import com.rymcu.forest.enumerate.TransactionEnum; import com.rymcu.forest.mapper.SponsorMapper; import com.rymcu.forest.service.ArticleService; import com.rymcu.forest.service.SponsorService; @@ -39,7 +41,7 @@ public class SponsorServiceImpl extends AbstractService implements Spon map.put("success", false); map.put("message", "数据异常"); } else { - SponsorEnum result = Arrays.stream(SponsorEnum.values()).filter(sponsorEnum -> sponsorEnum.getDataType().equals(sponsor.getDataType())).findFirst().orElse(SponsorEnum.Article); + TransactionEnum result = TransactionEnum.valueOf(sponsor.getDataType()); BigDecimal money = BigDecimal.valueOf(result.getMoney()); sponsor.setSponsorshipMoney(money); User user = UserUtils.getCurrentUserByToken(); @@ -47,11 +49,11 @@ public class SponsorServiceImpl extends AbstractService implements Spon sponsor.setSponsorshipTime(new Date()); sponsorMapper.insertSelective(sponsor); // 赞赏金额划转 - if (result.isArticle()) { + if (result.isArticleSponsor()) { ArticleDTO articleDTO = articleService.findArticleDTOById(sponsor.getDataId(), 1); TransactionRecord transactionRecord = transactionRecordService.transferByUserId(articleDTO.getArticleAuthorId(), user.getIdUser(), money); if (Objects.isNull(transactionRecord.getIdTransactionRecord())) { - throw new Exception("余额不足"); + throw new TransactionException(TransactionCode.InsufficientBalance); } // 更新文章赞赏数 sponsorMapper.updateArticleSponsorCount(articleDTO.getIdArticle()); From 95d2e6747e0327ff261064d3fb34c7ce71a9a671 Mon Sep 17 00:00:00 2001 From: ronger Date: Tue, 2 Feb 2021 09:43:58 +0800 Subject: [PATCH 04/27] :bug: https://github.com/rymcu/forest/issues/30 --- .../forest/config/BaseExceptionHandler.java | 44 +++++++++++-------- .../core/exception/TransactionException.java | 13 ------ .../forest/enumerate/TransactionEnum.java | 6 +++ .../service/impl/SponsorServiceImpl.java | 2 +- .../impl/TransactionRecordServiceImpl.java | 4 +- 5 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/rymcu/forest/config/BaseExceptionHandler.java b/src/main/java/com/rymcu/forest/config/BaseExceptionHandler.java index 5d60bf3..a73714f 100644 --- a/src/main/java/com/rymcu/forest/config/BaseExceptionHandler.java +++ b/src/main/java/com/rymcu/forest/config/BaseExceptionHandler.java @@ -2,8 +2,10 @@ package com.rymcu.forest.config; import com.alibaba.fastjson.support.spring.FastJsonJsonView; import com.rymcu.forest.core.exception.ServiceException; +import com.rymcu.forest.core.exception.TransactionException; import com.rymcu.forest.core.result.GlobalResult; import com.rymcu.forest.core.result.ResultCode; +import com.rymcu.forest.enumerate.TransactionCode; import com.rymcu.forest.web.api.exception.BaseApiException; import org.apache.shiro.authz.UnauthenticatedException; import org.apache.shiro.authz.UnauthorizedException; @@ -25,7 +27,7 @@ import java.util.Map; * 全局异常处理器 * * @author ronger - * */ + */ @RestControllerAdvice public class BaseExceptionHandler { @@ -33,10 +35,10 @@ public class BaseExceptionHandler { @SuppressWarnings("Duplicates") @ExceptionHandler(Exception.class) - public Object errorHandler(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex){ - if(isAjax(request)){ + public Object errorHandler(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) { + if (isAjax(request)) { GlobalResult result = new GlobalResult(); - if (ex instanceof BaseApiException){ + if (ex instanceof BaseApiException) { result.setCode(401); result.setMessage("用户未登录"); logger.info("用户未登录"); @@ -48,7 +50,7 @@ public class BaseExceptionHandler { result.setCode(1000002); result.setMessage("用户无权限"); logger.info("用户无权限"); - }else if (ex instanceof ServiceException) { + } else if (ex instanceof ServiceException) { //业务失败的异常，如“账号或密码错误” result.setCode(((ServiceException) ex).getCode()); result.setMessage(ex.getMessage()); @@ -59,7 +61,10 @@ public class BaseExceptionHandler { } else if (ex instanceof ServletException) { result.setCode(ResultCode.FAIL.getCode()); result.setMessage(ex.getMessage()); - }else { + } else if (ex instanceof TransactionException) { + result.setCode(TransactionCode.InsufficientBalance.getCode()); + result.setMessage(ex.getMessage()); + } else { //系统内部异常,不返回给客户端,内部记录错误日志 result.setCode(ResultCode.INTERNAL_SERVER_ERROR.getCode()); String message; @@ -78,11 +83,11 @@ public class BaseExceptionHandler { } result.setSuccess(false); return result; - }else { + } else { ModelAndView mv = new ModelAndView(); FastJsonJsonView view = new FastJsonJsonView(); Map attributes = new HashMap(2); - if (ex instanceof BaseApiException){ + if (ex instanceof BaseApiException) { attributes.put("code", "401"); attributes.put("message", "用户未登录"); } else if (ex instanceof UnauthenticatedException) { @@ -93,18 +98,21 @@ public class BaseExceptionHandler { attributes.put("message", "用户无权限"); } else if (ex instanceof ServiceException) { //业务失败的异常，如“账号或密码错误” - attributes.put("code",((ServiceException) ex).getCode()); - attributes.put("message",ex.getMessage()); + attributes.put("code", ((ServiceException) ex).getCode()); + attributes.put("message", ex.getMessage()); logger.info(ex.getMessage()); } else if (ex instanceof NoHandlerFoundException) { - attributes.put("code",ResultCode.NOT_FOUND.getCode()); - attributes.put("message",ResultCode.NOT_FOUND.getMessage()); + attributes.put("code", ResultCode.NOT_FOUND.getCode()); + attributes.put("message", ResultCode.NOT_FOUND.getMessage()); } else if (ex instanceof ServletException) { - attributes.put("code",ResultCode.FAIL.getCode()); - attributes.put("message",ex.getMessage()); - }else { + attributes.put("code", ResultCode.FAIL.getCode()); + attributes.put("message", ex.getMessage()); + } else if (ex instanceof TransactionException) { + attributes.put("code", TransactionCode.InsufficientBalance.getCode()); + attributes.put("message", ex.getMessage()); + } else { //系统内部异常,不返回给客户端,内部记录错误日志 - attributes.put("code",ResultCode.INTERNAL_SERVER_ERROR.getCode()); + attributes.put("code", ResultCode.INTERNAL_SERVER_ERROR.getCode()); String message; if (handler instanceof HandlerMethod) { HandlerMethod handlerMethod = (HandlerMethod) handler; @@ -117,9 +125,9 @@ public class BaseExceptionHandler { message = ex.getMessage(); } logger.error(message, ex); - attributes.put("message","操作失败"); + attributes.put("message", "操作失败"); } - attributes.put("success",false); + attributes.put("success", false); view.setAttributesMap(attributes); mv.setView(view); return mv; diff --git a/src/main/java/com/rymcu/forest/core/exception/TransactionException.java b/src/main/java/com/rymcu/forest/core/exception/TransactionException.java index 16e66b2..5ecb5dd 100644 --- a/src/main/java/com/rymcu/forest/core/exception/TransactionException.java +++ b/src/main/java/com/rymcu/forest/core/exception/TransactionException.java @@ -19,17 +19,4 @@ public class TransactionException extends Exception { public int getCode() { return code; } - - public void setCode(int code) { - this.code = code; - } - - @Override - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } } diff --git a/src/main/java/com/rymcu/forest/enumerate/TransactionEnum.java b/src/main/java/com/rymcu/forest/enumerate/TransactionEnum.java index 2eb7202..e8eb801 100644 --- a/src/main/java/com/rymcu/forest/enumerate/TransactionEnum.java +++ b/src/main/java/com/rymcu/forest/enumerate/TransactionEnum.java @@ -1,5 +1,7 @@ package com.rymcu.forest.enumerate; +import java.util.Arrays; + /** * @author ronger */ @@ -18,6 +20,10 @@ public enum TransactionEnum { this.money = money; } + public static TransactionEnum findTransactionEnum(String dataType) { + return Arrays.stream(TransactionEnum.values()).filter(transactionEnum -> transactionEnum.getDataType().equals(dataType)).findFirst().orElse(TransactionEnum.ArticleSponsor); + } + public String getDataType() { return this.dataType; } diff --git a/src/main/java/com/rymcu/forest/service/impl/SponsorServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/SponsorServiceImpl.java index 9401c38..e6555ff 100644 --- a/src/main/java/com/rymcu/forest/service/impl/SponsorServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/SponsorServiceImpl.java @@ -41,7 +41,7 @@ public class SponsorServiceImpl extends AbstractService implements Spon map.put("success", false); map.put("message", "数据异常"); } else { - TransactionEnum result = TransactionEnum.valueOf(sponsor.getDataType()); + TransactionEnum result = TransactionEnum.findTransactionEnum(sponsor.getDataType()); BigDecimal money = BigDecimal.valueOf(result.getMoney()); sponsor.setSponsorshipMoney(money); User user = UserUtils.getCurrentUserByToken(); diff --git a/src/main/java/com/rymcu/forest/service/impl/TransactionRecordServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/TransactionRecordServiceImpl.java index 7925da4..94c16da 100644 --- a/src/main/java/com/rymcu/forest/service/impl/TransactionRecordServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/TransactionRecordServiceImpl.java @@ -1,12 +1,14 @@ package com.rymcu.forest.service.impl; import com.rymcu.forest.core.exception.ServiceException; +import com.rymcu.forest.core.exception.TransactionException; import com.rymcu.forest.core.service.AbstractService; import com.rymcu.forest.core.service.redis.RedisService; import com.rymcu.forest.dto.BankAccountDTO; import com.rymcu.forest.dto.TransactionRecordDTO; import com.rymcu.forest.entity.BankAccount; import com.rymcu.forest.entity.TransactionRecord; +import com.rymcu.forest.enumerate.TransactionCode; import com.rymcu.forest.mapper.TransactionRecordMapper; import com.rymcu.forest.service.BankAccountService; import com.rymcu.forest.service.TransactionRecordService; @@ -47,7 +49,7 @@ public class TransactionRecordServiceImpl extends AbstractService Date: Tue, 2 Feb 2021 09:45:46 +0800 Subject: [PATCH 05/27] :bug: https://github.com/rymcu/forest/issues/31 --- src/main/java/com/rymcu/forest/mapper/ArticleMapper.java | 6 ++++++ .../com/rymcu/forest/service/impl/ArticleServiceImpl.java | 2 ++ src/main/java/mapper/ArticleMapper.xml | 3 +++ 3 files changed, 11 insertions(+) diff --git a/src/main/java/com/rymcu/forest/mapper/ArticleMapper.java b/src/main/java/com/rymcu/forest/mapper/ArticleMapper.java index 4f9d5ca..58a34d2 100644 --- a/src/main/java/com/rymcu/forest/mapper/ArticleMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/ArticleMapper.java @@ -184,4 +184,10 @@ public interface ArticleMapper extends Mapper
{ * @return */ int updatePerfect(@Param("idArticle") Integer idArticle, @Param("articlePerfect") String articlePerfect); + + /** + * 删除文章关联文章内容表信息 + * @param idArticle + */ + void deleteArticleContent(@Param("idArticle") Integer idArticle); } diff --git a/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java index faaa500..386dee6 100644 --- a/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java @@ -268,6 +268,8 @@ public class ArticleServiceImpl extends AbstractService
implements Arti articleMapper.deleteLinkedPortfolioData(id); // 删除引用标签记录 articleMapper.deleteTagArticle(id); + // 删除文章内容表 + articleMapper.deleteArticleContent(id); } @Override diff --git a/src/main/java/mapper/ArticleMapper.xml b/src/main/java/mapper/ArticleMapper.xml index 240f694..6378b98 100644 --- a/src/main/java/mapper/ArticleMapper.xml +++ b/src/main/java/mapper/ArticleMapper.xml @@ -97,6 +97,9 @@ delete from forest_portfolio_article where id_article = #{id} + + delete from forest_article_content where id_article = #{idArticle} + + \ No newline at end of file From eacb753e55ea769f05bcf83a8cd7f18d3b8b2313 Mon Sep 17 00:00:00 2001 From: ronger Date: Wed, 24 Feb 2021 09:08:56 +0800 Subject: [PATCH 07/27] =?UTF-8?q?:bug:=20=E6=B6=88=E6=81=AF=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/rymcu/forest/mapper/NotificationMapper.java | 3 ++- .../forest/service/impl/NotificationServiceImpl.java | 9 ++++----- src/main/java/mapper/NotificationMapper.xml | 11 ++++++++++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/rymcu/forest/mapper/NotificationMapper.java b/src/main/java/com/rymcu/forest/mapper/NotificationMapper.java index 8a3dd6f..2ae27ad 100644 --- a/src/main/java/com/rymcu/forest/mapper/NotificationMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/NotificationMapper.java @@ -1,6 +1,7 @@ package com.rymcu.forest.mapper; import com.rymcu.forest.core.mapper.Mapper; +import com.rymcu.forest.dto.NotificationDTO; import com.rymcu.forest.entity.Notification; import org.apache.ibatis.annotations.Param; @@ -23,7 +24,7 @@ public interface NotificationMapper extends Mapper { * @param idUser * @return */ - List selectNotifications(@Param("idUser") Integer idUser); + List selectNotifications(@Param("idUser") Integer idUser); /** * 获取消息数据 diff --git a/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java index 7aef442..4883182 100644 --- a/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java @@ -49,13 +49,12 @@ public class NotificationServiceImpl extends AbstractService imple @Override public List findNotifications(Integer idUser) { - List list = notificationMapper.selectNotifications(idUser); - List notifications = new ArrayList<>(); + List list = notificationMapper.selectNotifications(idUser); list.forEach(notification -> { NotificationDTO notificationDTO = genNotification(notification); // 判断关联数据是否已删除 if (Objects.nonNull(notificationDTO.getAuthor())) { - notifications.add(notificationDTO); + BeanCopierUtil.copy(notificationDTO, notification); } else { // 关联数据已删除,且未读 if (unRead.equals(notification.getHasRead())) { @@ -66,10 +65,10 @@ public class NotificationServiceImpl extends AbstractService imple dto.setDataType("-1"); dto.setHasRead("1"); dto.setCreatedTime(notification.getCreatedTime()); - notifications.add(dto); + BeanCopierUtil.copy(dto, notification); } }); - return notifications; + return list; } private NotificationDTO genNotification(Notification notification) { diff --git a/src/main/java/mapper/NotificationMapper.xml b/src/main/java/mapper/NotificationMapper.xml index 81fa9b0..80ef662 100644 --- a/src/main/java/mapper/NotificationMapper.xml +++ b/src/main/java/mapper/NotificationMapper.xml @@ -10,6 +10,15 @@ + + + + + + + + + insert into forest_notification (id_user, data_type, data_id, data_summary, created_time) values (#{idUser}, #{dataType}, #{dataId}, #{dataSummary}, sysdate()) @@ -19,7 +28,7 @@ - select * from forest_notification where id_user = #{idUser} order by created_time desc - select * from forest_transaction_record where form_bank_account = #{bankAccount} or to_bank_account = #{bankAccount} + select * from forest_transaction_record where form_bank_account = #{bankAccount} or to_bank_account = #{bankAccount} order by transaction_time desc select * from forest_user where id = #{id} + \ No newline at end of file From 0652405281a79d0dcbc707f5e56f6ef7445cfd1e Mon Sep 17 00:00:00 2001 From: ronger Date: Sat, 6 Mar 2021 10:00:42 +0800 Subject: [PATCH 11/27] =?UTF-8?q?:bug:=20=E6=B6=88=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?= =?UTF-8?q?,=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E4=BC=98=E5=85=88?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/mapper/NotificationMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mapper/NotificationMapper.xml b/src/main/java/mapper/NotificationMapper.xml index 80ef662..144d4ca 100644 --- a/src/main/java/mapper/NotificationMapper.xml +++ b/src/main/java/mapper/NotificationMapper.xml @@ -29,7 +29,7 @@ select * from forest_notification where has_read = '0' and id_user = #{idUser} order by created_time desc \ No newline at end of file From 9aa0aad6554143fb38cedf8a7ed0aea0803eb330 Mon Sep 17 00:00:00 2001 From: ronger Date: Sat, 6 Mar 2021 21:31:31 +0800 Subject: [PATCH 13/27] =?UTF-8?q?:sparkles:=20=E4=BD=9C=E5=93=81=E9=9B=86?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../forest/web/api/common/CommonApiController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java b/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java index d9e330a..ca68996 100644 --- a/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java +++ b/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java @@ -7,6 +7,7 @@ import com.rymcu.forest.core.result.GlobalResultGenerator; import com.rymcu.forest.core.result.GlobalResultMessage; import com.rymcu.forest.core.service.log.annotation.VisitLogger; import com.rymcu.forest.dto.*; +import com.rymcu.forest.entity.Portfolio; import com.rymcu.forest.entity.User; import com.rymcu.forest.service.*; import com.rymcu.forest.util.UserUtils; @@ -140,4 +141,16 @@ public class CommonApiController { List list = SearchService.initialSearch(); return GlobalResultGenerator.genSuccessResult(list); } + + @GetMapping("/portfolios") + public GlobalResult portfolios(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "10") Integer rows) { + PageHelper.startPage(page, rows); + List list = portfolioService.findAll(); + PageInfo pageInfo = new PageInfo(list); + Map map = new HashMap(2); + map.put("portfolios", pageInfo.getList()); + Map pagination = Utils.getPagination(pageInfo); + map.put("pagination", pagination); + return GlobalResultGenerator.genSuccessResult(map); + } } From e7afb5e67edecac3fc21f47ebb32786f2022976c Mon Sep 17 00:00:00 2001 From: ronger Date: Mon, 8 Mar 2021 10:35:49 +0800 Subject: [PATCH 14/27] =?UTF-8?q?:art:=20=E6=89=A9=E5=B1=95=20`forest=5Fco?= =?UTF-8?q?mment`=20=E8=A1=A8=20`comment=5Fua`=20=E5=AD=97=E6=AE=B5(varcha?= =?UTF-8?q?r(128)=20->=20varchar(512))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/static/forest.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/forest.sql b/src/main/resources/static/forest.sql index bd27ce5..b492f44 100644 --- a/src/main/resources/static/forest.sql +++ b/src/main/resources/static/forest.sql @@ -84,7 +84,7 @@ create table forest_comment comment_original_comment_id bigint null comment '父评论 id', comment_status char default '0' null comment '状态', comment_ip varchar(128) null comment '评论 IP', - comment_ua varchar(128) null comment 'User-Agent', + comment_ua varchar(512) null comment 'User-Agent', comment_anonymous char null comment '0：公开回帖，1：匿名回帖', comment_reply_count int null comment '回帖计数', comment_visible char null comment '0：所有人可见，1：仅楼主和自己可见', From 198cff64a5727ac5c25318997f656ba7249226f1 Mon Sep 17 00:00:00 2001 From: ronger Date: Mon, 15 Mar 2021 21:21:27 +0800 Subject: [PATCH 15/27] =?UTF-8?q?:art:=20=E4=BD=9C=E5=93=81=E9=9B=86?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java | 6 ++++++ .../java/com/rymcu/forest/service/PortfolioService.java | 6 ++++++ .../com/rymcu/forest/service/impl/PortfolioServiceImpl.java | 5 +++++ .../rymcu/forest/web/api/common/CommonApiController.java | 4 ++-- src/main/java/mapper/PortfolioMapper.xml | 3 +++ 5 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java b/src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java index 7439e31..d90c0b0 100644 --- a/src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java +++ b/src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java @@ -73,4 +73,10 @@ public interface PortfolioMapper extends Mapper { * @return */ Integer unbindArticle(@Param("idPortfolio") Integer idPortfolio, @Param("idArticle") Integer idArticle); + + /** + * 获取作品集列表数据 + * @return + */ + List selectPortfolios(); } diff --git a/src/main/java/com/rymcu/forest/service/PortfolioService.java b/src/main/java/com/rymcu/forest/service/PortfolioService.java index 9413ccd..df8d2e7 100644 --- a/src/main/java/com/rymcu/forest/service/PortfolioService.java +++ b/src/main/java/com/rymcu/forest/service/PortfolioService.java @@ -77,4 +77,10 @@ public interface PortfolioService extends Service { * @return */ Map deletePortfolio(Integer idPortfolio); + + /** + * 获取作品集列表数据 + * @return + */ + List findPortfolios(); } diff --git a/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java index b6aa53c..af9a0fc 100644 --- a/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java @@ -174,6 +174,11 @@ public class PortfolioServiceImpl extends AbstractService implements return map; } + @Override + public List findPortfolios() { + return portfolioMapper.selectPortfolios(); + } + private PortfolioDTO genPortfolioAuthor(PortfolioDTO portfolioDTO, Author author) { portfolioDTO.setPortfolioAuthorAvatarUrl(author.getUserAvatarURL()); portfolioDTO.setPortfolioAuthorName(author.getUserNickname()); diff --git a/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java b/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java index ca68996..88d4931 100644 --- a/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java +++ b/src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java @@ -143,9 +143,9 @@ public class CommonApiController { } @GetMapping("/portfolios") - public GlobalResult portfolios(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "10") Integer rows) { + public GlobalResult portfolios(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows) { PageHelper.startPage(page, rows); - List list = portfolioService.findAll(); + List list = portfolioService.findPortfolios(); PageInfo pageInfo = new PageInfo(list); Map map = new HashMap(2); map.put("portfolios", pageInfo.getList()); diff --git a/src/main/java/mapper/PortfolioMapper.xml b/src/main/java/mapper/PortfolioMapper.xml index 58c6eb9..ac07b15 100644 --- a/src/main/java/mapper/PortfolioMapper.xml +++ b/src/main/java/mapper/PortfolioMapper.xml @@ -51,4 +51,7 @@ + \ No newline at end of file From ab45193ae81fc70795efc055bfe93601225819ca Mon Sep 17 00:00:00 2001 From: ronger Date: Tue, 16 Mar 2021 11:00:26 +0800 Subject: [PATCH 16/27] =?UTF-8?q?:arrow=5Fup:=20XStream=20<=201.4.15=20?= =?UTF-8?q?=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96=E6=BC=8F=E6=B4=9E=EF=BC=88?= =?UTF-8?q?CVE-2020-26258=E3=80=81CVE-2020-26259=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 69e23de..bff52cb 100644 --- a/pom.xml +++ b/pom.xml @@ -172,7 +172,7 @@ com.github.binarywang weixin-java-open - 3.9.0 + 4.0.0 commons-codec @@ -182,8 +182,17 @@ commons-io commons-io + + com.thoughtworks.xstream + xstream + + + com.thoughtworks.xstream + xstream + 1.4.15 + com.github.jedis-lock jedis-lock From d568139748086cabafe43d99ba0f573ed3e15495 Mon Sep 17 00:00:00 2001 From: ronger Date: Wed, 17 Mar 2021 09:58:12 +0800 Subject: [PATCH 17/27] :arrow_up: wx-java-open --- .../forest/wx/mp/controller/WxRedirectController.java | 8 ++++---- .../rymcu/forest/wx/mp/controller/WxoAuthController.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/rymcu/forest/wx/mp/controller/WxRedirectController.java b/src/main/java/com/rymcu/forest/wx/mp/controller/WxRedirectController.java index 0395f65..2e0364c 100644 --- a/src/main/java/com/rymcu/forest/wx/mp/controller/WxRedirectController.java +++ b/src/main/java/com/rymcu/forest/wx/mp/controller/WxRedirectController.java @@ -1,10 +1,10 @@ package com.rymcu.forest.wx.mp.controller; import lombok.AllArgsConstructor; +import me.chanjar.weixin.common.bean.WxOAuth2UserInfo; +import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; -import me.chanjar.weixin.mp.bean.result.WxMpUser; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.PathVariable; @@ -27,8 +27,8 @@ public class WxRedirectController { } try { - WxMpOAuth2AccessToken accessToken = wxService.getOAuth2Service().getAccessToken(code); - WxMpUser user = wxService.getOAuth2Service().getUserInfo(accessToken, null); + WxOAuth2AccessToken accessToken = wxService.getOAuth2Service().getAccessToken(code); + WxOAuth2UserInfo user = wxService.getOAuth2Service().getUserInfo(accessToken, null); map.put("user", user); } catch (WxErrorException e) { e.printStackTrace(); diff --git a/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java b/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java index d302914..7e0ba87 100644 --- a/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java +++ b/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java @@ -4,10 +4,10 @@ import com.rymcu.forest.service.WxUserService; import com.rymcu.forest.util.ContextHolderUtils; import me.chanjar.weixin.common.api.WxConsts; import me.chanjar.weixin.common.bean.WxJsapiSignature; +import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.common.util.http.URIUtil; import me.chanjar.weixin.mp.api.WxMpService; -import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; import me.chanjar.weixin.mp.bean.result.WxMpUser; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; @@ -52,7 +52,7 @@ public class WxoAuthController { @GetMapping("getAccessToken") public String getAccessToken(@PathVariable String appId, @RequestParam(name = "code") String code, @RequestParam(name = "redirectUrl") String redirectUrl) throws Exception { wxMpService.switchoverTo(appId); - WxMpOAuth2AccessToken oAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code); + WxOAuth2AccessToken oAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code); boolean valid = wxMpService.getOAuth2Service().validateAccessToken(oAuth2AccessToken); if (!valid) { throw new Exception("无权限"); From ec642e3f2e61daa7a4a395b43994c12b5b035905 Mon Sep 17 00:00:00 2001 From: ronger Date: Wed, 17 Mar 2021 09:59:24 +0800 Subject: [PATCH 18/27] =?UTF-8?q?:sparkles:=20=E9=80=9A=E8=BF=87=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E6=9C=AC=E5=9C=B0=20json=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=85=AC=E4=BC=97=E5=8F=B7=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wx/mp/controller/WxMenuController.java | 54 +++---------------- .../forest/wx/mp/service/WxMenuService.java | 17 ++++++ .../wx/mp/service/impl/WxMenuServiceImpl.java | 46 ++++++++++++++++ src/main/resources/wxMpMenus.json | 21 ++++++++ 4 files changed, 92 insertions(+), 46 deletions(-) create mode 100644 src/main/java/com/rymcu/forest/wx/mp/service/WxMenuService.java create mode 100644 src/main/java/com/rymcu/forest/wx/mp/service/impl/WxMenuServiceImpl.java create mode 100644 src/main/resources/wxMpMenus.json diff --git a/src/main/java/com/rymcu/forest/wx/mp/controller/WxMenuController.java b/src/main/java/com/rymcu/forest/wx/mp/controller/WxMenuController.java index 09668aa..1a0e8ad 100644 --- a/src/main/java/com/rymcu/forest/wx/mp/controller/WxMenuController.java +++ b/src/main/java/com/rymcu/forest/wx/mp/controller/WxMenuController.java @@ -1,5 +1,6 @@ package com.rymcu.forest.wx.mp.controller; +import com.rymcu.forest.wx.mp.service.WxMenuService; import lombok.AllArgsConstructor; import me.chanjar.weixin.common.bean.menu.WxMenu; import me.chanjar.weixin.common.bean.menu.WxMenuButton; @@ -7,8 +8,11 @@ import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.menu.WxMpGetSelfMenuInfoResult; import me.chanjar.weixin.mp.bean.menu.WxMpMenu; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; +import java.io.IOException; import java.net.MalformedURLException; import static me.chanjar.weixin.common.api.WxConsts.MenuButtonType; @@ -21,7 +25,8 @@ import static me.chanjar.weixin.common.api.WxConsts.MenuButtonType; @RequestMapping("/wx/menu/{appId}") public class WxMenuController { private final WxMpService wxService; - + @Resource + private WxMenuService wxMenuService; /** * 
      * 自定义菜单创建接口
@@ -38,52 +43,9 @@ public class WxMenuController {
     }
 
     @GetMapping("/create")
-    public String menuCreateSample(@PathVariable String appId) throws WxErrorException, MalformedURLException {
-        WxMenu menu = new WxMenu();
-        WxMenuButton button1 = new WxMenuButton();
-        button1.setType(MenuButtonType.VIEW);
-        button1.setName("官方网站");
-        button1.setUrl("https://rymcu.com");
-
-//        WxMenuButton button2 = new WxMenuButton();
-//        button2.setType(WxConsts.BUTTON_MINIPROGRAM);
-//        button2.setName("小程序");
-//        button2.setAppId("wx286b93c14bbf93aa");
-//        button2.setPagePath("pages/lunar/index.html");
-//        button2.setUrl("http://mp.weixin.qq.com");
-
-        WxMenuButton button3 = new WxMenuButton();
-        button3.setName("学习教程");
-
-        menu.getButtons().add(button1);
-//        menu.getButtons().add(button2);
-        menu.getButtons().add(button3);
-
-        WxMenuButton button31 = new WxMenuButton();
-        button31.setType(MenuButtonType.VIEW);
-        button31.setName("51单片机入门教程");
-        button31.setUrl("https://mp.weixin.qq.com/mp/homepage?__biz=MzA3NjMzMzM1Mw==&hid=1&sn=672df75323f9976d990f6be14355070b");
-
-//        WxMenuButton button34 = new WxMenuButton();
-//        button34.setType(MenuButtonType.VIEW);
-//        button34.setName("获取用户信息");
-//
-//        ServletRequestAttributes servletRequestAttributes =
-//            (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
-//        if (servletRequestAttributes != null) {
-//            HttpServletRequest request = servletRequestAttributes.getRequest();
-//            URL requestURL = new URL(request.getRequestURL().toString());
-//            String url = this.wxService.switchoverTo(appId).oauth2buildAuthorizationUrl(
-//                String.format("%s://%s/wx/redirect/%s/greet", requestURL.getProtocol(), requestURL.getHost(), appId),
-//                WxConsts.OAuth2Scope.SNSAPI_USERINFO, null);
-//            button34.setUrl(url);
-//        }
-
-        button3.getSubButtons().add(button31);
-//        button3.getSubButtons().add(button34);
-
+    public String menuCreateSample(@PathVariable String appId) throws WxErrorException, IOException {
         this.wxService.switchover(appId);
-        return this.wxService.getMenuService().menuCreate(menu);
+        return this.wxService.getMenuService().menuCreate(wxMenuService.getMenus());
     }
 
     /**
diff --git a/src/main/java/com/rymcu/forest/wx/mp/service/WxMenuService.java b/src/main/java/com/rymcu/forest/wx/mp/service/WxMenuService.java
new file mode 100644
index 0000000..b67745d
--- /dev/null
+++ b/src/main/java/com/rymcu/forest/wx/mp/service/WxMenuService.java
@@ -0,0 +1,17 @@
+package com.rymcu.forest.wx.mp.service;
+
+import me.chanjar.weixin.common.bean.menu.WxMenu;
+
+import java.io.IOException;
+
+/**
+ * @author ronger
+ */
+public interface WxMenuService {
+    /**
+     * 获取公众号菜单配置
+     * @return
+     * @throws IOException
+     */
+    WxMenu getMenus() throws IOException;
+}
diff --git a/src/main/java/com/rymcu/forest/wx/mp/service/impl/WxMenuServiceImpl.java b/src/main/java/com/rymcu/forest/wx/mp/service/impl/WxMenuServiceImpl.java
new file mode 100644
index 0000000..f70493c
--- /dev/null
+++ b/src/main/java/com/rymcu/forest/wx/mp/service/impl/WxMenuServiceImpl.java
@@ -0,0 +1,46 @@
+package com.rymcu.forest.wx.mp.service.impl;
+
+import com.rymcu.forest.wx.mp.service.WxMenuService;
+import me.chanjar.weixin.common.bean.menu.WxMenu;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Scanner;
+
+/**
+ * @author ronger
+ */
+@Service
+public class WxMenuServiceImpl implements WxMenuService {
+    @Value("classpath:wxMpMenus.json")
+    private Resource menuResource;
+
+    @Override
+    public WxMenu getMenus() throws IOException {
+        File file = menuResource.getFile();
+        String menuJson = this.jsonRead(file);
+        WxMenu wxMenu = WxMenu.fromJson(menuJson);
+        return wxMenu;
+    }
+
+    private String jsonRead(File file) {
+        Scanner scanner = null;
+        StringBuilder buffer = new StringBuilder();
+        try {
+            scanner = new Scanner(file, "utf-8");
+            while (scanner.hasNextLine()) {
+                buffer.append(scanner.nextLine());
+            }
+        } catch (Exception e) {
+
+        } finally {
+            if (scanner != null) {
+                scanner.close();
+            }
+        }
+        return buffer.toString();
+    }
+}
diff --git a/src/main/resources/wxMpMenus.json b/src/main/resources/wxMpMenus.json
new file mode 100644
index 0000000..e2518f1
--- /dev/null
+++ b/src/main/resources/wxMpMenus.json
@@ -0,0 +1,21 @@
+{
+  "menu": {
+    "button": [
+      {
+        "type": "view",
+        "name": "官方网站",
+        "url": "https://rymcu.com"
+      },
+      {
+        "name": "学习教程",
+        "sub_button": [
+          {
+            "type": "view",
+            "name": "51单片机入门教程",
+            "url": "https://mp.weixin.qq.com/mp/homepage?__biz=MzA3NjMzMzM1Mw==&hid=1&sn=672df75323f9976d990f6be14355070b"
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file

From f9528399bf42e3549406725dec9d705b42916774 Mon Sep 17 00:00:00 2001
From: ronger 
Date: Thu, 25 Mar 2021 21:49:21 +0800
Subject: [PATCH 19/27] :poop: websocket

---
 .../forest/config/WebSocketStompConfig.java   |  2 +-
 .../web/api/common/WebSocketController.java   | 39 ++++---------------
 2 files changed, 8 insertions(+), 33 deletions(-)

diff --git a/src/main/java/com/rymcu/forest/config/WebSocketStompConfig.java b/src/main/java/com/rymcu/forest/config/WebSocketStompConfig.java
index a158e49..3eb259f 100644
--- a/src/main/java/com/rymcu/forest/config/WebSocketStompConfig.java
+++ b/src/main/java/com/rymcu/forest/config/WebSocketStompConfig.java
@@ -30,7 +30,7 @@ public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer {
     public void configureMessageBroker(MessageBrokerRegistry registry) {
 
         // 订阅Broker名称 user点对点 topic广播即群发
-        registry.enableSimpleBroker("/user","/public");
+        registry.enableSimpleBroker("/topic", "/user");
         // 全局(客户端)使用的消息前缀
         registry.setApplicationDestinationPrefixes("/app");
         // 点对点使用的前缀 无需配置 默认/user
diff --git a/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java b/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java
index 62f5e26..7a3a4b1 100644
--- a/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java
+++ b/src/main/java/com/rymcu/forest/web/api/common/WebSocketController.java
@@ -1,7 +1,6 @@
 package com.rymcu.forest.web.api.common;
 
 import com.alibaba.fastjson.JSONObject;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.handler.annotation.MessageMapping;
 import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -9,7 +8,7 @@ import org.springframework.messaging.simp.annotation.SendToUser;
 import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
 import org.springframework.stereotype.Controller;
 
-import java.util.HashMap;
+import javax.annotation.Resource;
 
 /**
  * @author ronger
@@ -17,42 +16,18 @@ import java.util.HashMap;
 @Controller
 public class WebSocketController {
 
-    @Autowired
+    @Resource
     private SimpMessagingTemplate template;
 
     @MessageMapping("/sendMessage")
-    @SendTo("/public/greetings")
-    public void sendMessage(JSONObject message, StompHeaderAccessor headerAccessor){
-        this.template.convertAndSend("/public/greetings",message);
+    @SendTo("/topic/greening")
+    public void sendMessage(JSONObject message, StompHeaderAccessor headerAccessor) {
+        this.template.convertAndSend("/topic/greening", message);
     }
 
     @MessageMapping("/message")
     @SendToUser("/message")
-    public void message(JSONObject message){
-        String type = message.get("type").toString();
-        HashMap res = (HashMap) message.get("data");
-        HashMap mine = (HashMap) res.get("mine");
-        HashMap to = (HashMap) res.get("to");
-        System.out.println(to.get("type"));
-        boolean flag = to.get("type").equals("friend")?true:false;
-        String id = to.get("id").toString();
-        HashMap map = new HashMap();
-        map.put("id",mine.get("id"));
-        map.put("avatar",mine.get("avatar"));
-        map.put("formid",mine.get("id"));
-        map.put("username",mine.get("username"));
-        map.put("type",to.get("type"));
-        map.put("content",mine.get("content"));
-        map.put("mine",false);
-        map.put("cid",0);
-        map.put("timestamp","");
-        JSONObject json = new JSONObject();
-        json.put("type",type);
-        json.put("data",map);
-        if(flag){
-            this.template.convertAndSendToUser(id,"/message",json);
-        }else{
-            this.template.convertAndSendToUser(id,"/message",json);
-        }
+    public void message(JSONObject message, StompHeaderAccessor headerAccessor) {
+        this.template.convertAndSendToUser(message.getString("to"), "/message", message);
     }
 }

From 13edb5a063f4e66e83c50b5965fecf51c412b955 Mon Sep 17 00:00:00 2001
From: ronger 
Date: Fri, 26 Mar 2021 10:46:21 +0800
Subject: [PATCH 20/27] =?UTF-8?q?:recycle:=20=E4=B8=AA=E4=BA=BA=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=B7=AF=E5=BE=84=20/user/nickname=20->=20/user/accou?=
 =?UTF-8?q?nt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../forest/config/MybatisConfigurer.java      |  2 +-
 .../java/com/rymcu/forest/dto/Author.java     |  2 ++
 .../com/rymcu/forest/mapper/UserMapper.java   |  4 +--
 .../com/rymcu/forest/service/UserService.java | 10 +++---
 .../service/impl/ArticleServiceImpl.java      |  2 ++
 .../service/impl/PortfolioServiceImpl.java    |  5 +--
 .../forest/service/impl/UserServiceImpl.java  |  6 ++--
 .../forest/web/api/user/UserController.java   | 36 +++++++++----------
 .../wx/mp/controller/WxoAuthController.java   |  6 ++--
 src/main/java/mapper/UserMapper.xml           |  5 +--
 src/main/resources/wxMpMenus.json             |  5 +++
 12 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/pom.xml b/pom.xml
index bff52cb..8edbd3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -191,7 +191,7 @@
         
             com.thoughtworks.xstream
             xstream
-            1.4.15
+            1.4.16
         
         
             com.github.jedis-lock
diff --git a/src/main/java/com/rymcu/forest/config/MybatisConfigurer.java b/src/main/java/com/rymcu/forest/config/MybatisConfigurer.java
index 594882c..9aa708d 100644
--- a/src/main/java/com/rymcu/forest/config/MybatisConfigurer.java
+++ b/src/main/java/com/rymcu/forest/config/MybatisConfigurer.java
@@ -45,7 +45,7 @@ public class MybatisConfigurer {
         //添加XML目录
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         factory.setMapperLocations(resolver.getResources("classpath:mapper/**/*.xml"));
-        factory.setTypeHandlersPackage("com.rymcu.forest.util.handlers");
+//        factory.setTypeHandlersPackage("com.rymcu.forest.util.handlers");
         return factory.getObject();
     }
 
diff --git a/src/main/java/com/rymcu/forest/dto/Author.java b/src/main/java/com/rymcu/forest/dto/Author.java
index 5dca54e..3782f01 100644
--- a/src/main/java/com/rymcu/forest/dto/Author.java
+++ b/src/main/java/com/rymcu/forest/dto/Author.java
@@ -12,6 +12,8 @@ public class Author {
 
     private String userNickname;
 
+    private String userAccount;
+
     private String userAvatarURL;
 
     private String userArticleCount;
diff --git a/src/main/java/com/rymcu/forest/mapper/UserMapper.java b/src/main/java/com/rymcu/forest/mapper/UserMapper.java
index 2d61a58..f23b726 100644
--- a/src/main/java/com/rymcu/forest/mapper/UserMapper.java
+++ b/src/main/java/com/rymcu/forest/mapper/UserMapper.java
@@ -39,10 +39,10 @@ public interface UserMapper extends Mapper {
 
     /**
      * 根据用户昵称获取用户信息
-     * @param nickname
+     * @param account
      * @return
      */
-    UserDTO selectUserDTOByNickname(@Param("nickname") String nickname);
+    UserDTO selectUserDTOByAccount(@Param("account") String account);
 
     /**
      * 修改用户密码
diff --git a/src/main/java/com/rymcu/forest/service/UserService.java b/src/main/java/com/rymcu/forest/service/UserService.java
index 7fcca8f..31ad8c3 100644
--- a/src/main/java/com/rymcu/forest/service/UserService.java
+++ b/src/main/java/com/rymcu/forest/service/UserService.java
@@ -43,11 +43,11 @@ public interface UserService extends Service {
     Map login(String account, String password);
 
     /**
-     * 通过 nickname 获取用户信息接口
-     * @param nickname 昵称
+     * 通过 account 获取用户信息接口
+     * @param account 昵称
      * @return  UserDTO
      * */
-    UserDTO findUserDTOByNickname(String nickname);
+    UserDTO findUserDTOByAccount(String account);
 
     /**
      * 找回密码接口
@@ -118,10 +118,10 @@ public interface UserService extends Service {
 
     /**
      * 获取用户扩展信息
-     * @param nickname
+     * @param account
      * @return
      */
-    UserExtend selectUserExtendByNickname(String nickname);
+    UserExtend selectUserExtendByAccount(String account);
 
     /**
      * 更换邮箱
diff --git a/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java
index 9bbbb54..af287d1 100644
--- a/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java
@@ -388,9 +388,11 @@ public class ArticleServiceImpl extends AbstractService
 implements Arti
 
     private Author genAuthor(ArticleDTO article) {
         Author author = new Author();
+        User user = userService.findById(String.valueOf(article.getArticleAuthorId()));
         author.setUserNickname(article.getArticleAuthorName());
         author.setUserAvatarURL(article.getArticleAuthorAvatarUrl());
         author.setIdUser(article.getArticleAuthorId());
+        author.setUserAccount(user.getAccount());
         return author;
     }
 }
diff --git a/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java
index af9a0fc..b843722 100644
--- a/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java
@@ -39,10 +39,7 @@ public class PortfolioServiceImpl extends AbstractService implements
     @Override
     public List findUserPortfoliosByUser(UserDTO userDTO) {
         List list = portfolioMapper.selectUserPortfoliosByIdUser(userDTO.getIdUser());
-        Author author = new Author();
-        author.setIdUser(userDTO.getIdUser());
-        author.setUserAvatarURL(userDTO.getAvatarUrl());
-        author.setUserNickname(userDTO.getNickname());
+        Author author = userService.selectAuthor(userDTO.getIdUser());
         list.forEach(portfolioDTO -> {
             genPortfolioAuthor(portfolioDTO,author);
         });
diff --git a/src/main/java/com/rymcu/forest/service/impl/UserServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/UserServiceImpl.java
index 2ae4446..891cf7c 100644
--- a/src/main/java/com/rymcu/forest/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/service/impl/UserServiceImpl.java
@@ -116,8 +116,8 @@ public class UserServiceImpl extends AbstractService implements UserServic
     }
 
     @Override
-    public UserDTO findUserDTOByNickname(String nickname) {
-        UserDTO user = userMapper.selectUserDTOByNickname(nickname);
+    public UserDTO findUserDTOByAccount(String account) {
+        UserDTO user = userMapper.selectUserDTOByAccount(account);
         return user;
     }
 
@@ -239,7 +239,7 @@ public class UserServiceImpl extends AbstractService implements UserServic
     }
 
     @Override
-    public UserExtend selectUserExtendByNickname(String nickname) {
+    public UserExtend selectUserExtendByAccount(String nickname) {
         return userExtendMapper.selectUserExtendByNickname(nickname);
     }
 
diff --git a/src/main/java/com/rymcu/forest/web/api/user/UserController.java b/src/main/java/com/rymcu/forest/web/api/user/UserController.java
index f7e154e..9976387 100644
--- a/src/main/java/com/rymcu/forest/web/api/user/UserController.java
+++ b/src/main/java/com/rymcu/forest/web/api/user/UserController.java
@@ -37,16 +37,16 @@ public class UserController {
     @Resource
     private FollowService followService;
 
-    @GetMapping("/{nickname}")
+    @GetMapping("/{account}")
     @VisitLogger
-    public GlobalResult detail(@PathVariable String nickname){
-        UserDTO userDTO = userService.findUserDTOByNickname(nickname);
+    public GlobalResult detail(@PathVariable String account){
+        UserDTO userDTO = userService.findUserDTOByAccount(account);
         return GlobalResultGenerator.genSuccessResult(userDTO);
     }
 
-    @GetMapping("/{nickname}/articles")
-    public GlobalResult userArticles(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows, @PathVariable String nickname){
-        UserDTO userDTO = userService.findUserDTOByNickname(nickname);
+    @GetMapping("/{account}/articles")
+    public GlobalResult userArticles(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows, @PathVariable String account){
+        UserDTO userDTO = userService.findUserDTOByAccount(account);
         if (userDTO == null){
             return GlobalResultGenerator.genErrorResult("用户不存在！");
         }
@@ -57,9 +57,9 @@ public class UserController {
         return GlobalResultGenerator.genSuccessResult(map);
     }
 
-    @GetMapping("/{nickname}/portfolios")
-    public GlobalResult userPortfolios(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows, @PathVariable String nickname){
-        UserDTO userDTO = userService.findUserDTOByNickname(nickname);
+    @GetMapping("/{account}/portfolios")
+    public GlobalResult userPortfolios(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows, @PathVariable String account){
+        UserDTO userDTO = userService.findUserDTOByAccount(account);
         if (userDTO == null){
             return GlobalResultGenerator.genErrorResult("用户不存在！");
         }
@@ -73,9 +73,9 @@ public class UserController {
         return GlobalResultGenerator.genSuccessResult(map);
     }
 
-    @GetMapping("/{nickname}/followers")
-    public GlobalResult userFollowers(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows, @PathVariable String nickname){
-        UserDTO userDTO = userService.findUserDTOByNickname(nickname);
+    @GetMapping("/{account}/followers")
+    public GlobalResult userFollowers(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows, @PathVariable String account){
+        UserDTO userDTO = userService.findUserDTOByAccount(account);
         if (userDTO == null){
             return GlobalResultGenerator.genErrorResult("用户不存在！");
         }
@@ -89,9 +89,9 @@ public class UserController {
         return GlobalResultGenerator.genSuccessResult(map);
     }
 
-    @GetMapping("/{nickname}/followings")
-    public GlobalResult userFollowings(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows, @PathVariable String nickname){
-        UserDTO userDTO = userService.findUserDTOByNickname(nickname);
+    @GetMapping("/{account}/followings")
+    public GlobalResult userFollowings(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows, @PathVariable String account){
+        UserDTO userDTO = userService.findUserDTOByAccount(account);
         if (userDTO == null){
             return GlobalResultGenerator.genErrorResult("用户不存在！");
         }
@@ -105,9 +105,9 @@ public class UserController {
         return GlobalResultGenerator.genSuccessResult(map);
     }
 
-    @GetMapping("/{nickname}/user-extend")
-    public GlobalResult userExtend(@PathVariable String nickname) {
-        UserExtend userExtend = userService.selectUserExtendByNickname(nickname);
+    @GetMapping("/{account}/user-extend")
+    public GlobalResult userExtend(@PathVariable String account) {
+        UserExtend userExtend = userService.selectUserExtendByAccount(account);
         return GlobalResultGenerator.genSuccessResult(userExtend);
     }
 
diff --git a/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java b/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java
index 7e0ba87..8638bf5 100644
--- a/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java
+++ b/src/main/java/com/rymcu/forest/wx/mp/controller/WxoAuthController.java
@@ -44,7 +44,7 @@ public class WxoAuthController {
             baseUrl = new StringBuilder(domain).append(contextPath);
         }
         StringBuilder accessTokenUrl = baseUrl.append("/wx/oauth/" + appId + "/getAccessToken?redirectUrl=").append(URIUtil.encodeURIComponent(redirectUrl));
-        String oauth2Url = wxMpService.getOAuth2Service().buildAuthorizationUrl(accessTokenUrl.toString(), WxConsts.OAuth2Scope.SNSAPI_BASE, null);
+        String oauth2Url = wxMpService.getOAuth2Service().buildAuthorizationUrl(accessTokenUrl.toString(), WxConsts.OAuth2Scope.SNSAPI_USERINFO, null);
 
         return "redirect:" + oauth2Url;
     }
@@ -58,8 +58,8 @@ public class WxoAuthController {
             throw new Exception("无权限");
         }
 
-        WxMpUser wxMpUser =wxMpService.getUserService().userInfo(oAuth2AccessToken.getOpenId());
-        wxUserService.saveUser(wxMpUser,appId);
+        WxMpUser wxMpUser = wxMpService.getUserService().userInfo(oAuth2AccessToken.getOpenId());
+        wxUserService.saveUser(wxMpUser, appId);
         ContextHolderUtils.getSession2().setAttribute("wxUser", wxMpUser);
         return "redirect:" + redirectUrl;
     }
diff --git a/src/main/java/mapper/UserMapper.xml b/src/main/java/mapper/UserMapper.xml
index adaf741..d7e0615 100644
--- a/src/main/java/mapper/UserMapper.xml
+++ b/src/main/java/mapper/UserMapper.xml
@@ -45,6 +45,7 @@
         
         
         
+        
     
     
         insert into forest_user_role (id_user,id_role,created_time) values (#{idUser},#{idRole},sysdate())
@@ -81,8 +82,8 @@
     
-    
+        select id, nickname, avatar_type, avatar_url, account, signature from forest_user where account = #{account} and status = 0
     
     
     
     
 
\ No newline at end of file

From a9be5d50fe751d9f85758765539d65b6f4923b84 Mon Sep 17 00:00:00 2001
From: ronger 
Date: Tue, 20 Apr 2021 08:48:16 +0800
Subject: [PATCH 23/27] =?UTF-8?q?:bug:=20=E6=90=9C=E7=B4=A2=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E4=B8=AD=E7=82=B9=E5=87=BB`=E7=94=A8=E6=88=B7`?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/mapper/SearchMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/mapper/SearchMapper.xml b/src/main/java/mapper/SearchMapper.xml
index f159899..7bdfcb4 100644
--- a/src/main/java/mapper/SearchMapper.xml
+++ b/src/main/java/mapper/SearchMapper.xml
@@ -13,6 +13,6 @@
         select portfolio_title as label, id as value, 'portfolio' as type from forest_portfolio
     
     
 
\ No newline at end of file

From 00a82ff67ed952434de81872aee93c4885c67dfc Mon Sep 17 00:00:00 2001
From: ronger 
Date: Tue, 20 Apr 2021 10:16:26 +0800
Subject: [PATCH 24/27] :ambulance: https://github.com/rymcu/forest/issues/40

---
 .../com/rymcu/forest/service/ArticleService.java     |  2 +-
 .../forest/service/impl/ArticleServiceImpl.java      | 12 +++++++++++-
 .../forest/web/api/article/ArticleController.java    |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/rymcu/forest/service/ArticleService.java b/src/main/java/com/rymcu/forest/service/ArticleService.java
index f839ed5..f564de9 100644
--- a/src/main/java/com/rymcu/forest/service/ArticleService.java
+++ b/src/main/java/com/rymcu/forest/service/ArticleService.java
@@ -67,7 +67,7 @@ public interface ArticleService extends Service
 {
      * @param id
      * @return
      * */
-    Map delete(Integer id);
+    Map delete(Integer id) throws BaseApiException;
 
     /**
      * 增量文章浏览数
diff --git a/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java
index af287d1..5308dc0 100644
--- a/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/service/impl/ArticleServiceImpl.java
@@ -249,8 +249,18 @@ public class ArticleServiceImpl extends AbstractService
 implements Arti
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map delete(Integer id) {
+    public Map delete(Integer id) throws BaseApiException {
         Map map = new HashMap(1);
+        // 鉴权
+        User user = UserUtils.getCurrentUserByToken();
+        Integer roleWeights = userService.findRoleWeightsByUser(user.getIdUser());
+        if (roleWeights > 2) {
+            Article article = articleMapper.selectByPrimaryKey(id);
+            if (!user.getIdUser().equals(article.getArticleAuthorId())) {
+                map.put("message", "非法访问！");
+                return map;
+            }
+        }
         Integer result;
         // 判断是否有评论
         boolean isHavComment = articleMapper.existsCommentWithPrimaryKey(id);
diff --git a/src/main/java/com/rymcu/forest/web/api/article/ArticleController.java b/src/main/java/com/rymcu/forest/web/api/article/ArticleController.java
index 32c7526..69a6d98 100644
--- a/src/main/java/com/rymcu/forest/web/api/article/ArticleController.java
+++ b/src/main/java/com/rymcu/forest/web/api/article/ArticleController.java
@@ -61,7 +61,7 @@ public class ArticleController {
     }
 
     @DeleteMapping("/delete/{id}")
-    public GlobalResult delete(@PathVariable Integer id) {
+    public GlobalResult delete(@PathVariable Integer id) throws BaseApiException {
         Map map = articleService.delete(id);
         return GlobalResultGenerator.genSuccessResult(map);
     }

From 80901c138aa7c550fda0f84f5ee4f3585ffdc68b Mon Sep 17 00:00:00 2001
From: ronger 
Date: Wed, 21 Apr 2021 13:48:53 +0800
Subject: [PATCH 25/27] :art: update README.md

---
 README.md                                      |   2 +-
 src/main/resources/static/logo_size.jpg        | Bin 0 -> 4376 bytes
 src/main/resources/static/logo_size_invert.jpg | Bin 0 -> 4531 bytes
 3 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 src/main/resources/static/logo_size.jpg
 create mode 100644 src/main/resources/static/logo_size_invert.jpg

diff --git a/README.md b/README.md
index 5e88293..7942e77 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # forest
-
+![forest](src/main/resources/static/logo_size.jpg)  
 下一代的知识社区系统,为未来而建
 
 ## 💡 简介
diff --git a/src/main/resources/static/logo_size.jpg b/src/main/resources/static/logo_size.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f06a1090fecea0be3b8ad45103c6fcd16a41fc25
GIT binary patch
literal 4376
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

literal 0
HcmV?d00001


From 0ade2bdc535f0fe9c6b25623d513ab5a04501c97 Mon Sep 17 00:00:00 2001
From: ronger 
Date: Thu, 22 Apr 2021 22:34:38 +0800
Subject: [PATCH 26/27] =?UTF-8?q?:poop:=20=E8=AF=84=E8=AE=BA=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF-=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rymcu/forest/service/JavaMailService.java |  12 ++
 .../service/impl/JavaMailServiceImpl.java     | 121 ++++++++-----
 .../service/impl/NotificationServiceImpl.java | 100 +----------
 .../rymcu/forest/util/NotificationUtils.java  | 100 ++++++++++-
 .../templates/mail/commentNotification.html   | 162 ++++++++++++++++++
 5 files changed, 345 insertions(+), 150 deletions(-)
 create mode 100644 src/main/resources/templates/mail/commentNotification.html

diff --git a/src/main/java/com/rymcu/forest/service/JavaMailService.java b/src/main/java/com/rymcu/forest/service/JavaMailService.java
index 269cd20..761d3c6 100644
--- a/src/main/java/com/rymcu/forest/service/JavaMailService.java
+++ b/src/main/java/com/rymcu/forest/service/JavaMailService.java
@@ -1,5 +1,7 @@
 package com.rymcu.forest.service;
 
+import com.rymcu.forest.dto.NotificationDTO;
+
 import javax.mail.MessagingException;
 
 /**
@@ -12,6 +14,7 @@ public interface JavaMailService {
      * 发送验证码邮件
      * @param email 收件人邮箱
      * @return 执行结果 0：失败1：成功
+     * @throws MessagingException
      * */
     Integer sendEmailCode(String email) throws MessagingException;
 
@@ -19,6 +22,15 @@ public interface JavaMailService {
      * 发送找回密码邮件
      * @param email 收件人邮箱
      * @return 执行结果 0：失败1：成功
+     * @throws MessagingException
      * */
     Integer sendForgetPasswordEmail(String email) throws MessagingException;
+
+    /**
+     * 发送下消息通知
+     * @param notification
+     * @return
+     * @throws MessagingException
+     */
+    Integer sendNotification(NotificationDTO notification) throws MessagingException;
 }
diff --git a/src/main/java/com/rymcu/forest/service/impl/JavaMailServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/JavaMailServiceImpl.java
index 0b40654..fe4f4cc 100644
--- a/src/main/java/com/rymcu/forest/service/impl/JavaMailServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/service/impl/JavaMailServiceImpl.java
@@ -1,7 +1,11 @@
 package com.rymcu.forest.service.impl;
 
+import com.rymcu.forest.core.constant.NotificationConstant;
 import com.rymcu.forest.core.service.redis.RedisService;
+import com.rymcu.forest.dto.NotificationDTO;
+import com.rymcu.forest.entity.User;
 import com.rymcu.forest.service.JavaMailService;
+import com.rymcu.forest.service.UserService;
 import com.rymcu.forest.util.Utils;
 import org.apache.commons.lang.time.StopWatch;
 import org.springframework.beans.factory.annotation.Value;
@@ -34,6 +38,8 @@ public class JavaMailServiceImpl implements JavaMailService {
     private JavaMailSenderImpl mailSender;
     @Resource
     private RedisService redisService;
+    @Resource
+    private UserService userService;
     /**
      * thymeleaf模板引擎
      */
@@ -53,12 +59,49 @@ public class JavaMailServiceImpl implements JavaMailService {
 
     @Override
     public Integer sendEmailCode(String email) throws MessagingException {
-        return sendCode(email,0);
+        return sendCode(email, 0);
     }
 
     @Override
     public Integer sendForgetPasswordEmail(String email) throws MessagingException {
-        return sendCode(email,1);
+        return sendCode(email, 1);
+    }
+
+    @Override
+    public Integer sendNotification(NotificationDTO notification) throws MessagingException {
+        Properties props = new Properties();
+        // 表示SMTP发送邮件，需要进行身份验证
+        props.put("mail.smtp.auth", true);
+        props.put("mail.smtp.ssl.enable", true);
+        props.put("mail.smtp.host", SERVER_HOST);
+        props.put("mail.smtp.port", SERVER_PORT);
+        // 如果使用ssl，则去掉使用25端口的配置，进行如下配置,
+        props.put("mail.smtp.socketFactory.class", "com.rymcu.forest.util.MailSSLSocketFactory");
+        props.put("mail.smtp.socketFactory.port", SERVER_PORT);
+        // 发件人的账号，填写控制台配置的发信地址,比如xxx@xxx.com
+        props.put("mail.user", USERNAME);
+        // 访问SMTP服务时需要提供的密码(在控制台选择发信地址进行设置)
+        props.put("mail.password", PASSWORD);
+        mailSender.setJavaMailProperties(props);
+        User user = userService.findById(String.valueOf(notification.getIdUser()));
+        if (NotificationConstant.Comment.equals(notification.getDataType())) {
+            String url = notification.getDataUrl();
+            String thymeleafTemplatePath = "mail/commentNotification";
+            Map thymeleafTemplateVariable = new HashMap(4);
+            thymeleafTemplateVariable.put("user", notification.getAuthor().getUserNickname());
+            thymeleafTemplateVariable.put("articleTitle", notification.getDataTitle());
+            thymeleafTemplateVariable.put("content", notification.getDataSummary());
+            thymeleafTemplateVariable.put("url", url);
+
+            sendTemplateEmail(USERNAME,
+                    new String[]{user.getEmail()},
+                    new String[]{},
+                    "【RYMCU】 消息通知",
+                    thymeleafTemplatePath,
+                    thymeleafTemplateVariable);
+            return 1;
+        }
+        return 0;
     }
 
     private Integer sendCode(String to, Integer type) throws MessagingException {
@@ -79,29 +122,29 @@ public class JavaMailServiceImpl implements JavaMailService {
         SimpleMailMessage simpleMailMessage = new SimpleMailMessage();
         simpleMailMessage.setFrom(USERNAME);
         simpleMailMessage.setTo(to);
-        if(type == 0) {
+        if (type == 0) {
             Integer code = Utils.genCode();
-            redisService.set(to,code,5*60);
+            redisService.set(to, code, 5 * 60);
             simpleMailMessage.setSubject("新用户注册邮箱验证");
             simpleMailMessage.setText("【RYMCU】您的校验码是 " + code + ",有效时间 5 分钟，请不要泄露验证码给其他人。如非本人操作,请忽略！");
             mailSender.send(simpleMailMessage);
             return 1;
-        } else if(type == 1){
+        } else if (type == 1) {
             String code = Utils.entryptPassword(to);
             String url = BASE_URL + "/forget-password?code=" + code;
-            redisService.set(code,to,15*60);
+            redisService.set(code, to, 15 * 60);
 
-                String thymeleafTemplatePath = "mail/forgetPasswordTemplate";
-                Map thymeleafTemplateVariable = new HashMap();
-                thymeleafTemplateVariable.put("url", url);
+            String thymeleafTemplatePath = "mail/forgetPasswordTemplate";
+            Map thymeleafTemplateVariable = new HashMap(1);
+            thymeleafTemplateVariable.put("url", url);
 
-                sendTemplateEmail(USERNAME,
-                        new String[] { to },
-                        new String[] {},
-                        "【RYMCU】 找回密码",
-                        thymeleafTemplatePath,
-                        thymeleafTemplateVariable);
-                return 1;
+            sendTemplateEmail(USERNAME,
+                    new String[]{to},
+                    new String[]{},
+                    "【RYMCU】 找回密码",
+                    thymeleafTemplatePath,
+                    thymeleafTemplateVariable);
+            return 1;
         }
         return 0;
     }
@@ -109,25 +152,19 @@ public class JavaMailServiceImpl implements JavaMailService {
     /**
      * 发送thymeleaf模板邮件
      *
-     * @param deliver
-     *            发送人邮箱名 如： javalsj@163.com
-     * @param receivers
-     *            收件人，可多个收件人 如：11111@qq.com,2222@163.com
-     * @param carbonCopys
-     *            抄送人，可多个抄送人 如：33333@sohu.com
-     * @param subject
-     *            邮件主题 如：您收到一封高大上的邮件，请查收。
-     * @param thymeleafTemplatePath
-     *            邮件模板 如：mail\mailTemplate.html。
-     * @param thymeleafTemplateVariable
-     *            邮件模板变量集
+     * @param deliver                   发送人邮箱名 如： javalsj@163.com
+     * @param receivers                 收件人，可多个收件人 如：11111@qq.com,2222@163.com
+     * @param carbonCopys               抄送人，可多个抄送人 如：33333@sohu.com
+     * @param subject                   邮件主题 如：您收到一封高大上的邮件，请查收。
+     * @param thymeleafTemplatePath     邮件模板 如：mail\mailTemplate.html。
+     * @param thymeleafTemplateVariable 邮件模板变量集
      */
     public void sendTemplateEmail(String deliver, String[] receivers, String[] carbonCopys, String subject, String thymeleafTemplatePath,
                                   Map thymeleafTemplateVariable) throws MessagingException {
         String text = null;
         if (thymeleafTemplateVariable != null && thymeleafTemplateVariable.size() > 0) {
             Context context = new Context();
-            thymeleafTemplateVariable.forEach((key, value)->context.setVariable(key, value));
+            thymeleafTemplateVariable.forEach((key, value) -> context.setVariable(key, value));
             text = templateEngine.process(thymeleafTemplatePath, context);
         }
         sendMimeMail(deliver, receivers, carbonCopys, subject, text, true, null);
@@ -136,22 +173,15 @@ public class JavaMailServiceImpl implements JavaMailService {
     /**
      * 发送的邮件(支持带附件/html类型的邮件)
      *
-     * @param deliver
-     *            发送人邮箱名 如： javalsj@163.com
-     * @param receivers
-     *            收件人，可多个收件人 如：11111@qq.com,2222@163.com
-     * @param carbonCopys
-     *            抄送人，可多个抄送人 如：3333@sohu.com
-     * @param subject
-     *            邮件主题 如：您收到一封高大上的邮件，请查收。
-     * @param text
-     *            邮件内容 如：测试邮件逗你玩的。 
-     * @param attachmentFilePaths
-     *            附件文件路径 如：
-     *            需要注意的是addInline函数中资源名称attchmentFileName需要与正文中cid:attchmentFileName对应起来
-     * @throws Exception
-     *             邮件发送过程中的异常信息
+     * @param deliver             发送人邮箱名 如： javalsj@163.com
+     * @param receivers           收件人，可多个收件人 如：11111@qq.com,2222@163.com
+     * @param carbonCopys         抄送人，可多个抄送人 如：3333@sohu.com
+     * @param subject             邮件主题 如：您收到一封高大上的邮件，请查收。
+     * @param text                邮件内容 如：测试邮件逗你玩的。 
+     * @param attachmentFilePaths 附件文件路径 如：
+     *                            需要注意的是addInline函数中资源名称attchmentFileName需要与正文中cid:attchmentFileName对应起来
+     * @throws Exception 邮件发送过程中的异常信息
      */
     private void sendMimeMail(String deliver, String[] receivers, String[] carbonCopys, String subject, String text,
                               boolean isHtml, String[] attachmentFilePaths) throws MessagingException {
@@ -186,7 +216,6 @@ public class JavaMailServiceImpl implements JavaMailService {
         }
         mailSender.send(mimeMessage);
         stopWatch.stop();
-        //logger.info("邮件发送成功, 花费时间{}秒", stopWatch.getStartTime());
 
     }
 
diff --git a/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java b/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java
index 4883182..22b22d1 100644
--- a/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java
+++ b/src/main/java/com/rymcu/forest/service/impl/NotificationServiceImpl.java
@@ -1,22 +1,16 @@
 package com.rymcu.forest.service.impl;
 
 import com.rymcu.forest.core.service.AbstractService;
-import com.rymcu.forest.dto.ArticleDTO;
-import com.rymcu.forest.dto.Author;
 import com.rymcu.forest.dto.NotificationDTO;
-import com.rymcu.forest.entity.Comment;
-import com.rymcu.forest.entity.Follow;
 import com.rymcu.forest.entity.Notification;
-import com.rymcu.forest.entity.User;
 import com.rymcu.forest.mapper.NotificationMapper;
-import com.rymcu.forest.service.*;
+import com.rymcu.forest.service.NotificationService;
 import com.rymcu.forest.util.BeanCopierUtil;
-import org.springframework.beans.factory.annotation.Value;
+import com.rymcu.forest.util.NotificationUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
@@ -28,16 +22,6 @@ public class NotificationServiceImpl extends AbstractService imple
 
     @Resource
     private NotificationMapper notificationMapper;
-    @Resource
-    private ArticleService articleService;
-    @Resource
-    private CommentService commentService;
-    @Resource
-    private UserService userService;
-    @Resource
-    private FollowService followService;
-    @Value("${resource.domain}")
-    private String domain;
 
     private final static String unRead = "0";
 
@@ -51,7 +35,7 @@ public class NotificationServiceImpl extends AbstractService imple
     public List findNotifications(Integer idUser) {
         List list = notificationMapper.selectNotifications(idUser);
         list.forEach(notification -> {
-            NotificationDTO notificationDTO = genNotification(notification);
+            NotificationDTO notificationDTO = NotificationUtils.genNotification(notification);
             // 判断关联数据是否已删除
             if (Objects.nonNull(notificationDTO.getAuthor())) {
                 BeanCopierUtil.copy(notificationDTO, notification);
@@ -71,84 +55,6 @@ public class NotificationServiceImpl extends AbstractService imple
         return list;
     }
 
-    private NotificationDTO genNotification(Notification notification) {
-        NotificationDTO notificationDTO = new NotificationDTO();
-        BeanCopierUtil.copy(notification, notificationDTO);
-        ArticleDTO article;
-        Comment comment;
-        User user;
-        Follow follow;
-        switch (notification.getDataType()) {
-            case "0":
-                // 系统公告/帖子
-                article = articleService.findArticleDTOById(notification.getDataId(), 0);
-                if (Objects.nonNull(article)) {
-                    notificationDTO.setDataTitle("系统公告");
-                    notificationDTO.setDataUrl(article.getArticlePermalink());
-                    user = userService.findById(article.getArticleAuthorId().toString());
-                    notificationDTO.setAuthor(genAuthor(user));
-                }
-                break;
-            case "1":
-                // 关注
-                follow = followService.findById(notification.getDataId().toString());
-                notificationDTO.setDataTitle("关注提醒");
-                if (Objects.nonNull(follow)) {
-                    user = userService.findById(follow.getFollowerId().toString());
-                    notificationDTO.setDataUrl(getFollowLink(follow.getFollowingType(), user.getNickname()));
-                    notificationDTO.setAuthor(genAuthor(user));
-                }
-                break;
-            case "2":
-                // 回帖
-                comment = commentService.findById(notification.getDataId().toString());
-                article = articleService.findArticleDTOById(comment.getCommentArticleId(), 0);
-                if (Objects.nonNull(article)) {
-                    notificationDTO.setDataTitle(article.getArticleTitle());
-                    notificationDTO.setDataUrl(comment.getCommentSharpUrl());
-                    user = userService.findById(comment.getCommentAuthorId().toString());
-                    notificationDTO.setAuthor(genAuthor(user));
-                }
-                break;
-            case "3":
-                // 关注用户发布文章
-            case "4":
-                // 关注文章更新
-                article = articleService.findArticleDTOById(notification.getDataId(), 0);
-                if (Objects.nonNull(article)) {
-                    notificationDTO.setDataTitle("关注通知");
-                    notificationDTO.setDataUrl(article.getArticlePermalink());
-                    user = userService.findById(article.getArticleAuthorId().toString());
-                    notificationDTO.setAuthor(genAuthor(user));
-                }
-                break;
-            default:
-                break;
-        }
-        return notificationDTO;
-    }
-
-    private String getFollowLink(String followingType, String id) {
-        StringBuilder url = new StringBuilder();
-        url.append(domain);
-        switch (followingType) {
-            case "0":
-                url = url.append("/user/").append(id);
-                break;
-            default:
-                url.append("/notification");
-        }
-        return url.toString();
-    }
-
-    private Author genAuthor(User user) {
-        Author author = new Author();
-        author.setUserNickname(user.getNickname());
-        author.setUserAvatarURL(user.getAvatarUrl());
-        author.setIdUser(user.getIdUser());
-        return author;
-    }
-
     @Override
     public Notification findNotification(Integer idUser, Integer dataId, String dataType) {
         return notificationMapper.selectNotification(idUser, dataId, dataType);
diff --git a/src/main/java/com/rymcu/forest/util/NotificationUtils.java b/src/main/java/com/rymcu/forest/util/NotificationUtils.java
index b301bdd..c6b0500 100644
--- a/src/main/java/com/rymcu/forest/util/NotificationUtils.java
+++ b/src/main/java/com/rymcu/forest/util/NotificationUtils.java
@@ -1,15 +1,17 @@
 package com.rymcu.forest.util;
 
 import com.rymcu.forest.core.constant.NotificationConstant;
+import com.rymcu.forest.dto.ArticleDTO;
+import com.rymcu.forest.dto.Author;
+import com.rymcu.forest.dto.NotificationDTO;
+import com.rymcu.forest.entity.Comment;
 import com.rymcu.forest.entity.Follow;
 import com.rymcu.forest.entity.Notification;
 import com.rymcu.forest.entity.User;
-import com.rymcu.forest.service.FollowService;
-import com.rymcu.forest.service.NotificationService;
-import com.rymcu.forest.service.UserService;
+import com.rymcu.forest.service.*;
 
-import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.*;
 
 /**
@@ -19,12 +21,13 @@ import java.util.concurrent.*;
  */
 public class NotificationUtils {
 
-    @Resource
     private static NotificationService notificationService = SpringContextHolder.getBean(NotificationService.class);
-    @Resource
     private static UserService userService = SpringContextHolder.getBean(UserService.class);
-    @Resource
     private static FollowService followService = SpringContextHolder.getBean(FollowService.class);
+    private static JavaMailService mailService = SpringContextHolder.getBean(JavaMailService.class);
+
+    private static ArticleService articleService = SpringContextHolder.getBean(ArticleService.class);
+    private static CommentService commentService = SpringContextHolder.getBean(CommentService.class);
 
     public static void sendAnnouncement(Integer dataId, String dataType, String dataSummary) {
         ExecutorService executor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue());
@@ -53,6 +56,11 @@ public class NotificationUtils {
                         // TODO 记录操作失败数据
                     }
                 }
+                if (NotificationConstant.Comment.equals(dataType)) {
+                    notification = notificationService.findNotification(idUser, dataId, dataType);
+                    NotificationDTO notificationDTO = genNotification(notification);
+                    mailService.sendNotification(notificationDTO);
+                }
             } catch (Exception ex) {
                 // TODO 记录操作失败数据
                 ex.printStackTrace();
@@ -83,4 +91,82 @@ public class NotificationUtils {
             return 0;
         }, executor);
     }
+
+    public static NotificationDTO genNotification(Notification notification) {
+        NotificationDTO notificationDTO = new NotificationDTO();
+        BeanCopierUtil.copy(notification, notificationDTO);
+        ArticleDTO article;
+        Comment comment;
+        User user;
+        Follow follow;
+        switch (notification.getDataType()) {
+            case "0":
+                // 系统公告/帖子
+                article = articleService.findArticleDTOById(notification.getDataId(), 0);
+                if (Objects.nonNull(article)) {
+                    notificationDTO.setDataTitle("系统公告");
+                    notificationDTO.setDataUrl(article.getArticlePermalink());
+                    user = userService.findById(article.getArticleAuthorId().toString());
+                    notificationDTO.setAuthor(genAuthor(user));
+                }
+                break;
+            case "1":
+                // 关注
+                follow = followService.findById(notification.getDataId().toString());
+                notificationDTO.setDataTitle("关注提醒");
+                if (Objects.nonNull(follow)) {
+                    user = userService.findById(follow.getFollowerId().toString());
+                    notificationDTO.setDataUrl(getFollowLink(follow.getFollowingType(), user.getNickname()));
+                    notificationDTO.setAuthor(genAuthor(user));
+                }
+                break;
+            case "2":
+                // 回帖
+                comment = commentService.findById(notification.getDataId().toString());
+                article = articleService.findArticleDTOById(comment.getCommentArticleId(), 0);
+                if (Objects.nonNull(article)) {
+                    notificationDTO.setDataTitle(article.getArticleTitle());
+                    notificationDTO.setDataUrl(comment.getCommentSharpUrl());
+                    user = userService.findById(comment.getCommentAuthorId().toString());
+                    notificationDTO.setAuthor(genAuthor(user));
+                }
+                break;
+            case "3":
+                // 关注用户发布文章
+            case "4":
+                // 关注文章更新
+                article = articleService.findArticleDTOById(notification.getDataId(), 0);
+                if (Objects.nonNull(article)) {
+                    notificationDTO.setDataTitle("关注通知");
+                    notificationDTO.setDataUrl(article.getArticlePermalink());
+                    user = userService.findById(article.getArticleAuthorId().toString());
+                    notificationDTO.setAuthor(genAuthor(user));
+                }
+                break;
+            default:
+                break;
+        }
+        return notificationDTO;
+    }
+
+    private static String getFollowLink(String followingType, String id) {
+        StringBuilder url = new StringBuilder();
+        url.append(Utils.getProperty("resource.domain"));
+        switch (followingType) {
+            case "0":
+                url = url.append("/user/").append(id);
+                break;
+            default:
+                url.append("/notification");
+        }
+        return url.toString();
+    }
+
+    private static Author genAuthor(User user) {
+        Author author = new Author();
+        author.setUserNickname(user.getNickname());
+        author.setUserAvatarURL(user.getAvatarUrl());
+        author.setIdUser(user.getIdUser());
+        return author;
+    }
 }
diff --git a/src/main/resources/templates/mail/commentNotification.html b/src/main/resources/templates/mail/commentNotification.html
new file mode 100644
index 0000000..920498e
--- /dev/null
+++ b/src/main/resources/templates/mail/commentNotification.html
@@ -0,0 +1,162 @@
+
+
+
+     RYMCU 消息通知 
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+
+
+

+    

+        

+            
+                
+                
+                    
+                
+                
+                    
+                
+                
+            

+                        Logo
+                    

+                        welcome image
+
+                    

+        

+        

+            
+                
+                
+                    
+                
+                
+                    
+                
+                
+            

+                        

+                            

+                                消息通知

+                        

+                    

+                        

+                            

+                                 评论了您的文章《 》：
+                            

+                            

+                        

+                    

+        

+        

+            

+                
+                    
+                        
+                    
+                    

+                            
+                        

+            

+        

+    

+

+
+
\ No newline at end of file

From 534ad89633a913fe4469f9162c674503ef659ac3 Mon Sep 17 00:00:00 2001
From: ronger 
Date: Fri, 23 Apr 2021 09:35:09 +0800
Subject: [PATCH 27/27] :arrow_up: shiro 1.4.1 -> 1.7.1

---
 pom.xml                                                     | 6 +++---
 src/main/java/com/rymcu/forest/answer/AnswerController.java | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8edbd3b..c418103 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,19 +88,19 @@
         
             com.github.pagehelper
             pagehelper
-            5.1.10
+            5.2.0
         
         
         
             com.alibaba
             fastjson
-            1.2.67
+            1.2.76
         
         
         
             org.apache.shiro
             shiro-spring
-            1.4.1
+            1.7.1
         
         
         
diff --git a/src/main/java/com/rymcu/forest/answer/AnswerController.java b/src/main/java/com/rymcu/forest/answer/AnswerController.java
index 605e189..92df131 100644
--- a/src/main/java/com/rymcu/forest/answer/AnswerController.java
+++ b/src/main/java/com/rymcu/forest/answer/AnswerController.java
@@ -2,7 +2,6 @@ package com.rymcu.forest.answer;
 
 import com.alibaba.fastjson.JSONObject;
 import com.rymcu.forest.core.result.GlobalResult;
-import com.rymcu.forest.core.result.GlobalResultGenerator;
 import com.rymcu.forest.core.service.log.annotation.TransactionLogger;
 import com.rymcu.forest.dto.AnswerDTO;
 import com.rymcu.forest.entity.User;