ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
801 Commits 1 Branch 0 Tags 163 MiB
Commit Graph

512 Commits

Author SHA1 Message Date
sgjj b6cbc7fece 单点 2019-08-23 16:32:49 +08:00
sgjj 5b77df26f8 升级为平台ms 2019-08-23 16:28:17 +08:00
sgjj 84cb91ec62 同步 2019-08-19 13:39:54 +08:00
wangtp d7517fb958 解决xss导致模板不能上传 2019-08-15 17:49:18 +08:00
sgjj fd029a04c5 添加百度统计 2019-08-15 09:27:58 +08:00
wangtp 8a3371cab6 更新 2019-08-14 18:39:40 +08:00
铭飞 cfa5e1fdea !177 添加文件限制 
Merge pull request !177 from 灰色DT/4.7.1
 2019-08-14 18:26:50 +08:00
sgjj 818f555288 更新 2019-08-14 18:11:02 +08:00
sgjj 23ad315667 修复部分背景无法显示的问题 2019-08-14 16:58:58 +08:00
sgjj 0c3f9794c7 添加防xss配置 2019-08-13 20:46:39 +08:00
灰色DT 3c2ce021e5 更新 WebConfig.java 2019-08-13 20:40:43 +08:00
灰色DT ebf79865f0 更新 application.yml 2019-08-13 15:23:56 +08:00
ms group dev e47c97abf5 说明 2019-08-09 23:22:11 +08:00
ms group dev a6b429ddd2 移除垃圾文件 2019-08-09 23:04:24 +08:00
ms group dev ed655b6f12 4.7.1更新 2019-08-09 22:50:54 +08:00
铭飞 6d0f70935f !176 修复动态解析 
Merge pull request !176 from 灰色DT/4.7.1
 2019-08-09 22:02:02 +08:00
sgjj 8206b44273 修复动态解析 2019-08-09 21:50:39 +08:00
ms group dev 722590977e 模版更新 2019-08-09 15:45:50 +08:00
sgjj 4f54ae2c71 修复启动错误 2019-08-09 14:46:34 +08:00
sgjj e8f2f849b4 修复栏目为封面没有文章找不到页面的问题 2019-08-08 18:12:46 +08:00
sgjj 2cc1e5041a 优化静态映射路径 2019-08-08 16:37:05 +08:00
sgjj 77a1ba6020 搜索模板 2019-08-07 18:26:46 +08:00
hcong 42549f2e0b 栏目属性 2019-08-07 15:14:52 +08:00
ms group dev df3e10c63c 配置更新 2019-08-06 18:47:19 +08:00
lvwj 0fd4a57ae1 修复默认皮肤 2019-06-11 09:28:26 +08:00
ms-dev ded33b1af5 右边模板js问题 2019-05-18 14:38:24 +08:00
ms-dev 47003f1714 优化静态资源文件、优化默认皮肤 2019-05-17 12:05:59 +08:00
ms-dev bad12870f6 测试数据 2019-05-16 09:54:48 +08:00
ms-dev c8bc6b700b 欢迎界面更新 2019-05-05 16:02:19 +08:00
ms-dev 73d2b0fdac 增加视图 2019-05-05 14:16:05 +08:00
ms group dev c551ec5cdc 验证框架更新 2019-04-25 11:58:38 +08:00
ms group dev daf1b09fb6 上传控件更新 2019-04-25 11:53:06 +08:00
ms group dev d07f5b0e32 图标本地化 2019-04-12 15:18:35 +08:00
ms-dev 0523c246b2 资源文件更新 2019-04-09 18:03:25 +08:00
ms group dev 43fdb95d92 更新静态资源 2019-04-09 17:58:47 +08:00
ms group dev ee40ff0a94 资源本地化 2019-04-09 17:34:58 +08:00
ms group dev 15802e879c 设置欢迎页 2019-04-09 17:27:57 +08:00
ms group dev d712b3ccfe 优化标签结构 2019-04-08 10:22:26 +08:00
ms group dev 3629f7bb6f 静态资源更新 2019-04-08 10:22:10 +08:00
他是超人他会飞 74cc8d5bc0 !162 修改用户信息请求方式、添加用户登录ip、去除多余的参数 
Merge pull request !162 from 他是超人他会飞/4.7.0
 2019-03-27 07:38:36 +08:00
sunxin 67c3975bd7 修改用户信息请求方式 2019-03-25 18:46:52 +08:00
sunxin 39076a4238 去除多余的参数 2019-03-25 16:40:14 +08:00
他是超人他会飞 59bdeabbc3 !160 上下篇的判断修改 
Merge pull request !160 from 他是超人他会飞/4.7.0
 2019-03-19 14:08:31 +08:00
sunxin 4e7cd16ed0 上下篇的判断 2019-03-19 14:04:25 +08:00
铭飞 016fc54903 !159 搜索参数修改 
Merge pull request !159 from 他是超人他会飞/4.7.0
 2019-03-19 11:48:52 +08:00
Sun Xin 77bebfdec5 搜索参数修改 2019-03-16 10:17:45 +08:00
sunxin 71c4dc2a1c 添加站点编号，修改sql 2019-03-15 09:25:03 +08:00
sunxin ccfedef9f6 搜索修改 2019-03-14 14:19:53 +08:00
sunxin 96b43ef853 配置更新 2019-03-13 18:18:19 +08:00
他是超人他会飞 c7ab2ac3de !154 搜索修改 
Merge pull request !154 from 他是超人他会飞/4.7.0
 2019-03-13 16:49:56 +08:00
sunxin 6a09791e6f 搜索修改 2019-03-13 16:40:10 +08:00
sunxin 4ed1a36a47 返回栏目模块编号和父栏目编号 2019-03-13 16:39:35 +08:00
他是超人他会飞 0f4dcbdac8 !153 添加分页类 
Merge pull request !153 from 他是超人他会飞/4.7.0
 2019-03-13 15:24:13 +08:00
sunxin 1859f695ad 分页 2019-03-13 14:36:11 +08:00
sunxin c0542503f7 分页 2019-03-13 14:13:43 +08:00
Sun Xin 450f27ebc1 添加分页类 2019-03-12 13:00:55 +08:00
他是超人他会飞 6ec0df95a8 !151 sql 更新 
Merge pull request !151 from 他是超人他会飞/4.7.0
 2019-03-12 10:55:16 +08:00
sunxin 31f44a51d6 sql 更新 2019-03-12 10:52:39 +08:00
他是超人他会飞 93cf6547f4 !150 方法优化 
Merge pull request !150 from 他是超人他会飞/4.7.0
 2019-03-06 10:25:59 +08:00
sunxin 5b7e4fa228 方法优化 2019-03-06 10:13:54 +08:00
他是超人他会飞 6b87402522 !149 自定义模型字段搜索 
Merge pull request !149 from 他是超人他会飞/4.7.0
 2019-03-05 16:26:04 +08:00
sunxin c4ea16f0da 注释修改 2019-03-05 16:21:56 +08:00
sunxin 00a8a7c795 自定义模型字段搜索 2019-03-05 15:55:58 +08:00
sunxin 6321738201 注释修改 2019-03-05 10:26:42 +08:00
sunxin 10c3e4c912 上下页修改 2019-03-05 10:21:31 +08:00
Sun Xin 3ddd016266 添加引号 2019-03-04 20:46:08 +08:00
sunxin 47568e22c6 分页 2019-03-04 19:41:47 +08:00
Sun Xin b033abee65 搜索 2019-03-04 01:14:44 +08:00
sunxin 2443a80c3d 修改参数 2019-03-02 18:24:57 +08:00
sunxin 5a7221b1ec 搜索修改 2019-03-02 18:17:49 +08:00
ms group dev 03e2ac9b32 优化配置 2019-03-02 17:17:56 +08:00
sunxin 900f27b6b4 获取地址栏中的url 2019-03-02 16:20:05 +08:00
sunxin 83e6238e0f 请求方式 2019-03-01 14:10:02 +08:00
sunxin 081504ef0d 搜索注释 2019-03-01 12:37:30 +08:00
sunxin e868564da3 首页链接 2019-03-01 11:57:57 +08:00
sunxin fab9bfd218 判断修改 2019-03-01 11:48:37 +08:00
sunxin 22d6866c5f 登录注册链接修改 2019-03-01 10:13:54 +08:00
sunxin e55e5c23b3 列表页 2019-03-01 10:08:47 +08:00
sunxin cb5f42976e 添加URL参数 2019-03-01 09:50:27 +08:00
sunxin 74c17698cb 请求方式 2019-02-28 19:23:47 +08:00
sunxin 929077d171 添加参数 2019-02-28 18:05:30 +08:00
sunxin 4cf31d35a2 添加mysql执行多条SQL 2019-02-28 17:44:48 +08:00
Sun Xin 60bd4c00e0 搜索页面方法添加 2019-02-27 07:15:28 +08:00
Sun Xin 2eb223f7ba 修改模板名 2019-02-27 07:09:20 +08:00
sunxin de1c2d2f39 mysql 提交 2019-02-27 17:48:26 +08:00
Administrator f8a4aff276 多图上传|隔开，配置修改 2019-02-27 09:20:51 +08:00
Administrator e658088863 请求方式统一 2019-02-27 08:46:37 +08:00
sunxin 5f1131639e SQLServer适配 2019-02-25 11:41:05 +08:00
sunxin d2151c3837 添加mysql和SQLServer的升级SQL文件和4.7.0文件 2019-02-22 11:39:08 +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 d3bd31c56d 移除资源 2019-02-18 10:45:49 +08:00
ms-dev 15ffc05b0a 测试更新 2019-02-18 10:45:14 +08:00
他是超人他会飞 ab6f0e318c !134 提交默认模版 
Merge pull request !134 from 他是超人他会飞/4.7.0
 2019-02-18 09:37:05 +08:00
ms group dev 622428dbd2 配置更新 2019-02-17 21:21:34 +08:00
ms group dev 26548a7a9e 移除资源文件 2019-02-17 20:54:33 +08:00
sunxin 1f0930879b 默认模板 2019-02-16 17:05:18 +08:00
ms group dev 04f70236f5 结构更新 2019-02-16 15:14:08 +08:00
ms-dev 149973c60f 结构更新 2019-02-16 15:03:50 +08:00
ms-dev 113064352c 结构更新 2019-02-16 12:00:07 +08:00
sunxin 178009f409 Merge branch '4.7.0' of https://gitee.com/sunxinone/MCMS.git into 4.7.0 2019-02-16 09:55:42 +08:00
a123456 28f9a32442 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 16:35:56 +08:00
a123456 7593e5c0ee Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 16:14:35 +08:00
a123456 9d21710727 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 15:02:56 +08:00
a123456 d5022ad825 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 11:59:39 +08:00
a123456 777a6c572b Signed-off-by: a123456 <1209165801@qq.com> 2019-02-15 11:28:16 +08:00
a123456 f3dd3ee888 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-14 18:09:21 +08:00
a123456 02d027bf38 Signed-off-by: a123456 <1209165801@qq.com> 2019-02-13 18:12:55 +08:00
yinxr 28f6da5fdc Signed-off-by: yinxr 图文素材curd接口处理中 2019-02-12 18:46:52 +08:00
yinxr 144968ee40 Signed-off-by: yinxr 自定义菜单的 CURD 2019-02-12 17:00:53 +08:00
yinxr e80dcbf285 Signed-off-by: yinxr 调整微信功能列表页接口的位置 2019-02-12 11:45:09 +08:00
yinxr e40eb6b763 Signed-off-by: yinxr 完成样式修改 2019-02-12 11:27:21 +08:00
yinxr fead0090d5 Signed-off-by: yinxr 添加分组交互及界面 2019-02-12 09:12:06 +08:00
yinxr f960462304 Signed-off-by: yinxr 自定义菜单交互、自定义菜单获取数据接口走通 2019-02-11 18:30:27 +08:00
yinxr 61749c5e4d Signed-off-by: yinxr 子文章删除 2019-02-11 15:49:49 +08:00
yinxr 073a59b534 Signed-off-by: yinxr 新增菜单结构布局调整 2019-02-11 15:25:12 +08:00
yinxr 8cb9e90ae7 Signed-off-by: yinxr 插入超链接交互 2019-02-11 14:57:51 +08:00
sunxin 7fbb94f559 修改获取模块编号方法的参数 2019-01-31 14:44:21 +08:00
sunxin 69191f13a7 Merge branch '4.7.0' of https://gitee.com/sunxinone/MCMS.git into 4.7.0 2019-01-31 09:17:40 +08:00
yinxr a40c4fb02e fix bug 展开收缩按钮层级问题 2019-01-30 18:05:55 +08:00
yinxr 24df457a41 Signed-off-by: 修复展开收缩图标层级问题 2019-01-30 18:03:21 +08:00
yinxr 7dc07bcffb Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-30 14:34:12 +08:00
yinxr 64c5c6e077 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-30 14:34:06 +08:00
ms group dev 6d78ce00b3 头像 2019-01-30 14:25:36 +08:00
ms-dev 940b4a586f 默认头像 2019-01-30 14:24:08 +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
yinxr 4d731c6c6e Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-30 11:37:51 +08:00
yinxr 7846fc291a Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/index.ftl
 2019-01-30 11:37:39 +08:00
ms group dev cf4bb3beff 前端注释 2019-01-30 11:35:49 +08:00
ms group dev a09d6e8604 前端注释 2019-01-30 11:35:05 +08:00
yinxr fe65622ebf Signed-off-by: yinxr <2273460044@qq.com> 2019-01-30 11:32:03 +08:00
ms group dev a6006152e5 前端变量优化 2019-01-30 11:30:30 +08:00
ms group dev 6a397303b1 注释范例、代码缩进 2019-01-30 11:27:59 +08:00
yinxr b0d1a2284e issue：处理菜单侧边收缩不了的问题 2019-01-30 11:17:44 +08:00
yinxr 180fdb2f98 Signed-off-by: 修改注释，恢复图标 2019-01-30 11:11:39 +08:00
yinxr 2c6d2db173 Signed-off-by: 找回index.less文件，并修复logo样式问题 2019-01-30 11:00:24 +08:00
yinxr 27867d4e8b Signed-off-by: 找回logo、version.log图片 2019-01-30 10:33:48 +08:00
yinxr 4b70e2e988 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 19:36:19 +08:00
yinxr a4affb0f7d Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 18:29:53 +08:00
yinxr 92f04b41f6 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 18:27:38 +08:00
yinxr 06d94a95da Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/include/head-file.ftl
 2019-01-29 17:36:27 +08:00
yinxr 6e454be2c0 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 17:03:31 +08:00
yinxr 2533ec6fa2 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 16:57:18 +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 33f8f27acf 静态资源修改 2019-01-29 16:32:32 +08:00
ms-dev 0dec546d8d 静态资源 2019-01-29 16:27:55 +08:00
ms-dev 7cf2858ec4 配置 2019-01-29 16:22:40 +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-dev 14b4eefd10 Merge branch '4.7.0' of https://gitee.com/tianbinjie/MCMS into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
 2019-01-29 14:47:19 +08:00
yinxr 42fb675a05 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 14:07:39 +08:00
yinxr 8c9a3c3759 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 09:14:01 +08:00
yinxr c6abaf88a0 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/login.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/keyword/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/menu.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/picture/index.ftl
#	src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
#	src/main/webapp/static/ms-admin/4.7.0/css/login.css
#	src/main/webapp/static/ms-admin/4.7.0/less/app.less
#	src/main/webapp/static/ms-admin/4.7.0/less/login.less
#	src/main/webapp/static/mweixin/article.less
#	src/main/webapp/static/mweixin/css/article.css
#	src/main/webapp/static/mweixin/css/custom-menu.css
#	src/main/webapp/static/mweixin/css/keyword-list.css
#	src/main/webapp/static/mweixin/css/keyword-reply.css
#	src/main/webapp/static/mweixin/css/material-bank-form.css
#	src/main/webapp/static/mweixin/css/material-list.css
#	src/main/webapp/static/mweixin/css/menu.css
#	src/main/webapp/static/mweixin/css/message-reply.css
#	src/main/webapp/static/mweixin/css/new-pic-form.css
#	src/main/webapp/static/mweixin/css/picture-list.css
#	src/main/webapp/static/mweixin/custom-menu.less
#	src/main/webapp/static/mweixin/keyword-list.less
#	src/main/webapp/static/mweixin/keyword-reply.less
#	src/main/webapp/static/mweixin/material-bank-form.less
#	src/main/webapp/static/mweixin/material-list.less
#	src/main/webapp/static/mweixin/menu.less
#	src/main/webapp/static/mweixin/message-reply.less
#	src/main/webapp/static/mweixin/new-pic-form.less
#	src/main/webapp/static/mweixin/picture-list.less

Signed-off-by: yinxr <2273460044@qq.com>
 2019-01-29 08:52:59 +08:00
yinxr c9bf4f7e66 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-29 08:49:10 +08:00
a123456 352235a1cf Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 19:13:23 +08:00
Administrator fa9020e2ab 后台登录 2019-01-28 16:21:44 +08:00
yinxr a16292b8ab Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 14:01:31 +08:00
yinxr b77a2802bf Signed-off-by: yinxr <2273460044@qq.com> 2019-01-28 14:01:04 +08:00
a123456 777ef491b5 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:59:37 +08:00
a123456 2b31eea136 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 13:59:20 +08:00
yinxr 2b6ce731e0 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:20:59 +08:00
yinxr b974e76854 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-28 13:20:47 +08:00
a123456 1dca637151 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 13:08:05 +08:00
a123456 3797ae5dc7 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-28 13:07:27 +08:00
yinxr 314f6c50d1 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-28 11:11:09 +08:00
yinxr d23496fc8c Signed-off-by: yinxr <2273460044@qq.com> 2019-01-28 11:11:02 +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
yinxr b9b3ac1a34 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 20:31:09 +08:00
yinxr fdf54c8b02 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 18:53:08 +08:00
yinxr 84111c4e73 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 18:52:55 +08:00
ms-dev d12ee233e8 配置文件更新 2019-01-26 18:13:27 +08:00
a123456 9b306f83f0 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 17:54:11 +08:00
a123456 9d186905ca Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 17:51:37 +08:00
a123456 afa5c53241 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 17:49:27 +08:00
a123456 50793189cb Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
Signed-off-by: a123456 <1209165801@qq.com>
 2019-01-26 17:18:10 +08:00
a123456 90f85790a2 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 17:15:34 +08:00
yinxr ae05dc1d20 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/static/ms-admin/4.7.0/less/app.less
#	src/main/webapp/static/mweixin/css/article.css

Signed-off-by: yinxr <2273460044@qq.com>
 2019-01-26 17:14:47 +08:00
yinxr 83365fee2a Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 17:11:26 +08:00
yinxr 64e44d5622 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 17:02:44 +08:00
a123456 5318c3b966 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 16:48:42 +08:00
a123456 458af1cf95 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 16:45:57 +08:00
a123456 e9deecdf02 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 16:45:46 +08:00
yinxr 0df5bb3d77 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 15:49:03 +08:00
yinxr db7b097eac Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 15:48:48 +08:00
a123456 826dbe2741 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 15:45:43 +08:00
a123456 657fcd9cb8 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 15:45:28 +08:00
yinxr 80be2e4c3e Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 13:33:27 +08:00
yinxr 18bde351e0 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 13:16:40 +08:00
yinxr 9ddf0f046d Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:50:26 +08:00
yinxr 06dadfd783 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:47:01 +08:00
yinxr d56a40dabe Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 12:45:55 +08:00
a123456 b94ab35ed0 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 12:37:09 +08:00
a123456 7fb6775dba Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 12:15:13 +08:00
a123456 59b486e0d6 Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 
# Conflicts:
#	src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl

Signed-off-by: a123456 <1209165801@qq.com>
 2019-01-26 11:38:24 +08:00
a123456 c3db17b387 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:37:42 +08:00
yinxr 1cdf5f8a7f Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0 2019-01-26 11:37:21 +08:00
yinxr cfdd9bfce8 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-26 11:37:05 +08:00
他是超人他会飞 be689b390e !129 添加4.7.0的升级SQL语句 
Merge pull request !129 from 他是超人他会飞/4.7.0
 2019-01-26 11:34:20 +08:00
a123456 c8c23456e4 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:31:23 +08:00
a123456 baada49d7c Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:28:23 +08:00
a123456 84c6864fa4 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:25:44 +08:00
a123456 cc7cf2ecd0 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:24:24 +08:00
a123456 58931f4fcf Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:23:43 +08:00
a123456 ba12a55e12 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:17:36 +08:00
a123456 9820b10744 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:12:45 +08:00
a123456 5fbcb47d0d Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 11:10:25 +08:00
a123456 a2d57732c8 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 10:48:39 +08:00
a123456 5ae06a867a Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:58:19 +08:00
a123456 ab747ea3d2 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:46:06 +08:00
a123456 3cf902b35a Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:39:43 +08:00
a123456 dc1c2a95c6 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:28:43 +08:00
a123456 8621fc554d Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:18:07 +08:00
a123456 6a14782334 Signed-off-by: a123456 <1209165801@qq.com> 2019-01-26 09:16:38 +08:00
ms-dev f9544b1d28 头文件更新 2019-01-26 09:11:49 +08:00
yinxr 56dbdd1bd1 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 20:34:33 +08:00
yinxr db5d47bafe Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 19:00:13 +08:00
yinxr c66c003a61 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:57:41 +08:00
yinxr 450cf6f58b Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:33:37 +08:00
yinxr 9b74399cc3 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:31:19 +08:00
yinxr 0b051a3174 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 18:26:19 +08:00
yinxr 12cabb5d54 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 17:41:48 +08:00
yinxr 67d7218de4 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 16:35:17 +08:00
yinxr 56b344b495 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 16:28:35 +08:00
yinxr 2ca68f84b5 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 16:25:20 +08:00
yinxr d47f995605 Signed-off-by: yinxr <2273460044@qq.com> 2019-01-25 15:23:45 +08:00
ms-dev 131b230e3b 结构更新 2019-01-25 13:34:59 +08:00
ms-dev 96891a145c 修改页面 2019-01-25 13:06:50 +08:00
ms-dev 4689b4e569 界面更新 2019-01-25 12:45:34 +08:00
sunxin eac66fa025 提交升级SQL语句 2019-01-22 17:39:50 +08:00
sunxin 09c72f30cd 文章修改URL链接 2019-01-22 15:42:44 +08:00
ms group dev 6021113800 配置更新 2019-01-20 12:18:44 +08:00
ms group dev 033c6f152d 方法更新 2019-01-20 11:59:59 +08:00
ms group dev 0df7aabc6d 配置更 2019-01-20 11:59:19 +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 43f7134ddd 配置更新 2019-01-16 16:54:25 +08:00
ms-dev c0972c6c38 配置文件更新 2019-01-16 16:30:00 +08:00
ms-dev 1bb0e45602 配置文件更新 2019-01-16 09:26:24 +08:00
sunxin fdabad7695 添加springboot配置文件 2019-01-15 18:17:38 +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 3dc5625a7a 代码初始化 2019-01-15 16:03:11 +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 1a101f61f5 shiro配置优化 2019-01-04 18:16:37 +08:00
ms-dev f68555e69e shiro配置 2019-01-04 18:08:49 +08:00
ms-dev 49d2a62073 springboot 2019-01-04 17:37:43 +08:00