wujj
|
3b47b0c931
|
拼音util
|
2020-07-07 14:25:00 +08:00 |
|
wujj
|
c1e9aec97e
|
验证码
|
2020-07-06 10:27:18 +08:00 |
|
wujj
|
4325e71164
|
注释
|
2020-07-04 17:49:54 +08:00 |
|
wujj
|
297c9a12a1
|
资源文件更新
|
2020-07-03 08:44:20 +08:00 |
|
wujj
|
3714e70d1c
|
Merge remote-tracking branch 'origin/master'
|
2020-07-02 15:28:23 +08:00 |
|
wujj
|
86fa059999
|
js去除
|
2020-07-02 11:35:32 +08:00 |
panpp
|
3d934928b9
|
Merge remote-tracking branch 'origin/master'
|
2020-07-02 08:47:43 +08:00 |
|
panpp
|
fc144a457d
|
修复了ms.util的时间格式化默认格式问题
|
2020-07-02 08:47:17 +08:00 |
luoxj
|
a41d33740d
|
修改资源404
|
2020-07-02 08:40:48 +08:00 |
|
panpp
|
c4bcf2b999
|
修改了常用功能样式
|
2020-07-01 14:08:53 +08:00 |
|
panpp
|
33df7e9f8a
|
Merge remote-tracking branch 'origin/master'
|
2020-07-01 09:16:34 +08:00 |
|
panpp
|
db3741229e
|
去除了ftl 的一处初始化
|
2020-07-01 09:16:12 +08:00 |
sgjj
|
5be80533b1
|
去除栏目管理的国际化
|
2020-07-01 08:54:11 +08:00 |
|
sgjj
|
09c59d7705
|
去除语言切换
|
2020-06-30 15:36:18 +08:00 |
|
sgjj
|
231ca1ca13
|
Merge remote-tracking branch 'origin/master'
|
2020-06-30 14:07:00 +08:00 |
|
sgjj
|
cb77002e6c
|
添加国际化
|
2020-06-30 14:06:31 +08:00 |
|
luoxj
|
0e366386f0
|
修改资源404
|
2020-06-29 16:08:42 +08:00 |
|
luoxj
|
5b9787167f
|
修改ui
|
2020-06-29 15:55:02 +08:00 |
|
luoxj
|
802afa43fc
|
修改ui
|
2020-06-29 15:52:46 +08:00 |
|
luoxj
|
d4da9e63a2
|
修改ui
|
2020-06-29 15:50:32 +08:00 |
|
luoxj
|
b5ec9bb51b
|
修改ui
|
2020-06-29 15:39:35 +08:00 |
|
wujj
|
342f28aea4
|
资源文件
|
2020-06-29 14:57:35 +08:00 |
|
wujj
|
107cd17ec5
|
数据库
|
2020-06-29 14:49:42 +08:00 |
|
sgjj
|
a96f78d384
|
sql注入问题
|
2020-06-28 18:03:39 +08:00 |
|
sgjj
|
b03b44a3c6
|
sql注入问题
|
2020-06-28 17:59:51 +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 |
|
sgjj
|
94b30bddbd
|
添加插件打包
|
2020-06-28 17:28:20 +08:00 |
|
wujj
|
1f692d7627
|
模板恢复
|
2020-06-28 16:44:28 +08:00 |
|
wujj
|
40a809e655
|
模板恢复
|
2020-06-28 11:43:05 +08:00 |
|
sgjj
|
05aa41fd9c
|
删除无用方法
|
2020-06-28 09:26:57 +08:00 |
|
sgjj
|
992a43df68
|
完成标签解析
|
2020-06-24 18:19:51 +08:00 |
|
sgjj
|
22db6187be
|
添加新标签
|
2020-06-24 11:24:40 +08:00 |
|
sgjj
|
2cc387c271
|
修改标签
|
2020-06-24 08:53:52 +08:00 |
vip
|
20798bf4d7
|
Merge remote-tracking branch 'origin/master'
|
2020-06-23 18:49:22 +08:00 |
|
vip
|
dc63d6dd09
|
重复新增封面栏目bug
|
2020-06-23 18:48:55 +08:00 |
|
panpp
|
eaa4ee4852
|
Merge remote-tracking branch 'origin/master'
|
2020-06-23 18:46:18 +08:00 |
|
panpp
|
1fda008a23
|
站点管理的bug 修复了
|
2020-06-23 18:45:50 +08:00 |
|
wujj
|
8e233e197d
|
资源清理
|
2020-06-23 18:04:22 +08:00 |
|
sgjj
|
cd3f054814
|
修改标签
|
2020-06-23 17:06:02 +08:00 |
|
panpp
|
7d09d3733b
|
修改了主页工作台常用功能的显示内容
|
2020-06-23 17:01:20 +08:00 |
|
panpp
|
a866cd3736
|
static init
|
2020-06-22 18:55:57 +08:00 |
|
shanggjj
|
d28c24976b
|
优化文章生成
|
2020-06-19 18:19:05 +08:00 |
|
shanggjj
|
d48752bda1
|
修正版本
|
2020-06-17 18:37:29 +08:00 |
|
shanggjj
|
851c2744dd
|
生成的栏目名为拼音
|
2020-06-17 18:01:39 +08:00 |
guwd
|
dd1c671c40
|
websocket
|
2020-05-23 16:20:37 +08:00 |
|
guwd
|
7054390a5a
|
配置更新
|
2020-05-23 14:31:19 +08:00 |
|
guwd
|
5b46f34bfe
|
更新json字段
|
2020-05-23 14:29:55 +08:00 |
|
guwd
|
7b38b08857
|
配置更新
|
2020-05-23 11:03:04 +08:00 |
|
guwd
|
f3b1a29d73
|
优化结构
|
2020-05-14 15:33:11 +08:00 |
|
guwd
|
a1a8b1a962
|
主题更新
|
2020-05-14 11:04:32 +08:00 |
|
guwd
|
197bbe33e7
|
优化依赖
|
2020-05-14 09:10:59 +08:00 |
|
sgjj
|
279f96ffa4
|
添加XSS过滤
|
2020-05-13 18:07:57 +08:00 |
|
sgjj
|
0ca41ed7c0
|
sql注入
|
2020-05-11 16:20:49 +08:00 |
|
sgjj
|
3212423620
|
防sql注入
|
2020-05-11 16:19:16 +08:00 |
信 赵
|
0a2f344bba
|
Merge branch '5.0.1' of https://gitee.com/mingSoft/MCMS into 5.0.1
Conflicts:
pom.xml
src/main/webapp/static/plugins/ms/1.0.0/compatible.js
|
2020-04-28 16:23:51 +08:00 |
|
信 赵
|
ef542c34cc
|
修复bug
|
2020-04-28 15:59:56 +08:00 |
|
wujj
|
92a99a4442
|
appId问题
|
2020-02-13 18:15:03 +08:00 |
|
wujj
|
6e5bdba347
|
百度编辑器appId问题
|
2020-02-13 16:03:43 +08:00 |
|
wujj
|
e99194d202
|
shiro权限启用
|
2020-02-13 15:31:50 +08:00 |
|
wujj
|
7133d078db
|
百度编辑器上传参数新增appId
|
2020-02-13 11:07:13 +08:00 |
|
ms group dev
|
9e5438a928
|
依赖更新
|
2020-02-04 11:45:35 +08:00 |
|
信 赵
|
5d04542856
|
Merge branch 'master' of https://gitee.com/mingSoft/MCMS
Conflicts:
src/main/webapp/WEB-INF/manager/main.ftl
|
2020-01-31 18:16:58 +08:00 |
|
信 赵
|
70541b9a91
|
修复兼容问题 删除多余的方法体
|
2020-01-31 17:44:49 +08:00 |
|
ms group dev
|
c27af1cf19
|
Merge remote-tracking branch 'origin/5.0.0'
|
2020-01-21 15:05:10 +08:00 |
|
huise
|
17f5ad42a1
|
修复主页生成问题
|
2020-01-20 18:17:55 +08:00 |
|
sgjj
|
9756518080
|
修复BUG
|
2020-01-16 13:41:04 +08:00 |
|
sgjj
|
1b9a7c090b
|
Merge branch 'master' of https://gitee.com/mingSoft/MCMS into 5.0.0
|
2020-01-11 14:37:28 +08:00 |
|
sgjj
|
6d728c0551
|
添加资源文件
|
2020-01-11 14:19:35 +08:00 |
|
wujj
|
5d39c8d47f
|
跳转
|
2020-01-11 10:05:14 +08:00 |
|
ms group dev
|
69c8700c3b
|
配置文件描述更新
|
2020-01-11 09:59:00 +08:00 |
|
铭飞
|
80372c87fd
|
!220 清理
Merge pull request !220 from 小伍/5.0.0
|
2020-01-10 21:33:47 +08:00 |
|
wujj
|
a1bf1c6c34
|
上传资源
|
2020-01-10 21:19:59 +08:00 |
|
铭飞
|
e2bb189ef1
|
!219 修复问题
Merge pull request !219 from 灰色DT/5.0.0
|
2020-01-10 21:16:53 +08:00 |
|
铭飞
|
4c51a7401d
|
!218 上传位置
Merge pull request !218 from 小伍/5.0.0
|
2020-01-10 21:16:45 +08:00 |
|
wujj
|
2182bd62b0
|
搜索
|
2020-01-10 18:50:54 +08:00 |
|
wujj
|
ee56c9f9cc
|
搜索
|
2020-01-10 18:24:05 +08:00 |
|
sgjj
|
f91963c665
|
修复一个可能存在的问题
|
2020-01-10 17:27:37 +08:00 |
|
wujj
|
0892395f90
|
版本回退
|
2020-01-10 15:03:23 +08:00 |
|
sgjj
|
405fc9c647
|
修复问题
|
2020-01-10 14:09:38 +08:00 |
|
wujj
|
b628c730f2
|
数据库和上传图片规范
|
2020-01-10 12:03:55 +08:00 |
|
sgjj
|
91959af754
|
提交配置
|
2020-01-10 11:35:52 +08:00 |
|
wujj
|
f8b4b66478
|
模板地址
|
2020-01-10 10:05:16 +08:00 |
|
铭飞
|
3034749495
|
!215 主页面
Merge pull request !215 from 小伍/5.0.0
|
2020-01-09 18:29:27 +08:00 |
|
wujj
|
1f69ca99b5
|
主界面
|
2020-01-09 18:21:28 +08:00 |
|
sgjj
|
50852e7f87
|
添加注释
|
2020-01-09 18:17:12 +08:00 |
|
铭飞
|
e8e14d3de2
|
!212 后台管理主页面优化
Merge pull request !212 from 熊志伟123123/5.0.0
|
2020-01-09 18:12:11 +08:00 |
走散在时光里
|
597162ca02
|
后台主页面优化
|
2020-01-09 18:10:05 +08:00 |
|
铭飞
|
5c770f518e
|
!209 修复无法保存空值问题，与后台管理首页获取并显示铭飞最新动态信息
Merge pull request !209 from 熊志伟123123/5.0.0
|
2020-01-09 17:05:14 +08:00 |
|
sgjj
|
304f1605b3
|
更新swagger问题
|
2020-01-09 16:58:39 +08:00 |
|
走散在时光里
|
42c9e189c8
|
修复文章管理编辑页面无法保存空值
|
2020-01-09 15:37:42 +08:00 |
|
走散在时光里
|
b170311e29
|
1、后台首页动态获取铭飞官网的消息、展示和点击跳转
2、修复栏目管理编辑页面的栏目关键字、栏目描述、自定义链接无法保存空值
|
2020-01-09 15:10:56 +08:00 |
|
走散在时光里
|
b392260a2c
|
1、栏目管理的添加与修改中添加内容模板和列表模板选项必填
2、删除对栏目管理中栏目属性的长度验证
3、resources.properties内容与resources_zh_CN.properties内容同步
|
2020-01-09 11:44:52 +08:00 |
|
走散在时光里
|
dde8f9b255
|
栏目管理字典的绑定，清除。
|
2020-01-08 14:18:02 +08:00 |
|
走散在时光里
|
0902f02ae3
|
单个调转链接错误
|
2020-01-08 09:44:21 +08:00 |
|
走散在时光里
|
52a22ab6cb
|
后台管理页主页的完善
|
2020-01-07 17:48:57 +08:00 |
|
走散在时光里
|
d5bb791c50
|
后台管理页主页的完善
|
2020-01-07 17:28:39 +08:00 |
|
sgjj
|
d35f5c6501
|
升级5.0
|
2020-01-07 14:12:11 +08:00 |
|
走散在时光里
|
69c22679c3
|
修复文章类型无法保存空值。
修复无法进入文章编辑页面问题。
|
2020-01-07 10:47:17 +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
|
530598f0c6
|
文章分类为空无法渲染的问题
|
2020-01-04 11:05:16 +08:00 |
|
sgjj
|
30ef12ada0
|
添加日志 文档开关
|
2020-01-03 18:21:00 +08:00 |
|
sgjj
|
834cb473f5
|
自定义搜索
|
2020-01-03 16:49:51 +08:00 |
|
sgjj
|
1969450550
|
配置更新
|
2020-01-03 11:57:37 +08:00 |
|
sgjj
|
44f8dede77
|
配置更新
|
2020-01-03 11:42:40 +08:00 |
|
sgjj
|
080fa96020
|
修复远程搜索
|
2019-12-31 14:17:15 +08:00 |
tianbj
|
889a25c0fe
|
清理文件
|
2019-12-31 13:41:02 +08:00 |
|
tianbj
|
2e6c20e40e
|
首页
|
2019-12-31 13:38:34 +08:00 |
|
wujj
|
f8a59a5e43
|
问号提示
|
2019-12-30 23:26:11 +08:00 |
|
wujj
|
653c403181
|
圆角
|
2019-12-30 22:04:24 +08:00 |
|
wujj
|
bf18409b64
|
清理
|
2019-12-30 21:55:47 +08:00 |
|
wujj
|
70d83994c6
|
静态资源
|
2019-12-30 18:49:24 +08:00 |
|
wujj
|
7ac1d387ae
|
模板
|
2019-12-30 17:17:05 +08:00 |
|
tianbj
|
c8d047dc88
|
样式
|
2019-12-30 12:03:51 +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 |
zhongyh
|
72f7732a4f
|
显示优化
|
2019-12-28 18:20:42 +08:00 |
|
tianbj
|
c5638d64b1
|
Merge remote-tracking branch 'origin/master'
|
2019-12-28 15:15:32 +08:00 |
|
tianbj
|
a48c743d6b
|
栏目
|
2019-12-28 15:15:16 +08:00 |
|
zhongyh
|
4e007b48d2
|
修复bug
|
2019-12-28 15:08:45 +08:00 |
|
tianbj
|
fdd1c49b62
|
栏目生成
|
2019-12-28 11:18:31 +08:00 |
|
tianbj
|
9c9556ea47
|
配置
|
2019-12-28 10:18:34 +08:00 |
|
tianbj
|
9e23111324
|
生成栏目
|
2019-12-28 10:02:01 +08:00 |
|
tianbj
|
b7b3904f09
|
文章
|
2019-12-28 09:05:30 +08:00 |
|
tianbj
|
f6e3f6cc1a
|
提示
|
2019-12-27 17:17:32 +08:00 |
|
tianbj
|
39d5e8abff
|
链接
|
2019-12-27 17:15:03 +08:00 |
|
tianbj
|
4c05f02b9f
|
静态化
|
2019-12-27 16:51:26 +08:00 |
|
tianbj
|
e6d1840763
|
文章
|
2019-12-27 16:10:30 +08:00 |
|
tianbj
|
ffe26f9348
|
删除旧文章
|
2019-12-27 15:59:14 +08:00 |
|
tianbj
|
1d7e5413d6
|
bug
|
2019-12-27 15:56:21 +08:00 |
|
zhongyh
|
2468068391
|
Merge remote-tracking branch 'origin/master'
|
2019-12-27 11:53:56 +08:00 |
|
zhongyh
|
53f587bcb6
|
提交资源文件
|
2019-12-27 11:53:01 +08:00 |
|
tianbj
|
bfdae66b6b
|
Merge remote-tracking branch 'origin/master'
|
2019-12-27 11:32:24 +08:00 |
|
tianbj
|
a8e7118cd0
|
链接
|
2019-12-27 11:32:04 +08:00 |
|
zhongyh
|
f40087b84c
|
添加插件
|
2019-12-27 10:52:09 +08:00 |
|
zhongyh
|
ffa51c87c8
|
修改beanName
|
2019-12-27 08:57:30 +08:00 |
|
tianbj
|
8a249af400
|
静态化
|
2019-12-26 15:50:43 +08:00 |
|
sgjj
|
eeff1573b1
|
Merge remote-tracking branch 'origin/master'
|
2019-12-26 14:53:30 +08:00 |
|
sgjj
|
8e544e9df9
|
添加自定义模型
|
2019-12-26 14:52:56 +08:00 |
|
zhongyh
|
ef6aa587e8
|
添加浏览记录文件
|
2019-12-23 11:28:58 +08:00 |
|
zhongyh
|
e9aeeeca17
|
更新文章点击数aop
|
2019-12-23 10:59:51 +08:00 |
|
sgjj
|
7f1612442e
|
修复bug
|
2019-12-21 10:20:26 +08:00 |
|
tianbj
|
9818f7b0a8
|
栏目
|
2019-12-18 08:41:01 +08:00 |
|
tianbj
|
6cfcb6fd0a
|
优化
|
2019-12-17 19:19:30 +08:00 |
|
tianbj
|
879f9c553b
|
Merge remote-tracking branch 'origin/master'
|
2019-12-17 18:17:03 +08:00 |
|
tianbj
|
56de943904
|
文章分类
|
2019-12-17 18:16:35 +08:00 |
|
zhongyh
|
b21bd89ad0
|
Merge remote-tracking branch 'origin/master'
|
2019-12-17 17:56:35 +08:00 |
|
zhongyh
|
ad9220882d
|
删除提示
|
2019-12-17 17:56:13 +08:00 |
|
tianbj
|
3932bb6bbd
|
文章分类
|
2019-12-17 16:54:57 +08:00 |
|
tianbj
|
7f159a07d8
|
文章
|
2019-12-17 10:06:42 +08:00 |
|
tianbj
|
9a4a9e8278
|
静态化
|
2019-12-16 10:02:03 +08:00 |