Commit Graph

659 Commits

Author SHA1 Message Date
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