xierz
|
fa9cd60c2d
|
Merge remote-tracking branch 'origin/master'
|
2020-12-11 15:44:13 +08:00 |
xierz
|
89b1081849
|
保存封面栏目文章的自定义模型不能即时刷新问题
|
2020-12-11 15:43:52 +08:00 |
guwd
|
09b87a9e3e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/resources/application.yml
|
2020-12-11 15:11:20 +08:00 |
guwd
|
0f0b778d5e
|
5.2.0版本同步
|
2020-12-11 15:08:17 +08:00 |
wujj
|
634c6ddd9c
|
网站标题
|
2020-12-11 10:17:37 +08:00 |
xierz
|
bf1499b969
|
database yml变量问题
|
2020-12-10 10:34:06 +08:00 |
wujj
|
f11ee786cd
|
升级sql
|
2020-12-05 10:22:20 +08:00 |
guwd
|
8f45926538
|
资源文件更新
|
2020-12-04 09:55:30 +08:00 |
xierz
|
6c0dded80e
|
自定义模型回显
|
2020-12-03 12:09:54 +08:00 |
guwd
|
96777cff79
|
模版更新
|
2020-12-03 10:07:01 +08:00 |
guwd
|
096d6f2b1e
|
1、优化列表、封面枚举类型,原来是 1,2表示
2、优化搜索接口
|
2020-12-03 08:35:13 +08:00 |
xierz
|
871245eef5
|
修复参数bug
|
2020-12-02 18:18:09 +08:00 |
wujj
|
dba5100257
|
国际化
|
2020-12-02 18:04:49 +08:00 |
wujj
|
00dd38dd12
|
国际化
|
2020-12-02 17:29:03 +08:00 |
guwd
|
9645da575a
|
修复解析@value问题,@value属性不能使用static属性
|
2020-12-02 13:30:54 +08:00 |
guwd
|
ae904c1584
|
1、增加配置html
|
2020-12-02 10:29:43 +08:00 |
guwd
|
075caec9ef
|
资源文件更新
|
2020-12-02 08:32:42 +08:00 |
guwd
|
4cebaff0dc
|
1、生成修改html/编号问题,增加app_dir
2、针对app_dir调整解析器
3、模板交互增加
|
2020-12-02 08:21:16 +08:00 |
guwd
|
05bb1bd7d4
|
1、移除无效测试
2、修改样式
3、修改生成
|
2020-12-01 18:30:40 +08:00 |
guwd
|
5a74a045ea
|
解决文章与栏目生成时候,封面页面冲突问题
|
2020-12-01 16:05:44 +08:00 |
guwd
|
1f64d605b2
|
注释更新
|
2020-11-30 17:29:17 +08:00 |
guwd
|
fd764fdb4e
|
1、优化解析过程,分页size的获取方式采用正则
2、移除不需要的业务流程,提高解析效率
|
2020-11-28 07:52:08 +08:00 |
xierz
|
631574fe81
|
Merge remote-tracking branch 'origin/master'
|
2020-11-25 14:38:37 +08:00 |
xierz
|
7146a2e115
|
规范方法名
|
2020-11-25 14:38:31 +08:00 |
guwd
|
a6436015bf
|
废弃attribebean
|
2020-11-25 10:12:15 +08:00 |
guwd
|
81cf5e8f4e
|
资源文件更新
|
2020-11-25 10:09:01 +08:00 |
guwd
|
bdba1916a9
|
修复litpic
|
2020-11-25 09:22:30 +08:00 |
guwd
|
57d66f8701
|
去掉typetitle
|
2020-11-24 20:54:31 +08:00 |
guwd
|
63b3976f29
|
增加分类名称
|
2020-11-24 20:45:02 +08:00 |
xierz
|
7cb3edd769
|
封面栏目问题
|
2020-11-24 19:24:56 +08:00 |
xierz
|
ee12b84b2d
|
upload上传回调
|
2020-11-24 11:59:15 +08:00 |
xierz
|
3eb03d1cfd
|
静态化问题
|
2020-11-24 11:47:21 +08:00 |
xierz
|
c36c1e67ef
|
封面栏目文章问题
|
2020-11-24 09:06:51 +08:00 |
xierz
|
1d21a818ca
|
Merge remote-tracking branch 'origin/master'
|
2020-11-23 17:13:21 +08:00 |
xierz
|
ea4c29574d
|
规范国际化文件
|
2020-11-23 17:10:15 +08:00 |
guwd
|
224b5e5db7
|
Merge remote-tracking branch 'origin/master'
|
2020-11-23 16:14:10 +08:00 |
guwd
|
d957ae0a5a
|
初始化样式
|
2020-11-23 16:14:02 +08:00 |
xierz
|
f9bec3df6e
|
隐藏应用子栏目
|
2020-11-23 15:25:45 +08:00 |
xierz
|
7e997691da
|
修复应用模板
|
2020-11-23 14:54:00 +08:00 |
xierz
|
5c7ef73eec
|
复制栏目
|
2020-11-23 14:10:44 +08:00 |
xierz
|
25cfb72798
|
应用子栏目模板
|
2020-11-23 11:05:21 +08:00 |
guwd
|
3582314e47
|
Merge remote-tracking branch 'origin/master'
|
2020-11-23 10:03:40 +08:00 |
guwd
|
bb41e14084
|
批量更新模版
|
2020-11-23 10:03:33 +08:00 |
xierz
|
23e7468444
|
提示
|
2020-11-23 10:00:38 +08:00 |
xierz
|
8d68c53afe
|
文章管理栏目问题
|
2020-11-23 09:38:27 +08:00 |
guwd
|
141dff63c5
|
修改自定义模型
|
2020-11-23 08:18:04 +08:00 |
wujj
|
9df436f327
|
测试模板
|
2020-11-21 13:08:44 +08:00 |
xierz
|
b2197210e8
|
删除dao数据库适配
|
2020-11-21 13:03:47 +08:00 |
xierz
|
d278bcd87e
|
删除dao适配
|
2020-11-21 12:49:07 +08:00 |
wujj
|
6a7d9d113f
|
Merge remote-tracking branch 'origin/master'
|
2020-11-21 12:44:26 +08:00 |
wujj
|
61162d0bc4
|
静态文章地址
|
2020-11-21 12:44:14 +08:00 |
xierz
|
d651a1669f
|
分类字段为空注解和字段类型更改
|
2020-11-21 12:30:00 +08:00 |
wujj
|
fcd1ac1e5a
|
Merge remote-tracking branch 'origin/master'
|
2020-11-21 11:38:40 +08:00 |
wujj
|
f8c908c5e4
|
分类去掉字段
|
2020-11-21 11:38:21 +08:00 |
xierz
|
c432d01831
|
静态化按钮权限
|
2020-11-21 11:37:43 +08:00 |
wujj
|
0090142812
|
字段规范
|
2020-11-21 11:18:04 +08:00 |
wujj
|
b4dedc1b7b
|
字段规范
|
2020-11-21 10:28:15 +08:00 |
wujj
|
8978c94fe3
|
Merge remote-tracking branch 'origin/master'
|
2020-11-21 08:40:19 +08:00 |
wujj
|
0e8d961bcc
|
字段规范
|
2020-11-21 08:39:54 +08:00 |
xierz
|
030b13a0f8
|
拼音正则
|
2020-11-20 11:49:50 +08:00 |
xierz
|
450c72bca5
|
调整
|
2020-11-19 18:55:02 +08:00 |
xierz
|
1e6a055a29
|
规范主键和删除appid后的问题
|
2020-11-19 18:21:27 +08:00 |
xierz
|
37e957123f
|
包名
|
2020-11-18 11:59:38 +08:00 |
xierz
|
ec5a1421cc
|
test数据库
|
2020-11-18 10:11:22 +08:00 |
xierz
|
26043a14e6
|
appid问题
|
2020-11-17 17:03:33 +08:00 |
wujj
|
ee9869ca48
|
模板
|
2020-11-17 16:46:31 +08:00 |
xierz
|
b4c8b5215f
|
config
|
2020-11-17 15:49:48 +08:00 |
wujj
|
0a83e05472
|
主页
|
2020-11-16 17:39:51 +08:00 |
wujj
|
4860372295
|
资源文件
|
2020-11-16 11:54:04 +08:00 |
xierz
|
058a2bc65f
|
5.2问题
|
2020-11-13 16:06:07 +08:00 |
guwd
|
3ff58f6344
|
内部测试
|
2020-11-12 18:03:10 +08:00 |
guwd
|
a39d57c002
|
5100端口修改
|
2020-11-12 17:50:57 +08:00 |
guwd
|
a49676a7ba
|
内部开源系统
|
2020-11-12 16:59:29 +08:00 |
sgjj
|
9ed287211f
|
Merge remote-tracking branch 'origin/master'
|
2020-11-11 16:36:47 +08:00 |
sgjj
|
8a2fc3b746
|
恢复栏目的斜杠
|
2020-11-11 16:36:00 +08:00 |
xierz
|
14b612947f
|
文章管理和栏目管理id列拉长
|
2020-11-11 08:30:33 +08:00 |
sgjj
|
d7e4019b56
|
去除多余斜杠,添加拼音验证
|
2020-11-07 09:58:22 +08:00 |
wujj
|
f23d238cf7
|
appid方法修改
|
2020-11-06 16:32:27 +08:00 |
wujj
|
12f5881619
|
生成文章
|
2020-11-06 11:43:12 +08:00 |
wujj
|
28269bbfd2
|
变量判空
|
2020-11-06 11:00:54 +08:00 |
wujj
|
beacc12420
|
template
|
2020-11-04 09:08:39 +08:00 |
wujj
|
2e8a6d9817
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# pom.xml
# src/main/resources/application.yml
|
2020-11-03 18:13:24 +08:00 |
wujj
|
55b338db4e
|
init
|
2020-11-03 18:10:24 +08:00 |
xierz
|
1a95a6978e
|
栏目分类新增拼音
|
2020-11-03 14:46:18 +08:00 |
wujj
|
62c2ebdfb0
|
Merge remote-tracking branch 'origin/5.2' into 5.2
|
2020-11-03 13:44:47 +08:00 |
wujj
|
5aeaac32c9
|
清理
|
2020-11-03 13:44:35 +08:00 |
guwd
|
0bd341644f
|
抽取ms-db
|
2020-11-03 13:41:24 +08:00 |
guwd
|
8b9cf07b70
|
抽取ms-db
|
2020-11-03 13:30:54 +08:00 |
xierz
|
14b2d5db6b
|
修改栏目-父节点判断
修改栏目-更新父节点叶子状态方式
新增栏目-新增栏目一定是叶子节点
|
2020-11-03 12:08:56 +08:00 |
sgjj
|
d68b4dd9e0
|
调整配置
|
2020-11-02 16:46:41 +08:00 |
sgjj
|
8f5b0adfe2
|
修改别名
|
2020-11-02 16:24:14 +08:00 |
sgjj
|
64a749e153
|
添加别名
|
2020-11-02 16:17:30 +08:00 |
sgjj
|
c3f132bef1
|
达梦链接
|
2020-11-02 09:48:38 +08:00 |
sgjj
|
1e6ebdcc4a
|
Merge remote-tracking branch 'origin/5.2' into 5.2
|
2020-10-31 11:18:03 +08:00 |
sgjj
|
a50f0f7b55
|
抽离多租户
|
2020-10-31 11:16:27 +08:00 |
xierz
|
68cce8c42b
|
更改文章删除方式
|
2020-10-31 10:47:40 +08:00 |
xierz
|
2f2f9ddf3c
|
栏目删除更改id类型
|
2020-10-31 10:21:42 +08:00 |
xierz
|
8db9504a60
|
5.2升级包
|
2020-10-30 18:12:21 +08:00 |
sgjj
|
aa5bd09acf
|
修改烂机器
|
2020-10-30 16:07:00 +08:00 |
xierz
|
9b949b8b1c
|
更改常量APP_ID
|
2020-10-30 10:42:04 +08:00 |
sgjj
|
6b271adb96
|
恢复代码
|
2020-10-30 10:34:53 +08:00 |
sgjj
|
8f6ff12dfb
|
去除appId依赖
|
2020-10-30 10:04:54 +08:00 |
sgjj
|
0f5828d47d
|
撤回提交
|
2020-10-29 14:50:29 +08:00 |
sgjj
|
9345bdb426
|
添加配置
|
2020-10-29 14:43:35 +08:00 |
sgjj
|
4682b0ca51
|
添加雪花主键
|
2020-10-29 14:39:59 +08:00 |
sgjj
|
1c16536ff1
|
Merge remote-tracking branch 'origin/5.2' into 5.2
|
2020-10-29 11:56:54 +08:00 |
wujj
|
37cffefb0d
|
模板
|
2020-10-29 11:44:00 +08:00 |
wujj
|
3ffe552ffb
|
Merge remote-tracking branch 'origin/5.2' into 5.2
|
2020-10-28 18:12:47 +08:00 |
wujj
|
ef77f3989b
|
模板
|
2020-10-28 18:12:24 +08:00 |
sgjj
|
f28a00e507
|
mybatis-plus配置
|
2020-10-28 15:45:38 +08:00 |
sgjj
|
379bd0084b
|
调整规范
|
2020-10-28 15:33:06 +08:00 |
guwd
|
c4d4dadd24
|
模版路径
|
2020-10-27 09:29:27 +08:00 |
xierz
|
70393e190f
|
任务调度静态化
|
2020-10-24 11:34:22 +08:00 |
xierz
|
be9263c002
|
静态化任务调度
|
2020-10-23 17:56:03 +08:00 |
wujj
|
b3fdd1fc09
|
升级
|
2020-10-23 15:10:20 +08:00 |
wujj
|
a99a728384
|
配置
|
2020-10-22 15:05:22 +08:00 |
wujj
|
77f63cee5e
|
资源
|
2020-10-22 10:24:36 +08:00 |
wujj
|
f6184c03f1
|
资源更新
|
2020-10-22 10:21:10 +08:00 |
wujj
|
1edf89e4af
|
Merge remote-tracking branch 'origin/5.2' into 5.2
|
2020-10-21 15:51:39 +08:00 |
wujj
|
40c6f9bea2
|
配置
|
2020-10-21 15:51:27 +08:00 |
xierz
|
2539a73dd4
|
Merge remote-tracking branch 'origin/5.2' into 5.2
|
2020-10-21 15:29:37 +08:00 |
guwd
|
71c1dc1777
|
去掉无效配置
|
2020-10-21 15:18:50 +08:00 |
wujj
|
178b1c954a
|
上传
|
2020-10-21 15:02:26 +08:00 |
xierz
|
96027e1065
|
修复编辑栏目中编辑状态问题
|
2020-10-21 14:12:46 +08:00 |
wujj
|
e34740e37f
|
图片删除
|
2020-10-21 11:45:43 +08:00 |
sgjj
|
840c027a92
|
提交修改
|
2020-10-21 10:31:18 +08:00 |
xierz
|
abdd66ed8f
|
Merge remote-tracking branch 'origin/5.2' into 5.2
|
2020-10-19 12:14:19 +08:00 |
xierz
|
7048413885
|
新增子栏目优化
|
2020-10-19 12:12:46 +08:00 |
wujj
|
b6ba87394b
|
上传
|
2020-10-19 10:57:54 +08:00 |
xierz
|
a655345c9a
|
新增子栏目
|
2020-10-19 10:57:16 +08:00 |
wujj
|
ae907965f9
|
style标签
|
2020-10-19 10:09:50 +08:00 |
wujj
|
ce583df4c3
|
文件管理资源更新
|
2020-10-17 12:38:31 +08:00 |
wujj
|
c87ae4b3f0
|
文档地址
|
2020-10-13 09:02:29 +08:00 |
wujj
|
50c84e30c8
|
验证码校验
|
2020-10-13 08:47:47 +08:00 |
wujj
|
c791bf4073
|
文档链接
|
2020-10-12 14:30:09 +08:00 |
wujj
|
b5f90866d4
|
sql修改
|
2020-10-12 14:20:39 +08:00 |
wujj
|
b375d2cc4f
|
Merge remote-tracking branch 'origin/master'
|
2020-10-12 09:25:45 +08:00 |
wujj
|
676de6779e
|
template 模板文件支持重命名
|
2020-10-12 09:25:09 +08:00 |
guwd
|
9930e62edd
|
资源同步
|
2020-10-12 08:38:33 +08:00 |
guwd
|
6194c7c80b
|
打包
|
2020-09-28 13:31:01 +08:00 |
vip
|
7651500038
|
修改自定义返回值
|
2020-09-27 15:00:09 +08:00 |
wujj
|
a0c6f99723
|
接口规范
|
2020-09-27 11:06:39 +08:00 |
guwd
|
6210a2b480
|
说明更新
|
2020-09-23 09:04:36 +08:00 |
sgjj
|
d3f9a70118
|
修复文章属性栏目属性筛选,添加时间范围搜索
|
2020-09-22 16:13:40 +08:00 |
sgjj
|
48e10590fd
|
修复搜索空异常
|
2020-09-22 14:17:27 +08:00 |
sgjj
|
aba427d36f
|
删除配置
|
2020-09-22 11:52:49 +08:00 |
sgjj
|
63eaa1b0ba
|
修改配置
|
2020-09-22 11:05:11 +08:00 |
sgjj
|
2fb1185cb6
|
国际化
|
2020-09-22 10:45:08 +08:00 |
sgjj
|
5a360c5a74
|
搜索分页切换两次问题、文章管理父级栏目不显示子栏目文章问题
|
2020-09-22 10:06:42 +08:00 |
sgjj
|
6d5a3c25cc
|
修改引用名
|
2020-09-21 13:46:52 +08:00 |
sgjj
|
1a86f88b44
|
添加国际化
|
2020-09-18 16:51:29 +08:00 |
sgjj
|
d4b7b2b830
|
修复问题
|
2020-09-16 17:01:08 +08:00 |
sgjj
|
36ff8a02ee
|
生成优化
|
2020-09-16 16:57:19 +08:00 |
sgjj
|
8e36898ac2
|
添加列表生成获取当前栏目
|
2020-09-15 12:06:55 +08:00 |
guwd
|
31c8549af3
|
版本更新
|
2020-09-10 12:32:40 +08:00 |
guwd
|
dea070c6c0
|
打包优化
|
2020-09-09 18:05:06 +08:00 |
luoxj
|
3335a52a22
|
默认模板
|
2020-09-09 16:15:26 +08:00 |
guwd
|
8b0dccae71
|
优化结构
|
2020-09-08 11:44:07 +08:00 |
guwd
|
18b86274a6
|
结构优化
|
2020-09-07 18:13:27 +08:00 |
guwd
|
734b8c0c01
|
错误修改
|
2020-09-07 17:00:02 +08:00 |
guwd
|
622ff4504d
|
store组件规范
|
2020-09-07 14:59:52 +08:00 |
guwd
|
3fa1b5d6d3
|
Merge remote-tracking branch 'origin/master'
|
2020-09-07 14:06:41 +08:00 |
sgjj
|
4509931488
|
修复安全问题
|
2020-09-07 11:58:45 +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 |
luoxj
|
9f9f903592
|
标签bug
|
2020-09-04 11:26:27 +08:00 |
luoxj
|
91c6ce2587
|
类型
|
2020-09-04 10:43:43 +08:00 |
guwd
|
55633f20a7
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/webapp/WEB-INF/manager/index.ftl
|
2020-09-03 18:47:59 +08:00 |
luoxj
|
511cad477e
|
store.js
|
2020-09-03 18:07:27 +08:00 |
luoxj
|
debfe0bf33
|
Merge remote-tracking branch 'origin/master'
|
2020-09-03 16:53:35 +08:00 |
luoxj
|
9be4a1ee17
|
表单标记
|
2020-09-03 16:53:12 +08:00 |
sgjj
|
b56d77c4da
|
添加查询子项目
|
2020-09-03 16:40:42 +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 |
luoxj
|
c2775e2b01
|
提示
|
2020-09-03 11:11:56 +08:00 |
luoxj
|
79d58c67e9
|
Merge remote-tracking branch 'origin/master'
|
2020-09-03 11:10:21 +08:00 |
luoxj
|
6346898cca
|
文章伪删除
|
2020-09-03 11:10:04 +08:00 |
vip
|
1b15a2dda4
|
修改拼写错误添加默认时间
|
2020-09-03 09:17:43 +08:00 |
vip
|
8edbedfaf0
|
修改文章
|
2020-09-03 09:16:01 +08:00 |
luoxj
|
ce8319edf3
|
store地址修改
|
2020-09-02 18:05:20 +08:00 |
luoxj
|
8a28ed1b62
|
列表排序
|
2020-09-02 16:42:17 +08:00 |
luoxj
|
588d0791eb
|
上传
|
2020-09-02 10:54:45 +08:00 |
luoxj
|
cd98976326
|
分页
|
2020-09-01 16:29:42 +08:00 |
luoxj
|
49e02e6940
|
清理
|
2020-08-31 11:04:18 +08:00 |
guwd
|
d66a118372
|
修复模版上次
|
2020-08-31 09:05:17 +08:00 |
luoxj
|
ab0628619e
|
Merge remote-tracking branch 'origin/master'
|
2020-08-29 11:59:09 +08:00 |
luoxj
|
7ad3c8afb9
|
开源同步
|
2020-08-29 11:58:50 +08:00 |
sgjj
|
c68b5d25c2
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
|
2020-08-28 15:31:17 +08:00 |
sgjj
|
b6568f6c40
|
修复没有上一篇的问题
|
2020-08-28 15:30:20 +08:00 |
luoxj
|
ddba70fad2
|
表单标记
|
2020-08-28 13:45:49 +08:00 |
luoxj
|
6fd16fbd48
|
文章列表接口增加静态地址
|
2020-08-27 18:38:04 +08:00 |
luoxj
|
eccc7c699a
|
sql 更新
|
2020-08-27 11:53:43 +08:00 |
luoxj
|
c4c08c1e9a
|
css
|
2020-08-24 14:14:12 +08:00 |
panpp
|
65bc10e352
|
store客户端
|
2020-08-13 14:00:28 +08:00 |
vip
|
0bb7660f16
|
视频未显示和
|
2020-08-13 09:14:45 +08:00 |
wujj
|
e38d1bbed1
|
测试store
|
2020-08-11 15:30:36 +08:00 |
sgjj
|
73d06da7bb
|
Merge remote-tracking branch 'origin/master'
|
2020-08-08 08:37:40 +08:00 |
sgjj
|
7c14089dd1
|
修复注入问题
|
2020-08-07 18:00:22 +08:00 |
luoxj
|
f0d75c5e25
|
滚动条
|
2020-08-07 15:20:51 +08:00 |
vip
|
054af2f9d1
|
修改数据库
|
2020-08-07 12:19:27 +08:00 |
vip
|
1020cb2103
|
修改数据库
|
2020-08-07 12:13:08 +08:00 |
vip
|
0009b375ac
|
主页和完善栏目编辑
|
2020-08-07 11:46:22 +08:00 |
vip
|
38fc069f41
|
主页和完善栏目编辑
|
2020-08-07 11:46:22 +08:00 |
guwd
|
aa96601681
|
测试配置
|
2020-08-07 11:43:59 +08:00 |
guwd
|
b35d2e6bba
|
栏目描述
|
2020-08-07 11:42:19 +08:00 |
vip
|
e8995119c9
|
修复注册页面
|
2020-08-07 11:29:32 +08:00 |
vip
|
a5893c605a
|
修复问题
|
2020-08-07 11:00:45 +08:00 |
sgjj
|
7153e35eae
|
Merge remote-tracking branch 'origin/master'
|
2020-08-07 09:49:16 +08:00 |
sgjj
|
a8e8f68187
|
修数据库链接
|
2020-08-07 09:48:30 +08:00 |
vip
|
042cdb9eaa
|
栏目首页增加排序
|
2020-08-07 09:42:23 +08:00 |
vip
|
87c920acf0
|
Merge branch 'master' of http://imingsoft.cn:3000/mingsoft/ms-mcms
|
2020-08-06 13:52:58 +08:00 |
sgjj
|
78a8b4c48c
|
修复栏目路径问题
|
2020-08-06 10:15:37 +08:00 |
vip
|
fc5020ed57
|
静态文件
|
2020-08-04 16:25:22 +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
|
1b080a160c
|
链接地址
|
2020-07-31 09:15:15 +08:00 |
wujj
|
31aff72628
|
链接地址
|
2020-07-31 09:09:12 +08:00 |
vip
|
0f2cd8143a
|
content浏览量+1
|
2020-07-21 12:09:55 +08:00 |
wujj
|
82f7af6909
|
类图
|
2020-07-07 15:08:29 +08:00 |
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 |