Commit Graph

564 Commits

Author SHA1 Message Date
ronger
c94b5397b3 Merge branch 'master' into dev
# Conflicting files
    # src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java
    # src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java
    # src/main/java/com/rymcu/vertical/util/BaiDuUtils.java
    # src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java
2020-03-30 17:38:21 +08:00
ronger
766105022c 💬 添加注释 2020-03-30 17:24:36 +08:00
ronger
5d37a6dbff Merge branch 'master' into dev
# Conflicts:
#	src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java
#	src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java
#	src/main/java/com/rymcu/vertical/util/BaiDuUtils.java
#	src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java
2020-03-30 17:18:17 +08:00
ronger
124f419672 🔥 删除微信相关文件 2020-03-30 17:16:52 +08:00
ronger
20e6c7c944 Merge branch 'master' into dev
# Conflicts:
#	src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java
#	src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java
#	src/main/java/com/rymcu/vertical/util/BaiDuUtils.java
#	src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java
2020-03-30 17:15:59 +08:00
ronger
2d1197a5a7 Merge branch 'master' into dev
# Conflicts:
#	src/main/java/com/rymcu/vertical/service/impl/ArticleServiceImpl.java
#	src/main/java/com/rymcu/vertical/service/impl/TagServiceImpl.java
#	src/main/java/com/rymcu/vertical/util/BaiDuUtils.java
#	src/main/java/com/rymcu/vertical/web/api/comment/CommentController.java
2020-03-30 17:15:01 +08:00
ronger
c3e66cafcd Merge branch 'master' into dev
# Conflicts:
#	src/main/java/com/rymcu/vertical/core/constant/NotificationConstant.java
#	src/main/java/com/rymcu/vertical/core/constant/ProjectConstant.java
2020-03-30 17:11:57 +08:00
ronger
7ddcbcaaa7 Merge remote-tracking branch 'remotes/origin/master' into dev 2020-03-30 16:38:48 +08:00
ronger
605862adbd 🔥 删除微信相关文件 2020-03-30 16:33:30 +08:00
ronger
82b4786f4a
Merge pull request #3 from rymcu/revert-2-dev
Revert "新功能发布,缺陷代码修复,用户体验提升"
2020-03-30 16:22:51 +08:00
ronger
d74d470597
Revert "新功能发布,缺陷代码修复,用户体验提升" 2020-03-30 16:20:49 +08:00
ronger
659c1b7166 🎨 代码结构优化 2020-03-30 10:35:03 +08:00
ronger
70e243664c update README.md 2020-03-30 10:34:24 +08:00
ronger
591d97e8af 🐛 个人主页 文章列表 加载出草稿文章 问题修复 2020-03-30 10:33:46 +08:00
x ronger
e29733bb35 🎨 测试环境不定时推送主页更新 2020-03-28 13:38:29 +08:00
ronger
005c7f0189 🎨 用户主页完善 2020-03-27 16:50:55 +08:00
ronger
b65bd06797 🎨 代码结构调整 2020-03-27 16:20:19 +08:00
ronger
218b4a06a7 🐛 邮件发送失败问题修复 2020-03-27 16:15:58 +08:00
ronger
98d3ee1ce8 发布文章界面加载标签 2020-03-27 15:57:33 +08:00
x ronger
4cd5f99898 🎨 我的草稿功能完善 2020-03-24 01:07:05 +08:00
x ronger
33d7856bd5 🎨 专题页代码结构完善 2020-03-24 01:05:03 +08:00
ronger
4736f383ce 微信开放平台服务集成 2020-03-20 15:02:53 +08:00
ronger
a18d3847d8 微信开放平台服务集成 2020-03-19 17:47:10 +08:00
ronger
e28e219428 微信开放平台服务集成 2020-03-17 17:33:35 +08:00
ronger
637c66135c 添加微信服务依赖 2020-03-17 17:32:38 +08:00
x ronger
a461492eba 🎨 2020-03-16 23:39:25 +08:00
x ronger
f663f41270 微信公众号服务集成 2020-03-16 22:29:45 +08:00
x ronger
94a4d38a93 🎨 2020-03-16 21:50:14 +08:00
ronger
f5c77d68f5 微信公众号服务集成 2020-03-16 21:17:58 +08:00
ronger
1a632d790b
Merge pull request #2 from rymcu/dev
新功能发布,缺陷代码修复,用户体验提升
2020-03-16 13:55:39 +08:00
ronger
678c244545 🐛 删除文章无效标签问题修复 2020-03-16 08:49:21 +08:00
x ronger
b3c82d2bdd 我的草稿 2020-03-15 19:21:44 +08:00
x ronger
9d81a82bf1 🐛 删除文章未使用标签 2020-03-14 17:29:34 +08:00
x ronger
ee1de2f785 🐛 删除文章未使用标签 2020-03-14 17:21:05 +08:00
x ronger
c2b576a811 我的草稿 2020-03-13 23:47:14 +08:00
ronger
dc700dce4a 我的草稿功能 2020-03-13 17:32:56 +08:00
ronger
6d13d5e6af 🐛 角色修改功能无法更新问题修复 2020-03-13 10:38:21 +08:00
ronger
87918431a9 🔥 删除无效代码 2020-03-12 11:47:18 +08:00
ronger
1d68044df5 🐛 是否回复评论判断 bug 修复 2020-03-11 09:44:39 +08:00
ronger
b73dbb727e 更新百度SEO方法 2020-03-11 08:56:21 +08:00
x ronger
40cedf40e0 评论功能消息通知完善 2020-03-08 01:09:42 +08:00
x ronger
a21339d68d 评论功能消息通知完善 2020-03-08 01:00:28 +08:00
x ronger
ef56fba867 🐛 评论者不是作者本人才消息通知文章作者 2020-03-08 00:53:36 +08:00
x ronger
0e053ef714 评论功能完善 2020-03-08 00:13:22 +08:00
ronger
ea3bc5402a 评论功能 2020-03-07 21:51:58 +08:00
ronger
afd0b2caf7 评论功能 2020-03-07 21:18:22 +08:00
ronger
7704cf0a1c
Merge pull request #1 from rymcu/dev
缺陷代码修复
2020-02-15 15:59:39 +08:00
ronger
38c54fbecf 👌 去除无效代码 2020-02-15 15:39:55 +08:00
ronger
c55d77b5dd 🐛 修正后台创建专题失败问题 2020-02-15 15:14:12 +08:00
ronger
2d24f698ff 🐛 修正后台创建标签失败问题 2020-02-15 15:13:12 +08:00