Commit Graph

753 Commits

Author SHA1 Message Date
ronger
1774637e28
Merge branch 'master' into dev 2020-08-03 08:52:57 +08:00
ronger
7f1f92c82d first commit 2020-08-03 08:49:21 +08:00
x ronger
0d50debe6a 🐛 草稿详情问题修复 2020-08-03 00:01:52 +08:00
x ronger
26d8674f34 专题模块功能重构 2020-08-01 00:43:58 +08:00
ronger
2a0d6c4cc7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/resources/application.yml
2020-07-31 14:10:09 +08:00
x ronger
1ceb7399d2 标签/主题功能完善 2020-07-30 09:36:17 +08:00
ronger
f127686c9a
add application.yml 2020-06-24 10:58:49 +08:00
ronger
942e03ec20 Merge branch 'dev' 2020-06-24 10:52:19 +08:00
ronger
b7e0468007 first commit 2020-06-24 10:45:23 +08:00
ronger
9b713a9200
delete 2020-06-24 10:42:15 +08:00
ronger
0fe48328c0
🔥 删除微信相关文件
🔥 删除微信相关文件
2020-06-08 14:14:08 +08:00
ronger
3d06abaaca 🔥 删除微信相关文件 2020-06-08 14:11:20 +08:00
ronger
a8198bcb90
Merge pull request #10 from rymcu/dev
 作品集功能
2020-06-08 11:37:07 +08:00
ronger
913f884cbc Merge branch 'wx-dev' into dev
# Conflicts:
#	src/main/java/com/rymcu/vertical/wx/mp/controller/WxMenuController.java
#	src/main/java/com/rymcu/vertical/wx/mp/controller/WxoAuthController.java
2020-06-08 11:32:51 +08:00
ronger
a5877b281b Merge branch 'dev' into wx-dev
# Conflicts:
#	src/main/java/com/rymcu/vertical/wx/mp/controller/WxMenuController.java
#	src/main/java/com/rymcu/vertical/wx/mp/controller/WxoAuthController.java
2020-06-08 11:32:08 +08:00
ronger
562c4fcd9b 📝 更新说明文档 2020-06-08 10:54:39 +08:00
ronger
e1aa873e33 🎨 代码结构优化 2020-05-06 19:03:30 +08:00
x ronger
23bf6780df 🐛 草稿预览不显示正文内容问题修复 2020-04-23 18:37:01 +08:00
x ronger
d747b6f9bc 作品集功能完善 2020-04-21 23:34:38 +08:00
ronger
9c38e94b04 🎨🔥 删除 DynProps4FilesService.java 2020-04-21 11:16:07 +08:00
x ronger
8b2c7f93b5 作品集功能完善 2020-04-13 23:41:48 +08:00
ronger
49ab45f3bd 作品集功能 2020-04-10 15:12:02 +08:00
ronger
5b84fa9358 🎨 属性名变更 2020-04-09 18:50:13 +08:00
ronger
27db7a83f7 作品集功能 2020-04-08 17:53:32 +08:00
ronger
686cbb925e 🎨 通过 UserService 统一查询作者信息 2020-04-08 12:05:02 +08:00
x ronger
8d431d5835 作品集功能 2020-04-08 00:08:46 +08:00
ronger
74f5878910 作品集功能 2020-04-07 17:32:20 +08:00
ronger
effd6fa88d
Add License 2020-04-07 13:02:33 +08:00
ronger
1d557e75ee 特殊日功能 2020-04-03 17:35:07 +08:00
ronger
15bef06adb 🐛 微信授权后跳转返回界面失败问题修复 2020-03-31 17:41:46 +08:00
ronger
f81e18cf10
Merge pull request #8 from rymcu/dev
🎨 代码结构变更
2020-03-31 10:07:19 +08:00
ronger
630a075470
Merge pull request #7 from rymcu/wx-dev
💬 添加代码注释和方法名变更
2020-03-31 10:02:57 +08:00
ronger
6b67f4c6b0 💬 添加代码注释和方法名变更 2020-03-31 09:57:49 +08:00
ronger
707505c8f5
Merge pull request #6 from rymcu/dev
🎨 代码结构及名称变更
2020-03-31 08:58:45 +08:00
ronger
375a1b9246 🎨 代码结构及名称变更 2020-03-31 08:56:48 +08:00
ronger
e759a836fd
Merge pull request #5 from rymcu/master
💬 添加注释
2020-03-31 08:50:07 +08:00
ronger
2ce6c5f9e7 💬 添加注释 2020-03-30 17:51:49 +08:00
ronger
8e32243ae4 新功能发布,缺陷代码修复,用户体验提升 2020-03-30 17:49:07 +08:00
ronger
a2eccd5cf8
Merge pull request #4 from rymcu/dev
bug 修复
2020-03-30 17:38:57 +08:00
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