Commit Graph

187 Commits

Author SHA1 Message Date
guwd 56545e53c6 说明更新 2021-01-07 14:46:35 +08:00
guwd 5510201ec4 配置优化 2021-01-07 14:38:17 +08:00
guwd b57b673598 默认图片资源 2021-01-07 14:31:34 +08:00
guwd b511f8649d 5.2.0稳定 2020-12-25 18:40:17 +08:00
xierz 83746f25f2 上线配置文件 2020-12-22 10:09:33 +08:00
xierz 3b8fb103c1 Merge branch 'master' into adaptive-oracle-mysql 2020-12-22 10:08:34 +08:00
xierz e9f2ec8792 更改数据库 2020-12-19 12:11:17 +08:00
xierz b2d5a4425b 更改数据库 2020-12-19 12:07:02 +08:00
xierz e5095af5c2 端口和数据库 2020-12-19 10:30:05 +08:00
xierz a9b4ec893e 更改版本 2020-12-19 09:42:37 +08:00
xierz 928c0eeb96 mysql数据库配置 2020-12-19 09:12:11 +08:00
xierz 2acdf656d9 oracle数据配置 2020-12-19 09:08:32 +08:00
xierz 546d787fbc 设置新站点管理员问题 2020-12-19 09:05:59 +08:00
xierz cda2f8f3a6 适配oracle
mybatis-plus默认为自增长id,雪花id需要特别设置
2020-12-18 15:11:13 +08:00
xierz 5cb5e78a2b Merge remote-tracking branch 'origin/master' 2020-12-14 14:14:18 +08:00
xierz 450f8c677c 删除limit 2020-12-14 14:13:51 +08:00
guwd c0eb946e0d 内部测试 2020-12-14 13:47:41 +08:00
guwd e765cec1a3 内部测试 2020-12-14 12:06:43 +08:00
xierz bf1499b969 database yml变量问题 2020-12-10 10:34:06 +08:00
guwd 096d6f2b1e 1、优化列表、封面枚举类型,原来是 1,2表示
2、优化搜索接口
2020-12-03 08:35:13 +08:00
wujj 61162d0bc4 静态文章地址 2020-11-21 12:44:14 +08:00
wujj 0e8d961bcc 字段规范 2020-11-21 08:39:54 +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 0a83e05472 主页 2020-11-16 17:39:51 +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 d7e4019b56 去除多余斜杠,添加拼音验证 2020-11-07 09:58:22 +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
guwd 0bd341644f 抽取ms-db 2020-11-03 13:41:24 +08:00
sgjj c3f132bef1 达梦链接 2020-11-02 09:48:38 +08:00
sgjj 8f6ff12dfb 去除appId依赖 2020-10-30 10:04:54 +08:00
sgjj 9345bdb426 添加配置 2020-10-29 14:43:35 +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
sgjj f28a00e507 mybatis-plus配置 2020-10-28 15:45:38 +08:00
guwd c4d4dadd24 模版路径 2020-10-27 09:29:27 +08:00
wujj a99a728384 配置 2020-10-22 15:05:22 +08:00
wujj 178b1c954a 上传 2020-10-21 15:02:26 +08:00
wujj e34740e37f 图片删除 2020-10-21 11:45:43 +08:00
wujj 50c84e30c8 验证码校验 2020-10-13 08:47:47 +08:00
wujj 676de6779e template 模板文件支持重命名 2020-10-12 09:25:09 +08:00
guwd 6210a2b480 说明更新 2020-09-23 09:04:36 +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 6d5a3c25cc 修改引用名 2020-09-21 13:46:52 +08:00
sgjj 1a86f88b44 添加国际化 2020-09-18 16:51:29 +08:00
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