guwd
|
31c8549af3
|
版本更新
|
2020-09-10 12:32:40 +08:00 |
|
guwd
|
dea070c6c0
|
打包优化
|
2020-09-09 18:05:06 +08:00 |
|
guwd
|
3fa1b5d6d3
|
Merge remote-tracking branch 'origin/master'
|
2020-09-07 14:06:41 +08:00 |
sgjj
|
da964ddd77
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/resources/application.yml
|
2020-09-07 11:44:41 +08:00 |
|
sgjj
|
cd8a67bc06
|
ssl
|
2020-09-07 11:43:26 +08:00 |
luoxj
|
b040cd5d1a
|
配置文件
|
2020-09-07 11:14:46 +08:00 |
|
guwd
|
523814b249
|
Merge branch 'master' of /Volumes/Transcend/git/ms-mcms with conflicts.
|
2020-09-03 16:20:08 +08:00 |
|
sgjj
|
93a379190d
|
使用新的store
|
2020-09-03 15:49:10 +08:00 |
wujj
|
e38d1bbed1
|
测试store
|
2020-08-11 15:30:36 +08:00 |
vip
|
054af2f9d1
|
修改数据库
|
2020-08-07 12:19:27 +08:00 |
|
vip
|
1020cb2103
|
修改数据库
|
2020-08-07 12:13:08 +08:00 |
|
guwd
|
aa96601681
|
测试配置
|
2020-08-07 11:43:59 +08:00 |
|
sgjj
|
a8e8f68187
|
修数据库链接
|
2020-08-07 09:48:30 +08:00 |
panpp
|
ae1825454c
|
Merge remote-tracking branch 'origin/master'
|
2020-08-03 18:57:35 +08:00 |
|
panpp
|
4e03ca33cb
|
设计器
|
2020-08-03 18:57:05 +08:00 |
|
wujj
|
ca7677f4ae
|
配置文件
|
2020-07-31 09:28:09 +08:00 |
|
wujj
|
c1e9aec97e
|
验证码
|
2020-07-06 10:27:18 +08:00 |
|
wujj
|
107cd17ec5
|
数据库
|
2020-06-29 14:49:42 +08:00 |
|
sgjj
|
a96f78d384
|
sql注入问题
|
2020-06-28 18:03:39 +08:00 |
|
sgjj
|
7170fece88
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# doc/历史/5.0.0-to-5.0.1-mysql.sql
# src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
|
2020-06-28 17:38:16 +08:00 |
|
vip
|
dc63d6dd09
|
重复新增封面栏目bug
|
2020-06-23 18:48:55 +08:00 |
|
sgjj
|
cd3f054814
|
修改标签
|
2020-06-23 17:06:02 +08:00 |
|
shanggjj
|
d28c24976b
|
优化文章生成
|
2020-06-19 18:19:05 +08:00 |
|
guwd
|
7b38b08857
|
配置更新
|
2020-05-23 11:03:04 +08:00 |
信 赵
|
ef542c34cc
|
修复bug
|
2020-04-28 15:59:56 +08:00 |
|
ms group dev
|
69c8700c3b
|
配置文件描述更新
|
2020-01-11 09:59:00 +08:00 |
|
sgjj
|
91959af754
|
提交配置
|
2020-01-10 11:35:52 +08:00 |
|
sgjj
|
50852e7f87
|
添加注释
|
2020-01-09 18:17:12 +08:00 |
|
sgjj
|
304f1605b3
|
更新swagger问题
|
2020-01-09 16:58:39 +08:00 |
|
sgjj
|
ff9987b91f
|
Merge branch '5.0.0' of https://gitee.com/mingSoft/MCMS into 5.0.0
Conflicts:
src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
src/main/resources/application.yml
|
2020-01-04 15:11:16 +08:00 |
|
sgjj
|
30ef12ada0
|
添加日志 文档开关
|
2020-01-03 18:21:00 +08:00 |
|
sgjj
|
1969450550
|
配置更新
|
2020-01-03 11:57:37 +08:00 |
|
sgjj
|
44f8dede77
|
配置更新
|
2020-01-03 11:42:40 +08:00 |
tianbj
|
2e6c20e40e
|
首页
|
2019-12-31 13:38:34 +08:00 |
|
wujj
|
bf18409b64
|
清理
|
2019-12-30 21:55:47 +08:00 |
|
tianbj
|
09ff039068
|
Merge remote-tracking branch 'origin/5.0.0' into 5.0.0
# Conflicts:
# README.md
# doc/历史/4.6.5-to-4.7.0-mysql.sql
# doc/历史/4.6.5-to-4.7.0-sqlserver.sql
# doc/历史/db-mcms-mysql-4.7.0.sql
# doc/历史/db-mcms-sqlserver-4.7.0.sql
# pom.xml
# src/main/java/net/mingsoft/cms/action/ArticleAction.java
# src/main/java/net/mingsoft/cms/action/ColumnAction.java
# src/main/java/net/mingsoft/cms/action/GeneraterAction.java
# src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
# src/main/java/net/mingsoft/cms/biz/IArticleBiz.java
# src/main/java/net/mingsoft/cms/biz/impl/ArticleBizImpl.java
# src/main/java/net/mingsoft/cms/dao/IArticleDao.java
# src/main/java/net/mingsoft/cms/dao/IArticleDao.xml
# src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
# src/main/java/net/mingsoft/config/WebConfig.java
# src/main/resources/application.yml
# src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl
# src/main/webapp/WEB-INF/manager/cms/article/article_main.ftl
# src/main/webapp/WEB-INF/manager/cms/column/shiro-button.ftl
# src/main/webapp/WEB-INF/manager/cms/column/shiro-update.ftl
# src/main/webapp/html/1/index.html
# src/main/webapp/html/1/m/index.html
# src/main/webapp/static/plugins/ms/1.0.0/ms.util.js
# src/main/webapp/static/plugins/tree-select/tree.js
# src/main/webapp/static/plugins/vue-ueditor-wrap/vue-ueditor-wrap.min.js
# src/main/webapp/templets/1/default/about.htm
# src/main/webapp/templets/1/default/advice.htm
# src/main/webapp/templets/1/default/case-list.htm
# src/main/webapp/templets/1/default/index.htm
# src/main/webapp/templets/1/default/m/about.htm
# src/main/webapp/templets/1/default/m/advice.htm
# src/main/webapp/templets/1/default/m/case-list.htm
# src/main/webapp/templets/1/default/m/contact.htm
# src/main/webapp/templets/1/default/m/news-list.htm
# src/main/webapp/templets/1/default/m/news-show.htm
# src/main/webapp/templets/1/default/news-show.htm
# src/main/webapp/templets/1/default/search.htm
|
2019-12-30 11:41:18 +08:00 |
|
ms group dev
|
644a653141
|
修改连接
|
2019-12-29 21:25:16 +08:00 |
|
tianbj
|
9c9556ea47
|
配置
|
2019-12-28 10:18:34 +08:00 |
|
tianbj
|
a8e7118cd0
|
链接
|
2019-12-27 11:32:04 +08:00 |
|
tianbj
|
d46aff177d
|
4.7.2
|
2019-11-28 15:12:40 +08:00 |
|
sgjj
|
e705e84417
|
相对目录
|
2019-09-30 10:02:02 +08:00 |
sgjj
|
bcf4b05477
|
文件配置
|
2019-09-30 01:38:59 +08:00 |
|
sgjj
|
b5ba1bf1d6
|
自定义文件夹
|
2019-09-29 20:48:49 +08:00 |
|
sgjj
|
9e733b32eb
|
提交配置
|
2019-09-06 09:25:09 +08:00 |
|
sgjj
|
212b6b1541
|
xxs
|
2019-08-30 18:46:40 +08:00 |
wangtp
|
111333f731
|
最新版本开源系统演示分支，也是新项目的模板
|
2019-08-26 10:20:46 +08:00 |
wangwenbing
|
af868d14ff
|
Revert "微信修改"
This reverts commit 0871b95a
|
2019-08-24 17:05:36 +08:00 |
|
wangwenbing
|
0871b95a01
|
微信修改
|
2019-08-24 16:12:48 +08:00 |
|
sgjj
|
5b77df26f8
|
升级为平台ms
|
2019-08-23 16:28:17 +08:00 |
|
sgjj
|
818f555288
|
更新
|
2019-08-14 18:11:02 +08:00 |
|
灰色DT
|
ebf79865f0
|
更新 application.yml
|
2019-08-13 15:23:56 +08:00 |
|
ms-dev
|
73d2b0fdac
|
增加视图
|
2019-05-05 14:16:05 +08:00 |
|
ms group dev
|
03e2ac9b32
|
优化配置
|
2019-03-02 17:17:56 +08:00 |
sunxin
|
4cf31d35a2
|
添加mysql执行多条SQL
|
2019-02-28 17:44:48 +08:00 |
|
ms group dev
|
f1560171b4
|
上传修复
|
2019-02-26 19:43:02 +08:00 |
|
ms-dev
|
584168ba86
|
测试地址更新
|
2019-02-19 09:16:10 +08:00 |
|
ms group dev
|
0955c7e40c
|
欢迎信息更新
|
2019-02-18 10:49:45 +08:00 |
|
ms-dev
|
15ffc05b0a
|
测试更新
|
2019-02-18 10:45:14 +08:00 |
|
sunxin
|
c88406f320
|
添加自定义标签权限数据
|
2019-01-30 14:04:09 +08:00 |
|
ms-dev
|
7453abb3d1
|
测试配置
|
2019-01-30 12:03:31 +08:00 |
|
ms-dev
|
eb5bc78b73
|
测试配置更新
|
2019-01-30 11:58:15 +08:00 |
|
ms-dev
|
01ab9551c4
|
测试更新
|
2019-01-30 11:54:35 +08:00 |
|
ms-dev
|
cbbd11a751
|
配置文件命名规范
|
2019-01-30 11:49:10 +08:00 |
|
ms-dev
|
f5aa9b5d11
|
配置
|
2019-01-29 16:50:00 +08:00 |
|
ms-dev
|
e7f69e0f04
|
配置
|
2019-01-29 16:38:44 +08:00 |
|
ms-dev
|
2851cb52bc
|
配置
|
2019-01-29 16:02:27 +08:00 |
|
ms-dev
|
091fe12552
|
配置
|
2019-01-29 16:00:50 +08:00 |
|
ms-dev
|
803328dd73
|
配置
|
2019-01-29 15:55:10 +08:00 |
|
ms-dev
|
174458ebcd
|
配置更新
|
2019-01-29 15:52:17 +08:00 |
|
ms-dev
|
63bfc772b1
|
配置
|
2019-01-29 15:32:55 +08:00 |
|
ms-dev
|
c05d78719f
|
配置更新
|
2019-01-29 15:30:55 +08:00 |
|
ms group dev
|
164b3813a5
|
内测
|
2019-01-28 05:07:02 +08:00 |
|
ms group dev
|
c3c4ae463f
|
内测
|
2019-01-28 04:48:18 +08:00 |
|
ms-dev
|
d12ee233e8
|
配置文件更新
|
2019-01-26 18:13:27 +08:00 |
|
ms group dev
|
dd4f77889c
|
配置更新
|
2019-01-19 12:25:44 +08:00 |
|
ms group dev
|
64cca8add7
|
配置更新
|
2019-01-19 12:19:58 +08:00 |
|
ms group dev
|
968500424e
|
配置更新
|
2019-01-19 12:11:41 +08:00 |
|
ms-dev
|
c611cff678
|
配置更新
|
2019-01-17 11:57:26 +08:00 |
|
ms-dev
|
1bb0e45602
|
配置文件更新
|
2019-01-16 09:26:24 +08:00 |
|
ms-dev
|
eee2850981
|
配置更新
|
2019-01-15 17:17:44 +08:00 |
|
ms-dev
|
db3015e708
|
配置更新
|
2019-01-15 17:08:31 +08:00 |
|
ms-dev
|
a480376dac
|
优化结构
|
2019-01-15 12:01:06 +08:00 |
killfen
|
cd4672a3dd
|
配置优化
|
2019-01-15 10:09:38 +08:00 |
|
ms-dev
|
da21280bb3
|
配置文件更新
|
2019-01-15 00:54:12 +08:00 |
|
killfen
|
33bb27debe
|
配置文件更新
|
2019-01-14 18:43:01 +08:00 |
|
ms-dev
|
03694f4ed8
|
更新
|
2019-01-14 18:07:46 +08:00 |
|
ms-dev
|
49d2a62073
|
springboot
|
2019-01-04 17:37:43 +08:00 |