diff --git a/doc/mcms-5.2.5.sql b/doc/mcms-5.2.6.sql similarity index 95% rename from doc/mcms-5.2.5.sql rename to doc/mcms-5.2.6.sql index fa2ea141..dfe5a832 100644 --- a/doc/mcms-5.2.5.sql +++ b/doc/mcms-5.2.6.sql @@ -32,7 +32,7 @@ CREATE TABLE `app` ( -- Records of app -- ---------------------------- BEGIN; -INSERT INTO `app` VALUES (1, '铭飞MCms(5.2.4)', 'http://localhost:8080\r\n', '[{\"url\":\"/upload/1/appLogo/1609397756549.png\",\"name\":\"1593834123492.png\",\"path\":\"/upload/1/appLogo/1609397756549.png\",\"uid\":1609397756411,\"status\":\"success\"}]', '铭飞MCMS', '版权所有 ©铭飞科技有限公司2012-2019 保留一切权利。', 'default', '铭飞MCMS', '', 0, NULL, '2019-11-17 04:00:00', 'web', '2021-05-28 14:25:46', '57', NULL, '', NULL); +INSERT INTO `app` VALUES (1, '铭飞MCms(5.2.6)', 'http://localhost:8080\r\n', '[{\"url\":\"/upload/1/appLogo/1609397756549.png\",\"name\":\"1593834123492.png\",\"path\":\"/upload/1/appLogo/1609397756549.png\",\"uid\":1609397756411,\"status\":\"success\"}]', '铭飞MCMS', '版权所有 ©铭飞科技有限公司2012-2019 保留一切权利。', 'default', '铭飞MCMS', '', 0, NULL, '2019-11-17 04:00:00', 'web', '2021-05-28 14:25:46', '57', NULL, '', NULL); COMMIT; -- ---------------------------- @@ -130,7 +130,7 @@ INSERT INTO `cms_content` VALUES (1329374638616158210, 1329258628990967809, '

INSERT INTO `cms_content` VALUES (1329374684459900929, 1329258628990967809, '

http://doc.mingsoft.net/plugs-cms/

', 'mcms在线适用手册', NULL, '', 'MCms内容插件提供最基本的菜单、权限、角色、栏目、内容、静态化、等常用功能。', '[{\"url\":\"blob:http://localhost:8080/1a5a3605-d831-4123-8c18-de8197aa7295\",\"name\":\"a.png\",\"path\":\"/upload/1/cms/content/1609835836996.png\",\"uid\":1609835836971,\"status\":\"success\"}]', '', '', '0', '', '2020-11-19 18:43:10', 0, 9, '2021-01-05 02:37:19', '57', '2020-11-19 18:43:18', '57', 0); INSERT INTO `cms_content` VALUES (1329374724146405378, 1329258744783118337, '

国内的开源环境已经相当好，但是国内开发注重是应用，创新有但不多，从榜单可以看出，专门搞技术的还是少数，结合项目实践的站大多数，分享给你们，架构的时候可以参考这些解决方案，传送门：gogeeks.cn

zheng征项目(stars 5.6k)

基于Spring+SpringMVC+Mybatis分布式敏捷开发系统架构，提供整套公共微服务服务模块：集中权限管理（单点登录）、内容管理、支付中心、用户管理（支持第三方登录）、微信平台、存储系统、配置中心、日志分析、任务和通知等，支持服务治理、监控和追踪，努力为中小型企业打造全方位J2EE企业级开发解决方案。

\"\"

地址：https://gitee.com/shuzheng/zheng

JFinal(stars 4.8k)

JFinal 是基于 Java 语言的极速 WEB + ORM 框架，其核心设计目标是开发迅速、代码量少、学习简单、功能强大、轻量级、易扩展、Restful。在拥有Java语言所有优势的同时再拥有ruby、python、php等动态语言的开发效率！为您节约更多时间，去陪恋人、家人和朋友 :)

\"\"

地址：http://www.jfinal.com/

SpringBoot-Learning(stars 4.6k)

Spring Boot教程与Spring Cloud教程

地址：https://gitee.com/didispace/SpringBoot-Learning

iBase4J(stars 4.1k)

AVA分布式快速开发平台：SpringBoot，SpringMVC，Mybatis，mybatis-plus，motan/dubbo分布式，Redis缓存，Shiro权限管理，Spring-Session单点登录，Quartz分布式集群调度，Restful服务，QQ/微信登录，App token登录，微信/支付宝支付；日期转换、数据类型转换、序列化、汉字转拼音、身份证号码验证、数字转人民币、发送短信、发送邮件、加密解密、图片处理、excel导入导出、FTP/SFTP/fastDFS上传下载、二维码、XML读写、高精度计算、系统配置工具类等等。

\"\"

地址：https://gitee.com/iBase4J/iBase4J

JeeSite(stars 3.1k)

JeeSite 是一个企业信息化开发基础平台，Java EE（J2EE）快速开发框架，使用经典技术组合（Spring、Spring MVC、Apache Shiro、MyBatis、Bootstrap UI），包括核心模块如：组织机构、角色用户、权限授权、数据权限、内容管理、工作流等。

地址：https://gitee.com/thinkgem/jeesite

jeewx(stars 2.6k)

Jeewx是一款开源、免费的微信管家系统（多触点管理平台）。采用JAVA语言，支持微信公众号、微信企业号、支付宝服务窗、QQ公众号、微博账号等多触点管理。Jeewx实现了微信、支付窗、微信企业号、微博等触点的基础管理功能，便于用户二次开发。2014年荣获CSDN开发商大会第一名

\"\"

地址：https://gitee.com/jeecg/jeewx

MCMS建站系统（stars 2.5k）

完整开源！Java快速开发平台！基于Spring、SpringMVC、Mybatis架构，MStore提供更多好用的插件与模板（文章、商城、微信、论坛、会员、评论、支付、积分、工作流、任务调度等，同时提供上百套免费模板任意选择），价值源自分享！铭飞系统不仅一套简单好用的开源系统、更是一整套优质的开源生态内容体系。铭飞的使命就是降低开发成本提高开发效率，提供全方位的企业级开发解决方案，每月28定期更新版本

\"\"

地址：https://gitee.com/mingSoft/MCMS

t-io(stars 2.3k)

t-io是基于jdk aio实现的易学易用、稳定耐操、性能强悍、将多线程运用到极致、内置功能丰富、核心代码只有3000多行(2017年05月13号统计)的即时通讯框架(广义上的即时通讯，并非指im)，字母 t 寓意talent。

\"\"

地址：https://gitee.com/tywo45/t-io

CMS(stars 2.1k)

一款使用Java语言开发的CMS，使用了Spring MVC,Spring,MyBatis等流行框架，提供首页大图管理、目录管理、文章管理和管理员管理等功能。是学习和二次开发的首选

\"\"

地址：https://gitee.com/shishuo/CMS

hutool(stars 2k)

一个Java基础工具类，对文件、流、加密解密、转码、正则、线程、XML等JDK方法进行封装，组成各种Util工具类，同时提供以下组件： 1. 布隆过滤 2. 缓存 3. 数据库ORM（基于ActiveRecord思想）4. HTTP客户端 5. IO 6. JSON 7. 日志 8. System（JVM和系统信息等） 9. Setting（一种扩展Properties的配置文件）

\"\"


', '国内最火的10款Java开源项目，都是国人开发，CMS居多', NULL, '', '价值源自分享！铭飞系统不仅一套简单好用的开源系统、更是一整套优质的开源生态内容体系。铭飞的使命就是降低开发成本提高开发效率，提供全方位的企业级开发解决方案，每月28定期更新版本', '[{\"url\":\"/upload/1/cms/content/1609835640813.jpeg\",\"name\":\"a.jpeg\",\"path\":\"/upload/1/cms/content/1609835640813.jpeg\",\"uid\":1609835640738,\"status\":\"success\"}]', '', '', '0', '', '2020-11-19 18:43:23', 0, 21, '2021-01-07 00:27:24', '57', '2020-11-19 18:43:27', '57', 0); INSERT INTO `cms_content` VALUES (1329374855797219329, 1329259260493766658, '

关于我们

团队成立于2012年，是一群不断的以技术创新与软件研发为核心的学习型技术团队。团队在软件研发的技术领域，不断地积累通用、实用、好用的通用功能插件，实现系统模块化集成开发解决方案。方案适用于传统互联网、移动互联网、物联网，不仅大大降低软件产品在研发投入的成本，更能加快软件的研发进程！

使命

降低软件研发成本


\"\"

只要你是Java开发人员，或是前端开发人员、设计人员，都可以使用我们平台提供的服务，开发人员可以使用我们的平台快速生成业务代码，设计人员可以在线分享设计作品获取收益

\"\"

我们能帮助企业快速的进行业务系统开发，不管是从代码质量、效率都会有极大都提升。平台提供的业务都具备协同操作都特性，也能很好的提高与规范企业内部开发协同，帮助企业提高生产离

\"\"

我们给政府事业单位提供优质的技术支持服务，提供更安全、更稳定的核心业务系统架构。通用的组件化开发的模式能满足政府内部日常化管理需求，同时大大降低政府采购的成本




价值观


价值源自分享

愿景

享自由、享生活


', '公司介绍', NULL, '关键字', '团队成立于2012年，是一群不断的以技术创新与软件研发为核心的学习型技术团队。团队在软件研发的技术领域，不断地积累通用、实用、好用的通用功能插件，实现系统模块化集成开发解决方案。方案适用于传统互联网、移动互联网、物联网，不仅大大降低软件产品在研发投入的成本，更能加快软件的研发进程！', '[{\"url\":\"blob:http://localhost:8080/a409cd5f-ba90-4fba-b8e3-dc0fff0fde0d\",\"name\":\"a.png\",\"path\":\"/upload/1/cms/content/1609838258663.png\",\"uid\":1609838258513,\"status\":\"success\"}]', '', '', '0', '', '2020-11-19 18:43:44', 0, NULL, '2021-01-05 03:17:40', '57', '2020-11-19 18:43:59', '57', 0); -INSERT INTO `cms_content` VALUES (1329374891826290690, 1329257594591715329, '

TEL：19970180163


客服QQ：942770163      商务QQ：3336073455


Email：service@mingsoft.net


Addr：江西省南昌市南昌高新技术产业开发区紫阳大道2999号紫阳明珠一期办公室楼503室


', '联系我们', NULL, '', '', '[]', '', '', '0', '', '2020-11-19 18:44:00', 0, NULL, '2021-01-06 18:52:19', '57', '2020-11-19 18:44:07', '57', 0); +INSERT INTO `cms_content` VALUES (1329374891826290690, 1329257594591715329, '

TEL：19970180163


客服QQ：942770163      商务QQ：3336073455


Email：service@mingsoft.net


Addr：江西省南昌市南昌高新技术产业开发区紫阳大道2999号紫阳明珠一期办公室楼503室



', '联系我们', '', '', '', '[]', '', '', '0', '', '2020-11-19 18:44:00', 0, NULL, '2022-02-07 15:06:22', '57', '2020-11-19 18:44:07', '57', 0); INSERT INTO `cms_content` VALUES (1329375005479346177, 1329357285870346241, '', '降低软件研发成本', '', '', '', '[{\"url\":\"/upload/1/cms/content/1609838691084.png\",\"name\":\"a.png\",\"path\":\"/upload/1/cms/content/1609838691084.png\",\"uid\":1609838690980,\"status\":\"success\"}]', 'https://www.mingsoft.net', '', '0', 'f', '2020-11-19 18:44:22', 0, NULL, '2021-05-28 14:30:28', '57', '2020-11-19 18:44:35', '57', 0); INSERT INTO `cms_content` VALUES (1345970571501940737, 1329257757913718785, '

包含会员注册、登录、取回密码、个人中心等基本功能

安装方法

Steup 1：pom.xml增加依赖，并重启系统

当前版本

\"\"

<!--会员插件-->\n<dependency>\n  <groupId>net.mingsoft</groupId>\n  <artifactId>ms-mpeople</artifactId>\n  <version>当前版本</version>\n</dependency>

Steup 2：重新进入mstore、进入插件详情页点击 在线安装  完成后，刷新后台主界面，会显示相应插件功能菜单，到此插件安装完成；

在线文档

后台使用：http://doc.mingsoft.net/plugs-people/chapter1.html

开放接口：http://doc.mingsoft.net/plugs-people/jie-kou.html

常见问题：http://doc.mingsoft.net/plugs-people/chang-jian-wen-ti.html

更新说明：http://doc.mingsoft.net/plugs-people/ban-ben-geng-xin-shuo-ming.html


', '会员模块', NULL, '免费', '会员注册、会员登录、基本资料、取回密码、修改密码等基本功能', '[{\"url\":\"blob:http://192.168.2.105:8080/082adb39-0491-49ca-a653-b922dea92e54\",\"name\":\"1531101317481.png\",\"path\":\"/upload/1/cms/content/1609739360761.png\",\"uid\":1609739362946,\"status\":\"success\"}]', '', '', '0', '', '2021-01-03 23:48:19', 0, NULL, '2021-05-28 14:30:28', '0', '2021-01-03 23:49:25', '57', 0); INSERT INTO `cms_content` VALUES (1345971247867015169, 1329257757913718785, '

支持对信息的评论，后台查看用户评论的信息，支持对用户评论的筛选。

安装方法

Steup 1：pom.xml增加依赖，并重启系统


\"\"

<!--评论插件依赖-->\n<dependency>\n  <groupId>net.mingsoft</groupId>\n  <artifactId>ms-mcomment</artifactId>\n</dependency>

Steup 2：重新进入mstore、进入插件详情页点击 在线安装  完成后，刷新后台主界面，会显示相应插件功能菜单，到此插件安装完成；

在线文档

后台使用：http://doc.mingsoft.net/plugs-comment/chapter1/ping-lun-guan-li.html

开放接口：http://doc.mingsoft.net/plugs-comment/jie-kou/peopleceng-jie-kou.html

常见问题：http://doc.mingsoft.net/plugs-comment/chang-jian-wen-ti.html

更新说明：http://doc.mingsoft.net/plugs-comment/ban-ben-geng-xin-shuo-ming.html



', '评论插件', NULL, '免费', '好信息必须评～', '[{\"url\":\"blob:http://192.168.2.105:8080/9c3a2ce3-fec3-4f4a-b7ab-e5ba16485ffc\",\"name\":\"1531101378470.png\",\"path\":\"/upload/1/cms/content/1609739792665.png\",\"uid\":1609739794931,\"status\":\"success\"}]', '', '', '0', '', '2021-01-03 23:51:37', 0, NULL, '2021-01-03 23:56:33', '57', '2021-01-03 23:52:07', '57', 0); @@ -197,12 +197,25 @@ CREATE TABLE `logger` ( `create_by` varchar(11) DEFAULT NULL COMMENT '创建人', `del` int(1) DEFAULT '0' COMMENT '删除标记', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='系统日志'; +) ENGINE=InnoDB AUTO_INCREMENT=36 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='系统日志'; -- ---------------------------- -- Records of logger -- ---------------------------- BEGIN; +INSERT INTO `logger` VALUES (23, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{\n \"url\":[\"index.htm\"],\n \"position\":[\"index\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate//generateIndex.do', 'POST', 'net.mingsoft.cms.action.GeneraterAction.generateIndex()', '192.168.0.50', '生成主页', NULL, NULL, '2022-02-07 15:04:02', NULL, 0); +INSERT INTO `logger` VALUES (24, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate/0/genernateColumn.do', 'GET', 'net.mingsoft.cms.action.GeneraterAction.genernateColumn()', '192.168.0.50', '生成栏目', NULL, NULL, '2022-02-07 15:04:08', NULL, 0); +INSERT INTO `logger` VALUES (25, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{\n \"dateTime\":[\"2017-02-07\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate/0/generateArticle.do', 'POST', 'net.mingsoft.cms.action.GeneraterAction.generateArticle()', '192.168.0.50', '生成文章', NULL, NULL, '2022-02-07 15:04:13', NULL, 0); +INSERT INTO `logger` VALUES (26, NULL, '{\n \"result\":true,\n \"code\":200,\n \"data\":{\n \"id\":\"1329374891826290690\"\n }\n}', '{\n \"createBy\":[\"57\"],\n \"createDate\":[\"2020-11-19 18:44:07\"],\n \"del\":[\"0\"],\n \"id\":[\"1329374891826290690\"],\n \"remarks\":[\"\"],\n \"updateBy\":[\"57\"],\n \"updateDate\":[\"2021-01-06 18:52:19\"],\n \"order\":[\"\"],\n \"contentTitle\":[\"联系我们\"],\n \"categoryId\":[\"1329257594591715329\"],\n \"contentType\":[\"\"],\n \"contentDisplay\":[\"0\"],\n \"contentAuthor\":[\"\"],\n \"contentSource\":[\"\"],\n \"contentDatetime\":[\"2020-11-19 18:44:00\"],\n \"contentSort\":[\"0\"],\n \"contentImg\":[\"[]\"],\n \"contentDescription\":[\"\"],\n \"contentKeyword\":[\"\"],\n \"contentDetails\":[\"

TEL：19970180163


客服QQ：942770163      商务QQ：3336073455


Email：service@mingsoft.net


Addr：江西省南昌市南昌高新技术产业开发区紫阳大道2999号紫阳明珠一期办公室楼503室

\"],\n \"contentUrl\":[\"\"],\n \"contentHit\":[\"\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/content/update.do', 'POST', 'net.mingsoft.cms.action.ContentAction.update()', '192.168.0.50', '更新文章', NULL, NULL, '2022-02-07 15:05:13', NULL, 0); +INSERT INTO `logger` VALUES (27, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{\n \"url\":[\"index.htm\"],\n \"position\":[\"index\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate//generateIndex.do', 'POST', 'net.mingsoft.cms.action.GeneraterAction.generateIndex()', '192.168.0.50', '生成主页', NULL, NULL, '2022-02-07 15:05:20', NULL, 0); +INSERT INTO `logger` VALUES (28, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate/0/genernateColumn.do', 'GET', 'net.mingsoft.cms.action.GeneraterAction.genernateColumn()', '192.168.0.50', '生成栏目', NULL, NULL, '2022-02-07 15:05:23', NULL, 0); +INSERT INTO `logger` VALUES (29, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{\n \"dateTime\":[\"2017-02-07\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate/0/generateArticle.do', 'POST', 'net.mingsoft.cms.action.GeneraterAction.generateArticle()', '192.168.0.50', '生成文章', NULL, NULL, '2022-02-07 15:05:28', NULL, 0); +INSERT INTO `logger` VALUES (30, NULL, '{\n \"result\":true,\n \"code\":200,\n \"data\":{\n \"id\":\"1329374891826290690\"\n }\n}', '{\n \"createBy\":[\"57\"],\n \"createDate\":[\"2020-11-19 18:44:07\"],\n \"del\":[\"0\"],\n \"id\":[\"1329374891826290690\"],\n \"remarks\":[\"\"],\n \"updateBy\":[\"57\"],\n \"updateDate\":[\"2022-02-07 15:05:13\"],\n \"order\":[\"\"],\n \"contentTitle\":[\"联系我们\"],\n \"categoryId\":[\"1329257594591715329\"],\n \"contentType\":[\"\"],\n \"contentDisplay\":[\"0\"],\n \"contentAuthor\":[\"\"],\n \"contentSource\":[\"\"],\n \"contentDatetime\":[\"2020-11-19 18:44:00\"],\n \"contentSort\":[\"0\"],\n \"contentImg\":[\"[]\"],\n \"contentDescription\":[\"\"],\n \"contentKeyword\":[\"\"],\n \"contentDetails\":[\"

TEL：19970180163


客服QQ：942770163      商务QQ：3336073455


Email：service@mingsoft.net


Addr：江西省南昌市南昌高新技术产业开发区紫阳大道2999号紫阳明珠一期办公室楼503室



\"],\n \"contentUrl\":[\"\"],\n \"contentHit\":[\"\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/content/update.do', 'POST', 'net.mingsoft.cms.action.ContentAction.update()', '192.168.0.50', '更新文章', NULL, NULL, '2022-02-07 15:06:22', NULL, 0); +INSERT INTO `logger` VALUES (31, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{\n \"dateTime\":[\"2017-02-07\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate/0/generateArticle.do', 'POST', 'net.mingsoft.cms.action.GeneraterAction.generateArticle()', '192.168.0.50', '生成文章', NULL, NULL, '2022-02-07 15:06:40', NULL, 0); +INSERT INTO `logger` VALUES (32, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{\n \"url\":[\"index.htm\"],\n \"position\":[\"index\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate//generateIndex.do', 'POST', 'net.mingsoft.cms.action.GeneraterAction.generateIndex()', '192.168.0.50', '生成主页', NULL, NULL, '2022-02-07 15:06:48', NULL, 0); +INSERT INTO `logger` VALUES (33, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate/0/genernateColumn.do', 'GET', 'net.mingsoft.cms.action.GeneraterAction.genernateColumn()', '192.168.0.50', '生成栏目', NULL, NULL, '2022-02-07 15:06:52', NULL, 0); +INSERT INTO `logger` VALUES (34, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{\n \"fileUrl\":[\"/template/1/1644217656483.zip\"]\n}', '内网IP', 'msopen', 'manage', 'other', 'success', '/ms/template/unZip.do', 'GET', 'net.mingsoft.basic.action.TemplateAction.unZip()', '192.168.0.50', '解压zip模版文件', NULL, NULL, '2022-02-07 15:07:37', NULL, 0); +INSERT INTO `logger` VALUES (35, NULL, '{\n \"result\":true,\n \"code\":200\n}', '{\n \"fileName\":[\"xydz\"]\n}', '内网IP', 'msopen', 'manage', 'delete', 'success', '/ms/template/delete.do', 'POST', 'net.mingsoft.basic.action.TemplateAction.delete()', '192.168.0.50', '删除模版', NULL, NULL, '2022-02-07 15:07:41', NULL, 0); COMMIT; -- ---------------------------- @@ -211,7 +224,7 @@ COMMIT; DROP TABLE IF EXISTS `manager`; CREATE TABLE `manager` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id主键', - `role_id` int(11) DEFAULT NULL COMMENT '角色编号', + `ROLE_IDS` varchar(11) DEFAULT NULL COMMENT '角色编号', `people_id` int(11) DEFAULT '0' COMMENT '用户编号即商家编号', `manager_admin` varchar(255) DEFAULT NULL COMMENT '管理员标识，超级管理员：super，子管理员：open', `manager_name` varchar(15) DEFAULT NULL COMMENT '管理员用户名', @@ -222,16 +235,16 @@ CREATE TABLE `manager` ( `CREATE_BY` varchar(11) DEFAULT NULL COMMENT '创建人', `CREATE_DATE` datetime DEFAULT NULL COMMENT '创建时间', `DEL` int(1) DEFAULT '0' COMMENT '删除标记', + `MANAGER_LOCK` varchar(10) DEFAULT '0' COMMENT '锁定状态', PRIMARY KEY (`id`) USING BTREE, - KEY `fk_manager_role_id` (`role_id`) USING BTREE, - CONSTRAINT `fk_role_id` FOREIGN KEY (`role_id`) REFERENCES `role` (`id`) ON DELETE SET NULL ON UPDATE NO ACTION + KEY `fk_manager_role_id` (`ROLE_IDS`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=58 DEFAULT CHARSET=utf8 COMMENT='管理员表'; -- ---------------------------- -- Records of manager -- ---------------------------- BEGIN; -INSERT INTO `manager` VALUES (57, 48, 0, 'super', 'msopen', 'msopen', '9d8622060de5f24937b60585c3f4d66b', NULL, NULL, NULL, NULL, 0); +INSERT INTO `manager` VALUES (57, '48', 0, 'super', 'msopen', 'msopen', '9d8622060de5f24937b60585c3f4d66b', NULL, NULL, NULL, NULL, 0, '0'); COMMIT; -- ---------------------------- @@ -247,6 +260,7 @@ CREATE TABLE `mdiy_config` ( `create_date` datetime DEFAULT NULL COMMENT '创建时间', `create_by` int(11) DEFAULT NULL COMMENT '创建人', `del` int(1) DEFAULT '0' COMMENT '删除标记', + `NOT_DEL` int(1) DEFAULT '0' COMMENT '1为不能删除，主要用于系统默认数据,0为一般数据，主要是前端控制', PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `idx_config_name` (`config_name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='自定义配置'; @@ -276,6 +290,7 @@ CREATE TABLE `mdiy_dict` ( `CREATE_BY` varchar(11) COLLATE utf8_bin DEFAULT NULL COMMENT '创建人', `CREATE_DATE` datetime DEFAULT NULL COMMENT '创建时间', `DEL` int(1) DEFAULT '0' COMMENT '删除标记', + `NOT_DEL` int(1) DEFAULT '0' COMMENT '1为不能删除，主要用于系统默认数据,0为一般数据，主要是前端控制', PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `inx_unique` (`dict_value`,`dict_label`,`dict_type`), KEY `inx_dict_value` (`dict_value`) USING BTREE, @@ -286,14 +301,14 @@ CREATE TABLE `mdiy_dict` ( -- Records of mdiy_dict -- ---------------------------- BEGIN; -INSERT INTO `mdiy_dict` VALUES (1, 'f', '幻灯', '文章属性', NULL, NULL, '1', NULL, 3, NULL, NULL, NULL, NULL, 3); -INSERT INTO `mdiy_dict` VALUES (2, 'p', '图片', '文章属性', NULL, NULL, '1', NULL, 1, NULL, NULL, NULL, NULL, 3); -INSERT INTO `mdiy_dict` VALUES (3, 'c', '推荐', '文章属性', NULL, NULL, '1', NULL, 4, '57', '2021-03-26 08:39:05', NULL, NULL, 3); -INSERT INTO `mdiy_dict` VALUES (4, 'h', '头条', '文章属性', NULL, NULL, '1', NULL, 2, NULL, NULL, NULL, NULL, 3); -INSERT INTO `mdiy_dict` VALUES (621, 'cms', '文章', '自定义模型类型', NULL, '0', '1', NULL, 0, NULL, NULL, NULL, NULL, 3); -INSERT INTO `mdiy_dict` VALUES (642, 'cms', '文章', '自定义页面类型', NULL, NULL, '1', NULL, 0, NULL, NULL, NULL, NULL, 3); -INSERT INTO `mdiy_dict` VALUES (643, 'c', '推荐', '栏目属性', NULL, NULL, '1', NULL, 0, NULL, NULL, NULL, NULL, 3); -INSERT INTO `mdiy_dict` VALUES (644, 'nav', '导航', '栏目属性', NULL, NULL, '1', NULL, 0, NULL, NULL, NULL, NULL, 3); +INSERT INTO `mdiy_dict` VALUES (1, 'f', '幻灯', '文章属性', NULL, NULL, '1', NULL, 3, NULL, NULL, NULL, NULL, 3, 1); +INSERT INTO `mdiy_dict` VALUES (2, 'p', '图片', '文章属性', NULL, NULL, '1', NULL, 1, NULL, NULL, NULL, NULL, 3, 1); +INSERT INTO `mdiy_dict` VALUES (3, 'c', '推荐', '文章属性', NULL, NULL, '1', NULL, 4, '57', '2021-03-26 08:39:05', NULL, NULL, 3, 1); +INSERT INTO `mdiy_dict` VALUES (4, 'h', '头条', '文章属性', NULL, NULL, '1', NULL, 2, NULL, NULL, NULL, NULL, 3, 1); +INSERT INTO `mdiy_dict` VALUES (621, 'cms', '文章', '自定义模型类型', NULL, '0', '1', NULL, 0, NULL, NULL, NULL, NULL, 3, 1); +INSERT INTO `mdiy_dict` VALUES (642, 'cms', '文章', '自定义页面类型', NULL, NULL, '1', NULL, 0, NULL, NULL, NULL, NULL, 3, 1); +INSERT INTO `mdiy_dict` VALUES (643, 'c', '推荐', '栏目属性', NULL, NULL, '1', NULL, 0, NULL, NULL, NULL, NULL, 3, 1); +INSERT INTO `mdiy_dict` VALUES (644, 'nav', '导航', '栏目属性', NULL, NULL, '1', NULL, 0, NULL, NULL, NULL, NULL, 3, 1); COMMIT; -- ---------------------------- @@ -337,6 +352,7 @@ CREATE TABLE `mdiy_model` ( `create_date` datetime DEFAULT NULL COMMENT '创建时间', `create_by` varchar(11) DEFAULT NULL COMMENT '创建人', `del` int(1) DEFAULT '0' COMMENT '删除标记', + `NOT_DEL` int(1) DEFAULT '0' COMMENT '1为不能删除，主要用于系统默认数据,0为一般数据，主要是前端控制', PRIMARY KEY (`id`) USING BTREE, UNIQUE KEY `indx_model_name` (`model_name`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自定义模型'; @@ -389,6 +405,7 @@ CREATE TABLE `mdiy_tag` ( `CREATE_BY` varchar(11) DEFAULT NULL COMMENT '创建人', `CREATE_DATE` datetime DEFAULT NULL COMMENT '创建时间', `DEL` int(1) DEFAULT '0' COMMENT '删除标记', + `NOT_DEL` int(1) DEFAULT '0' COMMENT '1为不能删除，主要用于系统默认数据,0为一般数据，主要是前端控制', PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COMMENT='标签'; @@ -396,13 +413,13 @@ CREATE TABLE `mdiy_tag` ( -- Records of mdiy_tag -- ---------------------------- BEGIN; -INSERT INTO `mdiy_tag` VALUES (3, 'arclist', 'list', ' <#assign _typeid=\'\'/>\n<#assign _typetitle=\'\'/>\n<#assign _size=\'20\'/>\n\n<#if column?? && column.id?? && column.id?number gt 0>\n <#assign _typeid=\'${column.id}\'>\n\n\n<#if typeid??>\n <#assign _typeid=\'${typeid}\'>\n\n\n<#if typetitle??>\n <#assign _typetitle=\'${typetitle}\'>\n\n\n<#if size??>\n <#assign _size=\'${size}\'>\n\n\n<#if orderby?? >\n <#if orderby==\'date\'>\n <#assign _orderby=\'content_datetime\'>\n <#elseif orderby==\'updatedate\'>\n <#assign _orderby=\'content_updatetime\'>\n <#elseif orderby==\'hit\'>\n <#assign _orderby=\'content_hit\'>\n <#elseif orderby==\'sort\'>\n <#assign _orderby=\'content_sort\'>\n <#else>\n <#assign _orderby=\'cms_content.id\'>\n \n<#else>\n <#assign _orderby=\'cms_content.id\'>\n\n\nSELECT\n cms_content.id AS id,\n content_title AS title,\n content_title AS fulltitle,\n content_author AS author,\n content_source AS source,\n content_details AS content,\n category.category_title AS typetitle,\n category.id AS typeid,\ncategory.category_path AS typepath,\n category.category_img AS typelitpic,\n category.category_keyword as typekeyword,\n category.top_id as topId,\n category.category_parent_ids as parentids,\n category.category_type AS \"type\",\n\n <#--列表页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/list.do?typeid=\', category.category_id) as typelink,\n <#else>\n (SELECT \'index.html\') AS typelink,\n \n content_description AS descrip,\n content_hit AS hit,\n content_type AS flag,\n cms_content.content_keyword AS keyword,\n content_img AS litpic,\n \n <#--内容页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/view.do?id=\', cms_content.id,\'&orderby=${_orderby}\',\'&order=${order!\'ASC\'}\',\'&typeid=${typeid}\') as \"link\",\n <#else>\n CONCAT(category.category_path,\'/\',if(category_type=2,\"index\",cms_content.id),\'.html\') AS \"link\",\n \n\n <#if tableName??>${tableName}.*,\n content_datetime AS \"date\"\nFROM\n cms_content LEFT JOIN cms_category as category\n ON cms_content.category_id = category.id\n\n <#--判断是否有自定义模型表-->\n <#if tableName??>\n LEFT JOIN ${tableName} ON ${tableName}.link_id=cms_content.id\n \n WHERE \n content_display=0\n and cms_content.del=0\n <#--根据站点编号查询-->\n <#if appId?? >\n and cms_content.app_id=${appId}\n and cms_content.id>0\n \n <#--判断是否有搜索分类集合-->\n <#if search?? && _typeid==\"\">\n <#if search.categoryIds?has_content>and FIND_IN_SET(category.id,\'${search.categoryIds}\')\n <#--标题-->\n <#if search.content_title??> and content_title like CONCAT(\'%\',\'${search.content_title}\',\'%\')\n <#--作者-->\n <#if search.content_author??> and content_author like CONCAT(\'%\',\'${search.content_author}\',\'%\')\n <#--来源-->\n <#if search.content_source??> and content_source like CONCAT(\'%\',\'${search.content_source}\',\'%\')\n <#--属性-->\n <#if search.content_type??> and (\n <#list search.content_type?split(\',\') as item>\n <#if item?index gt 0> or\n FIND_IN_SET(\'${item}\',cms_content.content_type)\n )\n \n\n <#--描述-->\n <#if search.content_description??>\n and content_description like CONCAT(\'%\',\'${search.content_description}\',\'%\')\n \n\n <#--关键字-->\n <#if search.content_keyword??> and content_keyword like CONCAT(\'%\',\'${search.content_keyword}\',\'%\')\n\n <#--内容-->\n <#if search.content_details??> and content_details like CONCAT(\'%\',\'${search.content_details}\',\'%\')\n\n <#--自定义顺序-->\n <#if search.content_sort??> and content_sort=${search.content_sort}\n <#--时间范围-->\n <#if search.content_datetime_start??&&search.content_datetime_end??>\n and content_datetime between \'${search.content_datetime_start}\' and \'${search.content_datetime_end}\'\n \n <#else>\n <#--查询栏目-->\n <#if _typeid?has_content> \n and (cms_content.category_id=${_typeid} or cms_content.category_id in (select id FROM cms_category where cms_category.del=0 \n <#if _typetitle?has_content>\n and cms_category.category_title=\'${_typetitle}\' and FIND_IN_SET(${_typeid},CATEGORY_PARENT_IDS))) \n \n \n <#--标题-->\n <#if content_title??> and content_title like CONCAT(\'%\',\'${content_title}\',\'%\')\n <#--作者-->\n <#if content_author??> and content_author like CONCAT(\'%\',\'${content_author}\',\'%\')\n <#--来源-->\n <#if content_source??> and content_source like CONCAT(\'%\',\'${content_source}\',\'%\')\n <#--属性-->\n <#if content_type??> and content_type like CONCAT(\'%\',\'${content_type}\',\'%\')\n <#--描述-->\n <#if content_description??> and content_description like CONCAT(\'%\',\'${content_description}\',\'%\')\n <#--关键字-->\n <#if content_keyword??> and content_keyword like CONCAT(\'%\',\'${content_keyword}\',\'%\')\n <#--内容-->\n <#if content_details??> and content_details like CONCAT(\'%\',\'${content_details}\',\'%\')\n <#--自定义顺序-->\n <#if content_sort??> and content_sort=${content_sort}\n <#--自定义模型-->\n <#if diyModel??>\n <#list diyModel as dm>\n and ${tableName}.${dm.key} like CONCAT(\'%\',\'${dm.value}\',\'%\') \n \n \n <#--文章属性-->\n <#if flag?? >\n and(\n <#list flag?split(\',\') as item>\n <#if item?index gt 0> or\n FIND_IN_SET(\'${item}\',cms_content.content_type)\n )\n \n <#if noflag??>\n and(\n <#list noflag?split(\',\') as item>\n <#if item?index gt 0> and\n FIND_IN_SET(\'${item}\',cms_content.content_type)=0\n or cms_content.content_type is null)\n \n\n <#--字段排序-->\n <#if orderby?? >\n ORDER BY\n <#if orderby==\'date\'> content_datetime\n <#elseif orderby==\'updatedate\'> content_updatetime\n <#elseif orderby==\'hit\'> content_hit\n <#elseif orderby==\'sort\'> content_sort\n <#else>\n cms_content.id\n \n <#else>\n ORDER BY cms_content.id\n \n\n <#if order?? >\n <#if order==\'desc\'> desc\n <#if order==\'asc\'> asc\n <#else>\n desc\n \n LIMIT \n <#--判断是否分页-->\n <#if ispaging?? && (pageTag.pageNo)??>\n ${((pageTag.pageNo-1)*_size?eval)?c},${_size?default(20)}\n <#else>\n ${_size?default(20)}\n ', NULL, '文章列表', NULL, NULL, NULL, NULL, 0); -INSERT INTO `mdiy_tag` VALUES (4, 'channel', 'list', '<#assign _typeid=\'0\'/>\n<#if column?? && column.id?? && column.id?number gt 0>\n <#assign _typeid=\'${column.id}\'>\n <#assign selfid=\'${column.id}\'>\n\n\n<#if typeid??>\n <#assign _typeid=\'${typeid}\'>\n\n\nselect\n id,\n id as typeid,\n category_title as typetitle,\n <#--动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/list.do?typeid=\', id) as typelink,\n <#else>\n <#--栏目类型为链接-->\n CONCAT(category_path,\'/index.html\') as typelink,\n \n category_keyword as typekeyword,\n category_diy_url as typeurl,\n category_flag as flag,\n category_parent_ids as parentids,\n category_descrip as typedescrip,\n category_type as type,\n category_path as typepath,\n leaf as typeleaf,\n category_img as typelitpic ,\n ( SELECT count(*) FROM cms_category cc WHERE cc.category_id = cms_category.id AND cc.del = 0 ) AS childsize \n from cms_category\n where\n cms_category.del=0\n <#--根据站点编号查询-->\n <#if appId?? >\n and cms_category.app_id=${appId}\n \n\n <#--栏目属性-->\n <#if flag?? >\n and\n (<#list flag?split(\',\') as item>\n <#if item?index gt 0> or\n FIND_IN_SET(\'${item}\',category_flag)\n )\n \n\n <#if noflag?? >\n and\n (<#list noflag?split(\',\') as item>\n <#if item?index gt 0> and\n FIND_IN_SET(\'${item}\',category_flag)=0\n or category_flag is null)\n \n\n <#--type默认son-->\n <#if !type??||!type?has_content>\n <#assign type=\'son\'/>\n \n\n <#if type?has_content>\n <#--顶级栏目（单个）-->\n <#if type==\'top\'>\n <#if _typeid != \'0\'>\n and (id = top_id or top_id = 0)\n \n\n <#elseif type==\'nav\'>\n and(category_id=0 or category_id is null)\n\n <#--同级栏目（多个）-->\n <#elseif type==\'level\'>\n and\n <#if _typeid != \'0\'>\n category_id=(select category_id from cms_category where id=${_typeid})\n <#else>\n 1=1\n \n\n <#--当前栏目（单个）-->\n <#elseif type==\'self\'>\n and\n <#if _typeid != \'0\'>\n id=${_typeid}\n <#else>\n 1=1\n \n\n <#--当前栏目的所属栏目（多个）-->\n <#elseif type==\'path\'>\n and\n <#if _typeid != \'0\'>\n id in (<#if column?? && column.categoryParentIds??>${column.categoryParentIds},${_typeid})\n <#else>\n 1=1\n \n <#--子栏目（多个）-->\n\n <#elseif type==\'son\'>\n and\n <#if _typeid != \'0\'>\n category_id=${_typeid}\n <#else>\n 1=1\n \n\n <#--上一级栏目没有则取当前栏目（单个）-->\n <#elseif type==\'parent\'>\n and\n <#if _typeid != \'0\'>\n <#if column?? && column.categoryId??>\n id=${column.categoryId}\n <#else>\n id=${_typeid}\n \n <#else>\n 1=1\n \n \n\n<#else> <#--默认顶级栏目-->\n and\n <#if _typeid != \'0\'>\n id=${_typeid}\n <#else>\n (category_id=0 or category_id is null)\n \n\n\n\n<#--字段排序-->\n<#if orderby?? >\n ORDER BY\n <#if orderby==\'date\'> category_datetime\n <#elseif orderby==\'sort\'> category_sort\n <#else>id\n\n\n<#if order?? >\n <#if order==\'desc\'> desc\n <#if order==\'asc\'> asc\n', NULL, '通用栏目', NULL, NULL, NULL, NULL, 0); -INSERT INTO `mdiy_tag` VALUES (5, 'global', 'single', 'select\nAPP_NAME as name,\napp_logo as logo,\napp_keyword as keyword,\napp_description as descrip,\napp_copyright as copyright,\n<#--动态解析 -->\n<#if isDo?? && isDo>\nCONCAT(\'${url}\',\'${html}/\',app_dir) as url,\n\'${url}\' as host,\n<#--使用地址栏的域名 -->\n<#elseif url??>\nCONCAT(\'${url}\',\'${html}/\',app_dir) as url,\n\'${url}\' as host,\n<#else>\nCONCAT(REPLACE(REPLACE(TRIM(substring_index(app_url,\'\\n\',1)), CHAR(10),\'\'), CHAR(13),\'\'),\'/html/\',app_dir) as url,\nREPLACE(REPLACE(TRIM(substring_index(app_url,\'\\n\',1)), CHAR(10),\'\'), CHAR(13),\'\') as host,\n\nCONCAT(\'template/\',id,\'/\',app_style) as \"style\" <#-- 判断是否为手机端 -->\nfrom app\n<#--根据站点编号查询-->\n<#if appId?? >\n where id = ${appId}\n', NULL, '全局', NULL, NULL, NULL, NULL, 0); -INSERT INTO `mdiy_tag` VALUES (7, 'field', 'single', 'SELECT\ncms_content.id as id,\ncontent_title as title,\ncontent_author as author, \ncontent_source as source, \ncontent_details as content,\ncms_category.id as typeid,\ncms_category.leaf as typeleaf,\ncms_category.category_title as typetitle,\ncms_category.category_img AS typelitpic,\ncms_category.top_id as topId,\ncms_category.category_flag as typeflag,\ncms_category.category_parent_ids as parentids,\ncms_category.category_keyword as typekeyword,\ncms_category.category_descrip as typedescrip,\ncms_category.category_diy_url as typeurl,\n<#--动态链接-->\n<#if isDo?? && isDo>\nCONCAT(\'/${modelName}/list.do?typeid=\', cms_category.id) as typelink,\n<#else>\n <#--栏目类型为链接-->\n CONCAT(cms_category.category_path,\'/index.html\') as typelink,\n\ncms_content.content_img AS litpic,\n<#--内容页动态链接-->\n<#if isDo?? && isDo>\nCONCAT(\'/mcms/view.do?id=\', cms_content.id) as \"link\",\n<#else>\nCONCAT(cms_category.category_path,\'/\',cms_content.id,\'.html\') AS \"link\",\n\ncontent_datetime as \"date\",\ncontent_description as descrip,\nCONCAT(\'\') as hit,\ncontent_type as flag,\ncategory_title as typetitle,\n<#if tableName??>${tableName}.*,\ncontent_keyword as keyword\nFROM cms_content\nLEFT JOIN cms_category ON\ncms_category.id = cms_content.category_id\n<#--判断是否有自定义模型表-->\n<#if tableName??>left join ${tableName} on ${tableName}.link_id=cms_content.id\nWHERE\n<#--如果是栏目列表页没有文章id所以只取栏目id-->\n<#if column??&&column.id??&&!id??>\ncms_category.id=${column.id} and\n\n cms_content.del=0\n<#if id??> and cms_content.id=${id}', NULL, '文章内容', NULL, NULL, NULL, NULL, 0); -INSERT INTO `mdiy_tag` VALUES (8, 'pre', 'single', '<#assign select=\"(SELECT \'\')\"/>\n<#if orderby?? >\n <#if orderby==\"date\">\n <#assign _orderby=\"content_datetime\">\n <#elseif orderby==\"updatedate\">\n <#assign _orderby=\"content_updatetime\">\n <#elseif orderby==\"hit\">\n <#assign _orderby=\"content_hit\">\n <#elseif orderby==\"sort\">\n <#assign _orderby=\"content_sort\">\n <#else><#assign _orderby=\"cms_content.id\">\n <#else>\n <#assign _orderby=\"cms_content.id\">\n \n<#if pageTag.preId??>\nSELECT\ncms_content.id as id,\ncontent_title as title,\ncontent_author as author, \ncontent_source as source, \ncontent_details as content,\ncategory.category_title as typename,\ncategory.category_id as typeid,\n(SELECT \'index.html\') as typelink,\ncontent_img as litpic,\n<#--内容页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/view.do?id=\', cms_content.id,\'&orderby=${_orderby}\',\'&order=${order!\'ASC\'}\',\'&typeid=${typeid}\') as \"link\",\n <#else>\n CONCAT(category_path,\'/\',cms_content.id,\'.html\') AS \"link\",\n \ncontent_datetime as \"date\",\ncontent_description as descrip,\ncontent_hit as hit,\ncontent_type as flag,\ncontent_keyword as keyword \nFROM cms_content\nLEFT JOIN cms_category as category ON cms_content.category_id=category.id\nWHERE cms_content.id=${pageTag.preId}\n<#else>\nSELECT\n${select} as id,\n${select} as title,\n${select} as fulltitle,\n${select} as author, \n${select} as source, \n${select} as content,\n${select} as typename,\n${select} as typeid,\n${select} as typelink,\n${select} as litpic,\n${select} as \"link\",\n${select} as \"date\",\n${select} as descrip,\n${select} as hit,\n${select} as flag,\n${select} as keyword\n', NULL, '文章上一篇', NULL, NULL, NULL, NULL, 0); -INSERT INTO `mdiy_tag` VALUES (9, 'page', 'single', 'select\n<#if !(pageTag.indexUrl??)>\n <#--判断是否有栏目对象，用于搜索不传栏目-->\n <#if column??>\n <#assign path=column.categoryPath/>\n <#else>\n <#assign path=\"\"/>\n \n <#--总记录数、总页数-->\n (SELECT ${pageTag.total}) as \"total\",\n (SELECT ${pageTag.size}) as \"size\",\n\n <#--记录总数-->\n (SELECT ${pageTag.rcount}) as \"rcount\",\n <#--当前页码-->\n (SELECT ${pageTag.pageNo}) as \"cur\",\n <#--首页-->\n CONCAT(\'${path}\', \'/index.html\') as \"index\",\n <#--上一页-->\n <#if (pageTag.pageNo?eval-1) gt 1>\n CONCAT(\'${path}\',\'/list-${pageTag.pageNo?eval-1}.html\') as \"pre\",\n <#else>\n CONCAT(\'${path}\',\'/index.html\') as \"pre\",\n \n\n <#--下一页-->\n <#if pageTag.total==1>\n CONCAT(\'${path}\', \'/index.html\') as \"next\",\n CONCAT(\'${path}\', \'/index.html\') as \"last\"\n <#else>\n <#if pageTag.pageNo?eval gte pageTag.total>\n CONCAT(\'${path}\',\'/list-${pageTag.total}.html\') as \"next\",\n <#else>\n CONCAT(\'${path}\',\'/list-${pageTag.pageNo?eval+1}.html\') as \"next\",\n \n <#--最后一页-->\n CONCAT(\'${path}\',\'/list-${pageTag.total}.html\') as \"last\"\n \n\n<#else>\n <#--判断是否是搜索页面-->\n \'${pageTag.indexUrl}\' as \"index\",\n \'${pageTag.lastUrl}\' as \"last\",\n \'${pageTag.preUrl}\' as \"pre\",\n \'${pageTag.nextUrl}\' as \"next\",\n (select ${pageTag.total}) as \"total\",\n (select ${pageTag.size}) as \"size\",\n (select ${pageTag.rcount}) as \"rcount\",\n (select ${pageTag.pageNo}) as \"cur\"\n', NULL, '通用分页', NULL, NULL, NULL, NULL, 0); -INSERT INTO `mdiy_tag` VALUES (10, 'next', 'single', '<#assign select=\"(SELECT \'\')\"/>\n<#if orderby?? >\n <#if orderby==\"date\">\n <#assign _orderby=\"content_datetime\">\n <#elseif orderby==\"updatedate\">\n <#assign _orderby=\"content_updatetime\">\n <#elseif orderby==\"hit\">\n <#assign _orderby=\"content_hit\">\n <#elseif orderby==\"sort\">\n <#assign _orderby=\"content_sort\">\n <#else><#assign _orderby=\"cms_content.id\">\n <#else>\n <#assign _orderby=\"cms_content.id\">\n \n<#if pageTag.nextId??>\nSELECT\ncms_content.id as id,\ncontent_title as title,\ncontent_author as author, \ncontent_source as source, \ncontent_details as content,\ncategory.category_title as typename,\ncategory.category_id as typeid,\n(SELECT \'index.html\') as typelink,\ncontent_img as litpic,\n<#--内容页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/view.do?id=\', cms_content.id,\'&orderby=${_orderby}\',\'&order=${order!\'ASC\'}\',\'&typeid=${typeid}\') as \"link\",\n <#else>\n CONCAT(category_path,\'/\',cms_content.id,\'.html\') AS \"link\",\n \ncontent_datetime as \"date\",\ncontent_description as descrip,\ncontent_hit as hit,\ncontent_type as flag,\ncontent_keyword as keyword \nFROM cms_content\nLEFT JOIN cms_category as category ON cms_content.category_id=category.id\nWHERE cms_content.id=${pageTag.nextId}\n<#else>\nSELECT\n${select} as id,\n${select} as title,\n${select} as fulltitle,\n${select} as author, \n${select} as source, \n${select} as content,\n${select} as typename,\n${select} as typeid,\n${select} as typelink,\n${select} as litpic,\n${select} as \"link\",\n${select} as \"date\",\n${select} as descrip,\n${select} as hit,\n${select} as flag,\n${select} as keyword \n', NULL, '文章下一篇', NULL, NULL, NULL, NULL, 0); +INSERT INTO `mdiy_tag` VALUES (3, 'arclist', 'list', ' <#assign _typeid=\'\'/>\n<#assign _typetitle=\'\'/>\n<#assign _size=\'20\'/>\n\n<#if column?? && column.id?? && column.id?number gt 0>\n <#assign _typeid=\'${column.id}\'>\n\n\n<#if typeid??>\n <#assign _typeid=\'${typeid}\'>\n\n\n<#if typetitle??>\n <#assign _typetitle=\'${typetitle}\'>\n\n\n<#if size??>\n <#assign _size=\'${size}\'>\n\n\n<#if orderby?? >\n <#if orderby==\'date\'>\n <#assign _orderby=\'content_datetime\'>\n <#elseif orderby==\'updatedate\'>\n <#assign _orderby=\'content_updatetime\'>\n <#elseif orderby==\'hit\'>\n <#assign _orderby=\'content_hit\'>\n <#elseif orderby==\'sort\'>\n <#assign _orderby=\'content_sort\'>\n <#else>\n <#assign _orderby=\'cms_content.id\'>\n \n<#else>\n <#assign _orderby=\'cms_content.id\'>\n\n\nSELECT\n cms_content.id AS id,\n content_title AS title,\n content_title AS fulltitle,\n content_author AS author,\n content_source AS source,\n content_details AS content,\n category.category_title AS typetitle,\n category.id AS typeid,\ncategory.category_path AS typepath,\n category.category_img AS typelitpic,\n category.category_keyword as typekeyword,\n category.top_id as topId,\n category.category_parent_ids as parentids,\n category.category_type AS \"type\",\n\n <#--列表页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/list.do?typeid=\', category.category_id) as typelink,\n <#else>\n (SELECT \'index.html\') AS typelink,\n \n content_description AS descrip,\n content_hit AS hit,\n content_type AS flag,\n cms_content.content_keyword AS keyword,\n content_img AS litpic,\n \n <#--内容页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/view.do?id=\', cms_content.id,\'&orderby=${_orderby}\',\'&order=${order!\'ASC\'}\',\'&typeid=${typeid}\') as \"link\",\n <#else>\n CONCAT(category.category_path,\'/\',if(category_type=2,\"index\",cms_content.id),\'.html\') AS \"link\",\n \n\n <#if tableName??>${tableName}.*,\n content_datetime AS \"date\"\nFROM\n cms_content LEFT JOIN cms_category as category\n ON cms_content.category_id = category.id\n\n <#--判断是否有自定义模型表-->\n <#if tableName??>\n LEFT JOIN ${tableName} ON ${tableName}.link_id=cms_content.id\n \n WHERE \n content_display=0\n and cms_content.del=0\n <#--根据站点编号查询-->\n <#if appId?? >\n and cms_content.app_id=${appId}\n and cms_content.id>0\n \n <#--判断是否有搜索分类集合-->\n <#if search?? && _typeid==\"\">\n <#if search.categoryIds?has_content>and FIND_IN_SET(category.id,\'${search.categoryIds}\')\n <#--标题-->\n <#if search.content_title??> and content_title like CONCAT(\'%\',\'${search.content_title}\',\'%\')\n <#--作者-->\n <#if search.content_author??> and content_author like CONCAT(\'%\',\'${search.content_author}\',\'%\')\n <#--来源-->\n <#if search.content_source??> and content_source like CONCAT(\'%\',\'${search.content_source}\',\'%\')\n <#--属性-->\n <#if search.content_type??> and (\n <#list search.content_type?split(\',\') as item>\n <#if item?index gt 0> or\n FIND_IN_SET(\'${item}\',cms_content.content_type)\n )\n \n\n <#--描述-->\n <#if search.content_description??>\n and content_description like CONCAT(\'%\',\'${search.content_description}\',\'%\')\n \n\n <#--关键字-->\n <#if search.content_keyword??> and content_keyword like CONCAT(\'%\',\'${search.content_keyword}\',\'%\')\n\n <#--内容-->\n <#if search.content_details??> and content_details like CONCAT(\'%\',\'${search.content_details}\',\'%\')\n\n <#--自定义顺序-->\n <#if search.content_sort??> and content_sort=${search.content_sort}\n <#--时间范围-->\n <#if search.content_datetime_start??&&search.content_datetime_end??>\n and content_datetime between \'${search.content_datetime_start}\' and \'${search.content_datetime_end}\'\n \n <#else>\n <#--查询栏目-->\n <#if _typeid?has_content> \n and (cms_content.category_id=${_typeid} or cms_content.category_id in (select id FROM cms_category where cms_category.del=0 \n <#if _typetitle?has_content>\n and cms_category.category_title=\'${_typetitle}\' and FIND_IN_SET(${_typeid},CATEGORY_PARENT_IDS))) \n \n \n <#--标题-->\n <#if content_title??> and content_title like CONCAT(\'%\',\'${content_title}\',\'%\')\n <#--作者-->\n <#if content_author??> and content_author like CONCAT(\'%\',\'${content_author}\',\'%\')\n <#--来源-->\n <#if content_source??> and content_source like CONCAT(\'%\',\'${content_source}\',\'%\')\n <#--属性-->\n <#if content_type??> and content_type like CONCAT(\'%\',\'${content_type}\',\'%\')\n <#--描述-->\n <#if content_description??> and content_description like CONCAT(\'%\',\'${content_description}\',\'%\')\n <#--关键字-->\n <#if content_keyword??> and content_keyword like CONCAT(\'%\',\'${content_keyword}\',\'%\')\n <#--内容-->\n <#if content_details??> and content_details like CONCAT(\'%\',\'${content_details}\',\'%\')\n <#--自定义顺序-->\n <#if content_sort??> and content_sort=${content_sort}\n <#--自定义模型-->\n <#if diyModel??>\n <#list diyModel as dm>\n and ${tableName}.${dm.key} like CONCAT(\'%\',\'${dm.value}\',\'%\') \n \n \n <#--文章属性-->\n <#if flag?? >\n and(\n <#list flag?split(\',\') as item>\n <#if item?index gt 0> or\n FIND_IN_SET(\'${item}\',cms_content.content_type)\n )\n \n <#if noflag??>\n and(\n <#list noflag?split(\',\') as item>\n <#if item?index gt 0> and\n FIND_IN_SET(\'${item}\',cms_content.content_type)=0\n or cms_content.content_type is null)\n \n\n <#--字段排序-->\n <#if orderby?? >\n ORDER BY\n <#if orderby==\'date\'> content_datetime\n <#elseif orderby==\'updatedate\'> content_updatetime\n <#elseif orderby==\'hit\'> content_hit\n <#elseif orderby==\'sort\'> content_sort\n <#else>\n cms_content.id\n \n <#else>\n ORDER BY cms_content.id\n \n\n <#if order?? >\n <#if order==\'desc\'> desc\n <#if order==\'asc\'> asc\n <#else>\n desc\n \n LIMIT \n <#--判断是否分页-->\n <#if ispaging?? && (pageTag.pageNo)??>\n ${((pageTag.pageNo-1)*_size?eval)?c},${_size?default(20)}\n <#else>\n ${_size?default(20)}\n ', NULL, '文章列表', NULL, NULL, NULL, NULL, 0, 1); +INSERT INTO `mdiy_tag` VALUES (4, 'channel', 'list', '<#assign _typeid=\'0\'/>\n<#if column?? && column.id?? && column.id?number gt 0>\n <#assign _typeid=\'${column.id}\'>\n <#assign selfid=\'${column.id}\'>\n\n\n<#if typeid??>\n <#assign _typeid=\'${typeid}\'>\n\n\nselect\n id,\n id as typeid,\n category_title as typetitle,\n <#--动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/list.do?typeid=\', id) as typelink,\n <#else>\n <#--栏目类型为链接-->\n CONCAT(category_path,\'/index.html\') as typelink,\n \n category_keyword as typekeyword,\n category_diy_url as typeurl,\n category_flag as flag,\n category_parent_ids as parentids,\n category_descrip as typedescrip,\n category_type as type,\n category_path as typepath,\n leaf as typeleaf,\n category_img as typelitpic ,\n ( SELECT count(*) FROM cms_category cc WHERE cc.category_id = cms_category.id AND cc.del = 0 ) AS childsize \n from cms_category\n where\n cms_category.del=0\n <#--根据站点编号查询-->\n <#if appId?? >\n and cms_category.app_id=${appId}\n \n\n <#--栏目属性-->\n <#if flag?? >\n and\n (<#list flag?split(\',\') as item>\n <#if item?index gt 0> or\n FIND_IN_SET(\'${item}\',category_flag)\n )\n \n\n <#if noflag?? >\n and\n (<#list noflag?split(\',\') as item>\n <#if item?index gt 0> and\n FIND_IN_SET(\'${item}\',category_flag)=0\n or category_flag is null)\n \n\n <#--type默认son-->\n <#if !type??||!type?has_content>\n <#assign type=\'son\'/>\n \n\n <#if type?has_content>\n <#--顶级栏目（单个）-->\n <#if type==\'top\'>\n <#if _typeid != \'0\'>\n and (id = top_id or top_id = 0)\n \n\n <#elseif type==\'nav\'>\n and(category_id=0 or category_id is null)\n\n <#--同级栏目（多个）-->\n <#elseif type==\'level\'>\n and\n <#if _typeid != \'0\'>\n category_id=(select category_id from cms_category where id=${_typeid})\n <#else>\n 1=1\n \n\n <#--当前栏目（单个）-->\n <#elseif type==\'self\'>\n and\n <#if _typeid != \'0\'>\n id=${_typeid}\n <#else>\n 1=1\n \n\n <#--当前栏目的所属栏目（多个）-->\n <#elseif type==\'path\'>\n and\n <#if _typeid != \'0\'>\n id in (<#if column?? && column.categoryParentIds??>${column.categoryParentIds},${_typeid})\n <#else>\n 1=1\n \n <#--子栏目（多个）-->\n\n <#elseif type==\'son\'>\n and\n <#if _typeid != \'0\'>\n category_id=${_typeid}\n <#else>\n 1=1\n \n\n <#--上一级栏目没有则取当前栏目（单个）-->\n <#elseif type==\'parent\'>\n and\n <#if _typeid != \'0\'>\n <#if column?? && column.categoryId??>\n id=${column.categoryId}\n <#else>\n id=${_typeid}\n \n <#else>\n 1=1\n \n \n\n<#else> <#--默认顶级栏目-->\n and\n <#if _typeid != \'0\'>\n id=${_typeid}\n <#else>\n (category_id=0 or category_id is null)\n \n\n\n\n<#--字段排序-->\n<#if orderby?? >\n ORDER BY\n <#if orderby==\'date\'> category_datetime\n <#elseif orderby==\'sort\'> category_sort\n <#else>id\n\n\n<#if order?? >\n <#if order==\'desc\'> desc\n <#if order==\'asc\'> asc\n', NULL, '通用栏目', NULL, NULL, NULL, NULL, 0, 1); +INSERT INTO `mdiy_tag` VALUES (5, 'global', 'single', 'select\nAPP_NAME as name,\napp_logo as logo,\napp_keyword as keyword,\napp_description as descrip,\napp_copyright as copyright,\n<#--动态解析 -->\n<#if isDo?? && isDo>\nCONCAT(\'${url}\',\'${html}/\',app_dir) as url,\n\'${url}\' as host,\n<#--使用地址栏的域名 -->\n<#elseif url??>\nCONCAT(\'${url}\',\'${html}/\',app_dir) as url,\n\'${url}\' as host,\n<#else>\nCONCAT(REPLACE(REPLACE(TRIM(substring_index(app_url,\'\\n\',1)), CHAR(10),\'\'), CHAR(13),\'\'),\'/html/\',app_dir) as url,\nREPLACE(REPLACE(TRIM(substring_index(app_url,\'\\n\',1)), CHAR(10),\'\'), CHAR(13),\'\') as host,\n\nCONCAT(\'template/\',id,\'/\',app_style) as \"style\" <#-- 判断是否为手机端 -->\nfrom app\n<#--根据站点编号查询-->\n<#if appId?? >\n where id = ${appId}\n', NULL, '全局', NULL, NULL, NULL, NULL, 0, 1); +INSERT INTO `mdiy_tag` VALUES (7, 'field', 'single', 'SELECT\ncms_content.id as id,\ncontent_title as title,\ncontent_author as author, \ncontent_source as source, \ncontent_details as content,\ncms_category.id as typeid,\ncms_category.leaf as typeleaf,\ncms_category.category_title as typetitle,\ncms_category.category_img AS typelitpic,\ncms_category.top_id as topId,\ncms_category.category_flag as typeflag,\ncms_category.category_parent_ids as parentids,\ncms_category.category_keyword as typekeyword,\ncms_category.category_descrip as typedescrip,\ncms_category.category_diy_url as typeurl,\n<#--动态链接-->\n<#if isDo?? && isDo>\nCONCAT(\'/${modelName}/list.do?typeid=\', cms_category.id) as typelink,\n<#else>\n <#--栏目类型为链接-->\n CONCAT(cms_category.category_path,\'/index.html\') as typelink,\n\ncms_content.content_img AS litpic,\n<#--内容页动态链接-->\n<#if isDo?? && isDo>\nCONCAT(\'/mcms/view.do?id=\', cms_content.id) as \"link\",\n<#else>\nCONCAT(cms_category.category_path,\'/\',cms_content.id,\'.html\') AS \"link\",\n\ncontent_datetime as \"date\",\ncontent_description as descrip,\nCONCAT(\'\') as hit,\ncontent_type as flag,\ncategory_title as typetitle,\n<#if tableName??>${tableName}.*,\ncontent_keyword as keyword\nFROM cms_content\nLEFT JOIN cms_category ON\ncms_category.id = cms_content.category_id\n<#--判断是否有自定义模型表-->\n<#if tableName??>left join ${tableName} on ${tableName}.link_id=cms_content.id\nWHERE\n<#--如果是栏目列表页没有文章id所以只取栏目id-->\n<#if column??&&column.id??&&!id??>\ncms_category.id=${column.id} and\n\n cms_content.del=0\n<#if id??> and cms_content.id=${id}', NULL, '文章内容', NULL, NULL, NULL, NULL, 0, 1); +INSERT INTO `mdiy_tag` VALUES (8, 'pre', 'single', '<#assign select=\"(SELECT \'\')\"/>\n<#if orderby?? >\n <#if orderby==\"date\">\n <#assign _orderby=\"content_datetime\">\n <#elseif orderby==\"updatedate\">\n <#assign _orderby=\"content_updatetime\">\n <#elseif orderby==\"hit\">\n <#assign _orderby=\"content_hit\">\n <#elseif orderby==\"sort\">\n <#assign _orderby=\"content_sort\">\n <#else><#assign _orderby=\"cms_content.id\">\n <#else>\n <#assign _orderby=\"cms_content.id\">\n \n<#if pageTag.preId??>\nSELECT\ncms_content.id as id,\ncontent_title as title,\ncontent_author as author, \ncontent_source as source, \ncontent_details as content,\ncategory.category_title as typename,\ncategory.category_id as typeid,\n(SELECT \'index.html\') as typelink,\ncontent_img as litpic,\n<#--内容页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/view.do?id=\', cms_content.id,\'&orderby=${_orderby}\',\'&order=${order!\'ASC\'}\',\'&typeid=${typeid}\') as \"link\",\n <#else>\n CONCAT(category_path,\'/\',cms_content.id,\'.html\') AS \"link\",\n \ncontent_datetime as \"date\",\ncontent_description as descrip,\ncontent_hit as hit,\ncontent_type as flag,\ncontent_keyword as keyword \nFROM cms_content\nLEFT JOIN cms_category as category ON cms_content.category_id=category.id\nWHERE cms_content.id=${pageTag.preId}\n<#else>\nSELECT\n${select} as id,\n${select} as title,\n${select} as fulltitle,\n${select} as author, \n${select} as source, \n${select} as content,\n${select} as typename,\n${select} as typeid,\n${select} as typelink,\n${select} as litpic,\n${select} as \"link\",\n${select} as \"date\",\n${select} as descrip,\n${select} as hit,\n${select} as flag,\n${select} as keyword\n', NULL, '文章上一篇', NULL, NULL, NULL, NULL, 0, 1); +INSERT INTO `mdiy_tag` VALUES (9, 'page', 'single', 'select\n<#if !(pageTag.indexUrl??)>\n <#--判断是否有栏目对象，用于搜索不传栏目-->\n <#if column??>\n <#assign path=column.categoryPath/>\n <#else>\n <#assign path=\"\"/>\n \n <#--总记录数、总页数-->\n (SELECT ${pageTag.total}) as \"total\",\n (SELECT ${pageTag.size}) as \"size\",\n\n <#--记录总数-->\n (SELECT ${pageTag.rcount}) as \"rcount\",\n <#--当前页码-->\n (SELECT ${pageTag.pageNo}) as \"cur\",\n <#--首页-->\n CONCAT(\'${path}\', \'/index.html\') as \"index\",\n <#--上一页-->\n <#if (pageTag.pageNo?eval-1) gt 1>\n CONCAT(\'${path}\',\'/list-${pageTag.pageNo?eval-1}.html\') as \"pre\",\n <#else>\n CONCAT(\'${path}\',\'/index.html\') as \"pre\",\n \n\n <#--下一页-->\n <#if pageTag.total==1>\n CONCAT(\'${path}\', \'/index.html\') as \"next\",\n CONCAT(\'${path}\', \'/index.html\') as \"last\"\n <#else>\n <#if pageTag.pageNo?eval gte pageTag.total>\n CONCAT(\'${path}\',\'/list-${pageTag.total}.html\') as \"next\",\n <#else>\n CONCAT(\'${path}\',\'/list-${pageTag.pageNo?eval+1}.html\') as \"next\",\n \n <#--最后一页-->\n CONCAT(\'${path}\',\'/list-${pageTag.total}.html\') as \"last\"\n \n\n<#else>\n <#--判断是否是搜索页面-->\n \'${pageTag.indexUrl}\' as \"index\",\n \'${pageTag.lastUrl}\' as \"last\",\n \'${pageTag.preUrl}\' as \"pre\",\n \'${pageTag.nextUrl}\' as \"next\",\n (select ${pageTag.total}) as \"total\",\n (select ${pageTag.size}) as \"size\",\n (select ${pageTag.rcount}) as \"rcount\",\n (select ${pageTag.pageNo}) as \"cur\"\n', NULL, '通用分页', NULL, NULL, NULL, NULL, 0, 1); +INSERT INTO `mdiy_tag` VALUES (10, 'next', 'single', '<#assign select=\"(SELECT \'\')\"/>\n<#if orderby?? >\n <#if orderby==\"date\">\n <#assign _orderby=\"content_datetime\">\n <#elseif orderby==\"updatedate\">\n <#assign _orderby=\"content_updatetime\">\n <#elseif orderby==\"hit\">\n <#assign _orderby=\"content_hit\">\n <#elseif orderby==\"sort\">\n <#assign _orderby=\"content_sort\">\n <#else><#assign _orderby=\"cms_content.id\">\n <#else>\n <#assign _orderby=\"cms_content.id\">\n \n<#if pageTag.nextId??>\nSELECT\ncms_content.id as id,\ncontent_title as title,\ncontent_author as author, \ncontent_source as source, \ncontent_details as content,\ncategory.category_title as typename,\ncategory.category_id as typeid,\n(SELECT \'index.html\') as typelink,\ncontent_img as litpic,\n<#--内容页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/view.do?id=\', cms_content.id,\'&orderby=${_orderby}\',\'&order=${order!\'ASC\'}\',\'&typeid=${typeid}\') as \"link\",\n <#else>\n CONCAT(category_path,\'/\',cms_content.id,\'.html\') AS \"link\",\n \ncontent_datetime as \"date\",\ncontent_description as descrip,\ncontent_hit as hit,\ncontent_type as flag,\ncontent_keyword as keyword \nFROM cms_content\nLEFT JOIN cms_category as category ON cms_content.category_id=category.id\nWHERE cms_content.id=${pageTag.nextId}\n<#else>\nSELECT\n${select} as id,\n${select} as title,\n${select} as fulltitle,\n${select} as author, \n${select} as source, \n${select} as content,\n${select} as typename,\n${select} as typeid,\n${select} as typelink,\n${select} as litpic,\n${select} as \"link\",\n${select} as \"date\",\n${select} as descrip,\n${select} as hit,\n${select} as flag,\n${select} as keyword \n', NULL, '文章下一篇', NULL, NULL, NULL, NULL, 0, 1); COMMIT; -- ---------------------------- @@ -513,28 +530,58 @@ INSERT INTO `model` VALUES (1732, 1724, 0, '1700,1724', '162143576500025187', ' INSERT INTO `model` VALUES (1733, 1713, NULL, '1700,1713', '', '更新数据', 'mdiy:configData:update', '', 0, 0, '', '2021-12-28 22:05:33', '57', '2021-12-28 22:06:19', '', '2021-12-28 22:05:33', 0); COMMIT; +-- ---------------------------- +-- Table structure for people +-- ---------------------------- +DROP TABLE IF EXISTS `people`; +CREATE TABLE `people` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id主键', + `people_name` varchar(30) DEFAULT NULL COMMENT '账号', + `people_password` varchar(50) DEFAULT NULL COMMENT '密码', + `people_ip` varchar(100) DEFAULT NULL COMMENT '用户登录ip', + `people_phone` varchar(30) DEFAULT NULL COMMENT '手机号码', + `people_phonecheck` int(1) DEFAULT '0' COMMENT '1手机验证通过', + `people_mail` varchar(120) DEFAULT NULL COMMENT '用户邮箱', + `people_maillcheck` int(1) DEFAULT '0' COMMENT '1邮箱验证通过', + `people_state` int(2) DEFAULT '0' COMMENT '用户状态', + `people_code` varchar(15) DEFAULT NULL COMMENT '随机验证码', + `people_codesenddate` datetime DEFAULT NULL COMMENT '发送验证码时间', + `people_datetime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '注册时间', + `UPDATE_BY` int(11) DEFAULT NULL COMMENT '更新人', + `UPDATE_DATE` datetime DEFAULT NULL COMMENT '更新时间', + `CREATE_BY` int(11) DEFAULT NULL COMMENT '创建人', + `CREATE_DATE` datetime DEFAULT NULL COMMENT '创建时间', + `DEL` int(1) DEFAULT '0' COMMENT '删除标记', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='户用基础表'; + +-- ---------------------------- +-- Records of people +-- ---------------------------- +BEGIN; +COMMIT; + -- ---------------------------- -- Table structure for role -- ---------------------------- DROP TABLE IF EXISTS `role`; CREATE TABLE `role` ( `id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'id主键', - `manager_id` int(11) DEFAULT '0' COMMENT '角色管理员编号', `role_name` varchar(30) DEFAULT NULL COMMENT '角色名', `UPDATE_BY` varchar(11) DEFAULT NULL COMMENT '更新人', `UPDATE_DATE` datetime DEFAULT NULL COMMENT '更新时间', `CREATE_BY` varchar(11) DEFAULT NULL COMMENT '创建人', `CREATE_DATE` datetime DEFAULT NULL COMMENT '创建时间', `DEL` int(1) DEFAULT '0' COMMENT '删除标记', - PRIMARY KEY (`id`) USING BTREE, - KEY `inx_role_manage_id` (`manager_id`) USING BTREE + `NOT_DEL` int(1) DEFAULT '0' COMMENT '1为不能删除，主要用于系统默认数据,0为一般数据，主要是前端控制', + PRIMARY KEY (`id`) USING BTREE ) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8 COMMENT='角色表'; -- ---------------------------- -- Records of role -- ---------------------------- BEGIN; -INSERT INTO `role` VALUES (48, 57, 'msopen', NULL, NULL, NULL, NULL, 0); +INSERT INTO `role` VALUES (48, 'msopen', NULL, NULL, NULL, NULL, 0, 0); COMMIT; -- ---------------------------- diff --git a/src/main/java/net/mingsoft/cms/action/BaseAction.java b/src/main/java/net/mingsoft/cms/action/BaseAction.java index 2fd76447..0d1cbbe0 100755 --- a/src/main/java/net/mingsoft/cms/action/BaseAction.java +++ b/src/main/java/net/mingsoft/cms/action/BaseAction.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.action; import java.util.MissingResourceException; diff --git a/src/main/java/net/mingsoft/cms/action/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/CategoryAction.java index c843a6a2..90e0b9f9 100755 --- a/src/main/java/net/mingsoft/cms/action/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/CategoryAction.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.action; import cn.hutool.core.util.StrUtil; diff --git a/src/main/java/net/mingsoft/cms/action/ContentAction.java b/src/main/java/net/mingsoft/cms/action/ContentAction.java index b34ab238..f821c96f 100755 --- a/src/main/java/net/mingsoft/cms/action/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/ContentAction.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.action; import io.swagger.annotations.Api; diff --git a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java index c64523c8..65cd0726 100755 --- a/src/main/java/net/mingsoft/cms/action/GeneraterAction.java +++ b/src/main/java/net/mingsoft/cms/action/GeneraterAction.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -20,6 +20,8 @@ */ + + package net.mingsoft.cms.action; import cn.hutool.core.bean.BeanUtil; diff --git a/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java index bf4c358d..2a33d7ab 100755 --- a/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/CategoryAction.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.action.web; import io.swagger.annotations.Api; diff --git a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java index 0e0caab8..327536a5 100755 --- a/src/main/java/net/mingsoft/cms/action/web/ContentAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/ContentAction.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.action.web; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java index c47b0ee8..4e7dd8bc 100755 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -20,6 +20,8 @@ */ + + package net.mingsoft.cms.action.web; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/net/mingsoft/cms/aop/ContentAop.java b/src/main/java/net/mingsoft/cms/aop/ContentAop.java index a771f5bf..6359c3bb 100755 --- a/src/main/java/net/mingsoft/cms/aop/ContentAop.java +++ b/src/main/java/net/mingsoft/cms/aop/ContentAop.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.aop; import net.mingsoft.basic.aop.BaseAop; diff --git a/src/main/java/net/mingsoft/cms/bean/CategoryBean.java b/src/main/java/net/mingsoft/cms/bean/CategoryBean.java index 7f0c9415..de8ac7ab 100755 --- a/src/main/java/net/mingsoft/cms/bean/CategoryBean.java +++ b/src/main/java/net/mingsoft/cms/bean/CategoryBean.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.bean; import net.mingsoft.cms.entity.CategoryEntity; diff --git a/src/main/java/net/mingsoft/cms/bean/ContentBean.java b/src/main/java/net/mingsoft/cms/bean/ContentBean.java index 195031bb..3269e2f8 100755 --- a/src/main/java/net/mingsoft/cms/bean/ContentBean.java +++ b/src/main/java/net/mingsoft/cms/bean/ContentBean.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.bean; import com.alibaba.fastjson.annotation.JSONField; diff --git a/src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java b/src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java index cc7f8852..2fde76c9 100755 --- a/src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/ICategoryBiz.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.biz; import net.mingsoft.base.biz.IBaseBiz; diff --git a/src/main/java/net/mingsoft/cms/biz/IContentBiz.java b/src/main/java/net/mingsoft/cms/biz/IContentBiz.java index 962801e6..2bdbcc14 100755 --- a/src/main/java/net/mingsoft/cms/biz/IContentBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IContentBiz.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.biz; import net.mingsoft.base.biz.IBaseBiz; diff --git a/src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java b/src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java index d4b750a5..2c91048c 100755 --- a/src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IHistoryLogBiz.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.biz; import net.mingsoft.base.biz.IBaseBiz; diff --git a/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java index 29f50411..1fdcfcd7 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java @@ -1,16 +1,16 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of * the Software, and to permit persons to whom the Software is furnished to do so, * subject to the following conditions: - *

+ * The above copyright notice and this permission notice shall be included in all * copies or substantial portions of the Software. - *

+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR @@ -20,6 +20,8 @@ */ + + package net.mingsoft.cms.biz.impl; import cn.hutool.core.util.ObjectUtil; diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java index 6dc6c647..ad3dcc50 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -20,6 +20,8 @@ */ + + package net.mingsoft.cms.biz.impl; import net.mingsoft.base.biz.impl.BaseBizImpl; diff --git a/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java index 954ff8f5..706f1eaf 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/HistoryLogBizImpl.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -20,6 +20,8 @@ */ + + package net.mingsoft.cms.biz.impl; import net.mingsoft.cms.biz.IHistoryLogBiz; diff --git a/src/main/java/net/mingsoft/cms/constant/Const.java b/src/main/java/net/mingsoft/cms/constant/Const.java index 5d7b066b..1d93ed23 100755 --- a/src/main/java/net/mingsoft/cms/constant/Const.java +++ b/src/main/java/net/mingsoft/cms/constant/Const.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.constant; /** diff --git a/src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java b/src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java index 570cece4..69d77925 100755 --- a/src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java +++ b/src/main/java/net/mingsoft/cms/constant/e/CategoryTypeEnum.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -19,6 +19,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.constant.e; import net.mingsoft.base.constant.e.BaseEnum; diff --git a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java index 93aa5c62..1b975f33 100755 --- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java +++ b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; diff --git a/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java b/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java index caa9fd0e..233009c9 100755 --- a/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java +++ b/src/main/java/net/mingsoft/cms/dao/ICmsHistoryLogDao.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.java b/src/main/java/net/mingsoft/cms/dao/IContentDao.java index e71ff93f..4a9edf44 100755 --- a/src/main/java/net/mingsoft/cms/dao/IContentDao.java +++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; diff --git a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java index b49806d6..1e90110e 100755 --- a/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/CategoryEntity.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.entity; import com.alibaba.fastjson.annotation.JSONField; diff --git a/src/main/java/net/mingsoft/cms/entity/ContentEntity.java b/src/main/java/net/mingsoft/cms/entity/ContentEntity.java index 34bae545..e993cda8 100755 --- a/src/main/java/net/mingsoft/cms/entity/ContentEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/ContentEntity.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.entity; import com.alibaba.fastjson.annotation.JSONField; diff --git a/src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java b/src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java index 86842e8b..b8dac5b2 100755 --- a/src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java +++ b/src/main/java/net/mingsoft/cms/entity/HistoryLogEntity.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.entity; import com.alibaba.fastjson.annotation.JSONField; diff --git a/src/main/java/net/mingsoft/cms/upgrade/Upgrade.java b/src/main/java/net/mingsoft/cms/upgrade/Upgrade.java deleted file mode 100644 index 6298db79..00000000 --- a/src/main/java/net/mingsoft/cms/upgrade/Upgrade.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.mingsoft.cms.upgrade; - -import net.mingsoft.basic.util.SpringUtil; -import net.mingsoft.cms.biz.ICategoryBiz; -import net.mingsoft.cms.entity.CategoryEntity; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * @author by 铭飞开源团队 - * @Description - * @date 2020/6/19 15:58 - */ -public class Upgrade { - - /** - * 更新栏目分类的顶级节点和叶子节点 - */ - public void upgrade(){ - ICategoryBiz categoryBiz = SpringUtil.getBean(ICategoryBiz.class); - List list = categoryBiz.queryAll(); - - list.forEach(x->{ - - //将parentId第一行设为顶级节点 - String topId = "0"; - String parentId = x.getParentids(); - if (parentId != null) { - topId = parentId.split(",")[0]; - } - x.setTopId(topId); - - String id = x.getId(); - boolean leaf = true; - //判断是否叶子，循环查找，如果有节点的父节点中包含该节点的id则判断为否跳出循环 - for (int i = 0; i< list.size(); i++) { - String pId = list.get(i).getParentids(); - if (pId == null) { - continue; - } - leaf = !pId.contains(id); - //如果不是叶子就跳出循环，不需要再判断了 - if (!leaf) { - break; - } - } - x.setLeaf(leaf); - //更新 - Map fields = new HashMap<>(); - fields.put("leaf", x.getLeaf()?"1":"0"); - fields.put("top_id", x.getTopId()); - Map where = new HashMap<>(); - where.put("id", x.getId()); - categoryBiz.updateBySQL("cms_category", fields, where); - }); - - } -} diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index d9b39ddc..3ac95630 100755 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -1,6 +1,6 @@ /** * The MIT License (MIT) - * Copyright (c) 2020 铭软科技(mingsoft.net) + * Copyright (c) 2012-2022 铭软科技(mingsoft.net) * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to @@ -18,6 +18,8 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft.cms.util; import cn.hutool.core.collection.CollUtil;