diff --git a/doc/db-mcms-5.0.sql b/doc/db-mcms-5.0.sql
index abefe3aa..5650339a 100644
--- a/doc/db-mcms-5.0.sql
+++ b/doc/db-mcms-5.0.sql
@@ -1,7 +1,7 @@
/*
- Navicat MySQL Data Transfer
+ Navicat Premium Data Transfer
- Source Server : imingsoft.cn
+ Source Server : 线上数据库
Source Server Type : MySQL
Source Server Version : 50725
Source Host : imingsoft.cn:3307
@@ -11,7 +11,7 @@
Target Server Version : 50725
File Encoding : 65001
- Date: 30/12/2019 22:50:25
+ Date: 07/01/2020 18:38:10
*/
SET NAMES utf8mb4;
@@ -46,7 +46,7 @@ CREATE TABLE `app` (
-- ----------------------------
-- Records of app
-- ----------------------------
-INSERT INTO `app` VALUES (1, 'MCMS-OPEN', 'http://localhost:8080/ms-mcms\r\n', '/upload/1/appLogo/1577696533789.jpg', '铭飞MCMS', '版权所有 ©铭飞科技有限公司2012-2019 保留一切权利。', 'default', 57, '铭飞MCMS', NULL, '', '2019-11-16 00:00:00', '', 0, 1, '');
+INSERT INTO `app` VALUES (1, 'MCMS-OPEN', 'http://localhost:8080/ms-mcms\r\n', '/upload/1/appLogo/1578375538540.jpg', '铭飞MCMS', '版权所有 ©铭飞科技有限公司2012-2019 保留一切权利。', 'default', 57, '铭飞MCMS', NULL, '', '2019-11-16 00:00:00', '', 0, 1, '');
-- ----------------------------
-- Table structure for cms_category
@@ -252,7 +252,7 @@ INSERT INTO `cms_content` VALUES (218, 1, '/115\\218.html', '锐诚PPT培训
INSERT INTO `cms_content` VALUES (219, 1, '/115\\219.html', '
锐诚PPT金牌设计师，毕业于上海美术学院视觉传达专业，曾在国内某知名4A广告公司任职，五年动画和PPT设计经验，拥有丰富的高端定制设计经验，专注于企业展示/工作汇报/品牌宣讲/竞聘/路演等高端PPT设计，设计理念：创意是设计的灵魂！在动画、质感和版式的设计上力求完美。
', '', '锐诚PPT金牌设计师', '[{\"path\":\"/upload/article/1638/1464860570155.png\",\"url\":\"/ms-mcms/upload/article/1638/1464860570155.png\",\"uid\":1577436839397,\"status\":\"success\"}]', 0, '2028-01-01 00:00:00', '', '', '0', 'f', '115', '梅幸', 0, 0, '2019-12-27 16:58:00', NULL, NULL, NULL);
INSERT INTO `cms_content` VALUES (220, 1, '/149\\220.html', '攀臣广告(上海)有限公司(以下简称:攀臣)是一家专注于亚克力制品(化妆品展架、展览展示道具、展架展柜陈列架、商场展示道具、展示盒、手机宣传架、发光展架、广告灯箱、标识标牌、工艺礼品、奖杯奖牌授权牌、商超货架置物架、台牌台卡台签、相框相架、金银珠宝展示礼盒、抽奖箱收纳箱、办公文具类、家居生活类、各类广告字、机器配套、产品附件配件等等)设计加工制作为一体的公司 。涉及：商务、工业、建筑、交通、商业、家居生活、广告、医学、照明、酒店餐饮、金融银行服务、学校教育、政府事业单位、景点旅游、展厅展览、零售店面、奢侈品、面包糕点等众多业态领域，产品基本覆盖全行业。
', '', '', '[{\"path\":\"/upload/1//article/1531105696938.jpg\"}]', 0, '2018-07-09 11:07:00', 'http://www.panchen-china.com/', '', '0', '', '149', '攀臣广告', 0, 0, NULL, NULL, NULL, NULL);
INSERT INTO `cms_content` VALUES (221, 1, '/149\\221.html', '深圳市华赋科创电子有限公司 成立于2009年，主要从事 IC 等电子元器件的推广、销售及开发应用服务。华赋是STMicro、NXP、ONSemi、TI、ADI、Intersil、Infineon、Vishay、Fujitsu、Yageo、Samsung、AOS、Fairchild、Freescale、Cypress、ROHM、HTC、Eastsoft、台湾安国、风华高科、等国内外著名公司的授权代理商或分销商。拥有微控制器、系统管理器件、通信接口器件、数据转换器件、信号调理器件、电源管理器件、存储器、连接器、分立半导体及被动器件等十多个产品种类。香港、深圳两地设立库房，现货库存产品达上万中，支持香港、海外交货。目前已与多家国外分销商建立了战略合作伙伴关系，其中包括：Mouser、 Rochester、Digi-Key、Future、Arrow、Avnet等，为国内客户提供海外订购产品服务，满足客户从研发到批量生产的所有采购需求。
', '', '', '[{\"path\":\"/upload/1//article/1531105877049.jpg\"}]', 0, '2018-07-09 11:09:00', 'http://www.huaful.com/', '', '0', '', '149', '华赋科创', 0, 0, NULL, NULL, NULL, NULL);
-INSERT INTO `cms_content` VALUES (222, 1, '/149\\222.html', '洛龙区人民政府门户网作为洛阳市洛龙区电子政务（网上行政）建设的重要组成部分，是政府信息公开的法定载体，是政府面向社会服务的平台，是公众与政府交流互动的桥梁，是宣传洛龙的主要窗口，对于促进政府信息公开、推进依法行政、接受公众监督、改进行政管理、全面履行政府职能和建设阳光政府具有重要意义。
', '', '', '[{\"path\":\"/upload/1//article/1531105970322.jpg\"}]', 0, '2018-07-09 11:12:00', 'http://www.luolong.gov.cn/ ', '', '0', '', '149', '洛阳洛龙', 0, 0, NULL, NULL, NULL, NULL);
+INSERT INTO `cms_content` VALUES (222, 1, '/149\\222.html', '洛龙区人民政府门户网作为洛阳市洛龙区电子政务（网上行政）建设的重要组成部分，是政府信息公开的法定载体，是政府面向社会服务的平台，是公众与政府交流互动的桥梁，是宣传洛龙的主要窗口，对于促进政府信息公开、推进依法行政、接受公众监督、改进行政管理、全面履行政府职能和建设阳光政府具有重要意义。
', 'x', 'x', '[{\"path\":\"/upload/1//article/1531105970322.jpg\",\"url\":\"/ms-mcms/upload/1//article/1531105970322.jpg\",\"uid\":1578390819577,\"status\":\"success\"}]', 0, '2018-07-09 11:12:00', 'http://www.luolong.gov.cn/ ', '', '0', 'f', '149', '洛阳洛龙', 0, 0, '2020-01-07 17:53:55', NULL, NULL, NULL);
-- ----------------------------
-- Table structure for cms_history_log
@@ -302,12 +302,7 @@ CREATE TABLE `manager` (
-- ----------------------------
-- Records of manager
-- ----------------------------
-INSERT INTO `manager` VALUES (52, 'test', 'test', 'e10adc3949ba59abbe56e057f20f883e', NULL, 0, '2017-05-25 14:55:19', 0);
-INSERT INTO `manager` VALUES (53, 'kfm', 'kfm', '14dda7e9cc096397e851a3d71465511e', NULL, 0, '2017-05-25 14:59:48', 0);
INSERT INTO `manager` VALUES (57, 'msopen', 'msopen', '9d8622060de5f24937b60585c3f4d66b', 48, 0, NULL, 0);
-INSERT INTO `manager` VALUES (58, 'adminms', NULL, '9d8622060de5f24937b60585c3f4d66b', 1, 0, '2019-11-20 09:01:33', 0);
-INSERT INTO `manager` VALUES (59, 'msopen1', '123456', 'e10adc3949ba59abbe56e057f20f883e', NULL, 0, NULL, 0);
-INSERT INTO `manager` VALUES (60, 'adnub', 'adnub', 'd41d8cd98f00b204e9800998ecf8427e', NULL, 0, NULL, 0);
-- ----------------------------
-- Table structure for mdiy_dict
@@ -387,7 +382,12 @@ CREATE TABLE `mdiy_model` (
`model_field` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL,
`model_custom_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '类型',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 41 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '自定义模型' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 42 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '自定义模型' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of mdiy_model
+-- ----------------------------
+INSERT INTO `mdiy_model` VALUES (41, '{\"html\":\"\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\",\"script\":\" var custom_model = Vue.component(\\\"custom-model\\\",{\\r\\n el: \'#custom-model\',\\r\\n data() {\\r\\n return {\\r\\n modelId:0,\\r\\n //表单数据\\r\\n form: {\\r\\n linkId:0,\\r\\n // 姓名\\r\\n name:\'\',\\r\\n // 手机\\r\\n phone:\'\',\\r\\n // 留言\\r\\n words:\'\',\\r\\n },\\r\\n rules:{\\r\\n },\\r\\n\\r\\n }\\r\\n },\\r\\n watch:{\\r\\n },\\r\\n computed:{\\r\\n },\\r\\n methods: {\\r\\n validate(){\\r\\n var b = false\\r\\n this.$refs.form.validate((valid) => {\\r\\n b = valid;\\r\\n });\\r\\n return b;\\r\\n },\\r\\n save() {\\r\\n var that = this;\\r\\n var success = false;\\r\\n var url = ms.manager + \\\"/mdiy/model/data/save.do\\\"\\r\\n if (that.form.id > 0) {\\r\\n url = ms.manager + \\\"/mdiy/model/data/update.do\\\";\\r\\n }\\r\\n this.$refs.form.validate((valid) => {\\r\\n if (valid) {\\r\\n var data = JSON.parse(JSON.stringify(that.form));\\r\\n data.modelId = that.modelId;\\r\\n ms.http.post(url, data).then(function (res) {\\r\\n if (res.data.id > 0) {\\r\\n success = true;\\r\\n }\\r\\n });\\r\\n } else {\\r\\n return false;\\r\\n }\\r\\n })\\r\\n return success;\\r\\n },\\r\\n //获取当前意见反馈\\r\\n get(id) {\\r\\n var that = this;\\r\\n ms.http.get(ms.manager + \\\"/mdiy/model/data.do\\\", {modelId:this.modelId,linkId:id}).then(function (res) {\\r\\n if(res.result&&res.data){\\r\\n that.form = res.data;\\r\\n }\\r\\n }).catch(function (err) {\\r\\n console.log(err);\\r\\n });\\r\\n },\\r\\n },\\r\\n created() {\\r\\n this.get(this.form.linkId);\\r\\n }\\r\\n });\\r\\n\\r\\n\"}', 1, 'mdiy_post_feedback', '意见反馈', NULL, 0, NULL, 0, NULL, 0, '[\r\n{\r\n \"model\":\"name\",\r\n \"key\":\"name\",\r\n \"javaType\":\"String\",\r\n \"jdbcType\":\"VARCHAR\",\r\n \"name\":\"姓名\",\r\n \"type\":\"input\"\r\n }\r\n ,{\r\n \"model\":\"phone\",\r\n \"key\":\"phone\",\r\n \"javaType\":\"String\",\r\n \"jdbcType\":\"VARCHAR\",\r\n \"name\":\"手机\",\r\n \"type\":\"input\"\r\n }\r\n ,{\r\n \"model\":\"words\",\r\n \"key\":\"words\",\r\n \"javaType\":\"String\",\r\n \"jdbcType\":\"VARCHAR\",\r\n \"name\":\"留言\",\r\n \"type\":\"textarea\"\r\n }\r\n]', 'post');
-- ----------------------------
-- Table structure for mdiy_page
@@ -399,22 +399,39 @@ CREATE TABLE `mdiy_page` (
`page_model_id` int(11) NULL DEFAULT NULL COMMENT '模块id',
`page_path` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自定义页面绑定模板的路径',
`page_title` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自定义页面标题',
+ `page_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '字典分类字段',
`page_key` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自定义页面访问路径',
`create_date` datetime(0) NULL DEFAULT NULL,
+ `create_by` int(11) NULL DEFAULT NULL,
+ `update_by` int(11) NULL DEFAULT NULL,
+ `update_date` datetime(0) NULL DEFAULT NULL,
+ `del` int(1) NULL DEFAULT 0,
PRIMARY KEY (`page_id`) USING BTREE,
INDEX `index_page_key`(`page_key`) USING BTREE,
INDEX `index_page_app_id`(`page_app_id`) USING BTREE,
INDEX `index_page_model_id`(`page_model_id`) USING BTREE,
- CONSTRAINT `mdiy_page_ibfk_1` FOREIGN KEY (`page_app_id`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '自定义页面表' ROW_FORMAT = Dynamic;
+ CONSTRAINT `mdiy_page_ibfk_1` FOREIGN KEY (`page_app_id`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE RESTRICT
+) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '自定义页面表' ROW_FORMAT = Compact;
-- ----------------------------
-- Records of mdiy_page
-- ----------------------------
-INSERT INTO `mdiy_page` VALUES (1, 1, 0, 'people/register.htm', '注册', 'register', NULL);
-INSERT INTO `mdiy_page` VALUES (2, 1, 0, 'people/login.htm', '登录', 'login', NULL);
-INSERT INTO `mdiy_page` VALUES (3, 1, 0, 'people/center.htm', '个人中心', 'people/center', NULL);
-INSERT INTO `mdiy_page` VALUES (4, 1, 0, 'people/password-change.htm', '修改密码', 'people/password-change', NULL);
+INSERT INTO `mdiy_page` VALUES (1, 1, 0, 'people/register.htm', '注册', NULL, 'register', NULL, NULL, NULL, NULL, 0);
+INSERT INTO `mdiy_page` VALUES (2, 1, 0, 'people/login.htm', '登入', NULL, 'login', NULL, NULL, NULL, NULL, 0);
+INSERT INTO `mdiy_page` VALUES (3, 1, 0, 'people/center.htm', '个人中心', NULL, 'people/center', NULL, NULL, NULL, NULL, 0);
+INSERT INTO `mdiy_page` VALUES (4, 1, 0, 'people/passworld-change.htm', '修改密码', NULL, 'people/password-change', NULL, NULL, NULL, NULL, 0);
+
+-- ----------------------------
+-- Table structure for mdiy_post_feedback
+-- ----------------------------
+DROP TABLE IF EXISTS `mdiy_post_feedback`;
+CREATE TABLE `mdiy_post_feedback` (
+ `name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '姓名',
+ `phone` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '手机',
+ `words` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '留言',
+ `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '意见反馈' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Table structure for mdiy_tag
@@ -457,7 +474,7 @@ CREATE TABLE `mdiy_tag_sql` (
-- Records of mdiy_tag_sql
-- ----------------------------
INSERT INTO `mdiy_tag_sql` VALUES (5, 3, '<#assign _typeid=\"\"/>\r\n<#assign _size=\"20\"/>\r\n<#if column?? && column.id?? && column.id?number gt 0>\r\n <#assign _typeid=\"${column.id}\">\r\n\r\n<#if typeid??>\r\n <#assign _typeid=\"${typeid}\">\r\n\r\n<#if size??>\r\n <#assign _size=\"${size}\">\r\n\r\n<#if orderby?? >\r\n <#if orderby==\"date\"> \r\n <#assign _orderby=\"content_datetime\">\r\n <#elseif orderby==\"updatedate\">\r\n <#assign _orderby=\"content_updatetime\">\r\n <#elseif orderby==\"hit\"> \r\n <#assign _orderby=\"content_hit\">\r\n <#elseif orderby==\"sort\">\r\n <#assign _orderby=\"content_sort\">\r\n <#else><#assign _orderby=\"cms_content.id\">\r\n <#else>\r\n <#assign _orderby=\"cms_content.id\">\r\n \r\nSELECT\r\n cms_content.id AS id,\r\n @rownum := @rownum + 1 AS `index`,\r\n LEFT (content_title, ${titlelen ?default(40)}) AS title,\r\n content_title AS fulltitle,\r\n content_author AS author,\r\n content_source AS source,\r\n content_details AS content,\r\n category.category_title AS typename,\r\n category.category_id AS typeid,\r\n category.category_img AS typelitpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n \r\n ( CASE content_img WHEN \'\' THEN content_img ELSE CONVERT ( JSON_UNQUOTE( JSON_EXTRACT( content_img -> \'$[0]\', \'$.path\' ) ) USING utf8 ) END ) AS litpic,\r\n <#--内容页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", cms_content.id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n <#else>\r\n\r\n CONCAT(category.category_path,\"/\",cms_content.id,\".html\") AS link,\r\n \r\n content_datetime AS date,<#if tableName??>${tableName}.*,\r\n content_description AS descrip,\r\n content_hit AS hit,\r\n content_type AS flag,\r\n category_title AS typetitle,\r\n cms_content.content_keyword AS keyword \r\nFROM\r\n (SELECT @rownum := 0) r,\r\n cms_content\r\n LEFT JOIN cms_category as category ON content_category_id = category.id\r\n <#--判断是否有自定义模型表-->\r\n <#if tableName??>LEFT JOIN ${tableName} ON ${tableName}.link_id=cms_content.id \r\nWHERE \r\n content_display=0 \r\n <#--根据站点编号查询-->\r\n <#if appId?? >\r\n and cms_content.app_id=${appId}\r\n and cms_content.id>0\r\n \r\n <#--判断是否有搜索分类集合-->\r\n <#if search??>\r\n <#if search.categoryIds??>and FIND_IN_SET(category.id,\'${search.categoryIds}\')\r\n <#--标题-->\r\n <#if search.content_title??> and content_title like CONCAT(\"%\",\'${search.content_title}\',\"%\")\r\n <#--作者-->\r\n <#if search.content_author??> and content_author like CONCAT(\"%\",\'${search.content_author}\',\"%\")\r\n <#--来源-->\r\n <#if search.content_source??> and content_source like CONCAT(\"%\",\'${search.content_source}\',\"%\")\r\n <#--属性-->\r\n <#if search.content_type??> and content_type like CONCAT(\"%\",\'${search.content_type}\',\"%\")\r\n <#--图片-->\r\n <#if search.content_img??> and content_img like CONCAT(\"%\",\'${search.content_img}\',\"%\")\r\n <#--描述-->\r\n <#if search.content_description??> and content_description like CONCAT(\"%\",\'${search.content_description}\',\"%\")\r\n <#--关键字-->\r\n <#if search.content_keyword??> and content_keyword like CONCAT(\"%\",\'${search.content_keyword}\',\"%\")\r\n <#--内容-->\r\n <#if search.content_details??> and content_details like CONCAT(\"%\",\'${search.content_details}\',\"%\")\r\n <#--自定义顺序-->\r\n <#if search.content_sort??> and content_sort=${search.content_sort}\r\n <#else><#--查询栏目-->\r\n <#if _typeid?has_content> and (content_category_id=${_typeid} or content_category_id in \r\n (select id FROM cms_category where cms_category.del=0 and find_in_set(${_typeid},CATEGORY_PARENT_ID))) \r\n \r\n <#--标题-->\r\n <#if content_title??> and content_title like CONCAT(\"%\",\'${content_title}\',\"%\")\r\n <#--作者-->\r\n <#if content_author??> and content_author like CONCAT(\"%\",\'${content_author}\',\"%\")\r\n <#--来源-->\r\n <#if content_source??> and content_source like CONCAT(\"%\",\'${content_source}\',\"%\")\r\n <#--属性-->\r\n <#if content_type??> and content_type like CONCAT(\"%\",\'${content_type}\',\"%\")\r\n <#--图片-->\r\n <#if content_img??> and content_img like CONCAT(\"%\",\'${content_img}\',\"%\")\r\n <#--描述-->\r\n <#if content_description??> and content_description like CONCAT(\"%\",\'${content_description}\',\"%\")\r\n <#--关键字-->\r\n <#if content_keyword??> and content_keyword like CONCAT(\"%\",\'${content_keyword}\',\"%\")\r\n <#--内容-->\r\n <#if content_details??> and content_details like CONCAT(\"%\",\'${content_details}\',\"%\")\r\n <#--自定义顺序-->\r\n <#if content_sort??> and content_sort=${content_sort}\r\n <#--自定义模型-->\r\n <#if diyModel??> \r\n <#list diyModel as dm>\r\n and ${tableName}.${dm.key} = \"${dm.value}\" \r\n \r\n \r\n <#--文章属性-->\r\n <#if flag?? >\r\n and cms_content.content_type like CONCAT(\'%\',\'${flag}\',\'%\') \r\n \r\n <#if noflag?? >\r\n and cms_content.content_type not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n \r\n <#--字段排序-->\r\n <#if orderby?? >\r\n ORDER BY \r\n <#if orderby==\"date\"> content_datetime\r\n <#elseif orderby==\"updatedate\"> content_updatetime\r\n <#elseif orderby==\"hit\"> content_hit\r\n <#elseif orderby==\"sort\"> content_sort\r\n <#else>cms_content.id\r\n <#else>\r\n ORDER BY cms_content.id\r\n \r\n <#if order?? >\r\n <#if order==\"desc\"> desc\r\n <#if order==\"asc\"> asc\r\n \r\n LIMIT \r\n <#--判断是否分页-->\r\n <#if ispaging?? && (pageTag.pageNo)??>${((pageTag.pageNo-1)*_size?eval)?c},${_size?default(20)}\r\n <#else>${_size?default(20)}', 1);
-INSERT INTO `mdiy_tag_sql` VALUES (6, 4, '<#assign _typeid=\"\"/>\r\n<#if column?? && column.id?? && column.id?number gt 0>\r\n <#assign _typeid=\"${column.id}\">\r\n\r\n<#if typeid??>\r\n <#assign _typeid=\"${typeid}\">\r\n\r\nselect \r\n @rownum := @rownum + 1 AS typeindex,\r\n id,\r\n id as typeid,\r\n category_title as typetitle,\r\n <#--返回父id集合-->\r\n category_parent_id as pids,\r\n <#--栏目选中的样式-->\r\n IF(<#if _typeid?has_content>${_typeid}<#else>0 = id ,\"${class!\'\'}\",\"\") as class,\r\n <#--动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", id) as typelink,\r\n <#else>\r\n CONCAT(category_path,\"/index.html\") as typelink,\r\n \r\n category_keyword as typekeyword,\r\n category_diy_url as typeurl,\r\n category_flag as flag,\r\n category_descrip as typedescrip,\r\n category_img as typelitpic \r\n from (SELECT @rownum := 0) r,cms_category \r\n where \r\n cms_category.del=0 \r\n <#--根据站点编号查询-->\r\n <#if appId?? >\r\n and cms_category.app_id=${appId}\r\n \r\n <#--栏目属性-->\r\n <#if flag?? >\r\n and category_flag like CONCAT(\'%\',\'${flag}\',\'%\') \r\n \r\n <#if noflag?? >\r\n and category_flag not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n \r\n<#if type?has_content>\r\n <#--顶级栏目（单个）-->\r\n <#if type==\"top\">\r\n and id=(select left(category_parent_id,LOCATE(\",\",category_parent_id)-1) from cms_category where category_id = ${_typeid})\r\n <#elseif type==\"nav\">\r\n and(category_id=0 or category_id is null)\r\n <#--同级栏目（多个）-->\r\n <#elseif type==\"level\">\r\n and\r\n <#if _typeid?has_content>\r\n category_id=(select category_id from cms_category where id=${_typeid})\r\n <#else>\r\n 1=1\r\n \r\n <#--当前栏目（单个）-->\r\n <#elseif type==\"self\">\r\n and \r\n <#if _typeid?has_content>\r\n id=${_typeid}\r\n <#else>\r\n 1=1\r\n \r\n <#--当前栏目的所属栏目（多个）-->\r\n <#elseif type==\"path\">\r\n and \r\n <#if _typeid?has_content>\r\n id in (<#if column?? && column.categoryParentId??>${column.categoryParentId},${_typeid})\r\n <#else>\r\n 1=1\r\n \r\n <#--子栏目（多个）-->\r\n <#elseif type==\"son\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id=${_typeid}\r\n <#else>\r\n 1=1\r\n \r\n <#--上一级栏目没有则取当前栏目（单个）-->\r\n <#elseif type==\"parent\">\r\n and \r\n <#if _typeid?has_content>\r\n <#if column?? && column.categoryId??>\r\n id=${column.categoryId}\r\n <#else>\r\n id=${_typeid}\r\n \r\n <#else>\r\n 1=1\r\n \r\n <#--子栏目或同级栏目（多个）-->\r\n <#elseif type==\"sonOrLevel\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id= if((SELECT count(*) FROM cms_category\r\n WHERE id=${_typeid})>0,${_typeid},(select id from cms_category where id=${_typeid}))\r\n <#else>\r\n 1=1\r\n \r\n \r\n<#else> <#--默认son-->\r\n and\r\n <#if _typeid?has_content>\r\n category_id=${_typeid}\r\n <#else>\r\n (category_id=0 or category_id is null)\r\n \r\n\r\n<#--字段排序-->\r\n <#if orderby?? >\r\n ORDER BY \r\n <#if orderby==\"date\"> category_datetime\r\n <#elseif orderby==\"sort\"> category_sort\r\n <#else>cms_content.id\r\n <#else>\r\n ORDER BY id\r\n \r\n <#if order?? >\r\n <#if order==\"desc\"> desc\r\n <#if order==\"asc\"> asc\r\n ', 1);
+INSERT INTO `mdiy_tag_sql` VALUES (6, 4, '<#assign _typeid=\"\"/>\r\n<#if column?? && column.id?? && column.id?number gt 0>\r\n <#assign _typeid=\"${column.id}\">\r\n\r\n<#if typeid??>\r\n <#assign _typeid=\"${typeid}\">\r\n\r\nselect \r\n @rownum := @rownum + 1 AS typeindex,\r\n id,\r\n id as typeid,\r\n category_title as typetitle,\r\n <#--返回父id集合-->\r\n category_parent_id as pids,\r\n <#--栏目选中的样式-->\r\n IF(<#if _typeid?has_content>${_typeid}<#else>0 = id ,\"${class!\'\'}\",\"\") as class,\r\n <#--动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", id) as typelink,\r\n <#else>\r\n CONCAT(category_path,\"/index.html\") as typelink,\r\n \r\n category_keyword as typekeyword,\r\n category_diy_url as typeurl,\r\n category_flag as flag,\r\n category_descrip as typedescrip,\r\n category_img as typelitpic \r\n(select count(*) from cms_category c where c.category_id=typeid and c.del=0) as childsize,\r\n from (SELECT @rownum := 0) r,cms_category \r\n where \r\n cms_category.del=0 \r\n <#--根据站点编号查询-->\r\n <#if appId?? >\r\n and cms_category.app_id=${appId}\r\n \r\n <#--栏目属性-->\r\n <#if flag?? >\r\n and category_flag like CONCAT(\'%\',\'${flag}\',\'%\') \r\n \r\n <#if noflag?? >\r\n and category_flag not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n \r\n<#if type?has_content>\r\n <#--顶级栏目（单个）-->\r\n <#if type==\"top\">\r\n and id=(select left(category_parent_id,LOCATE(\",\",category_parent_id)-1) from cms_category where category_id = ${_typeid})\r\n <#elseif type==\"nav\">\r\n and(category_id=0 or category_id is null)\r\n <#--同级栏目（多个）-->\r\n <#elseif type==\"level\">\r\n and\r\n <#if _typeid?has_content>\r\n category_id=(select category_id from cms_category where id=${_typeid})\r\n <#else>\r\n 1=1\r\n \r\n <#--当前栏目（单个）-->\r\n <#elseif type==\"self\">\r\n and \r\n <#if _typeid?has_content>\r\n id=${_typeid}\r\n <#else>\r\n 1=1\r\n \r\n <#--当前栏目的所属栏目（多个）-->\r\n <#elseif type==\"path\">\r\n and \r\n <#if _typeid?has_content>\r\n id in (<#if column?? && column.categoryParentId??>${column.categoryParentId},${_typeid})\r\n <#else>\r\n 1=1\r\n \r\n <#--子栏目（多个）-->\r\n <#elseif type==\"son\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id=${_typeid}\r\n <#else>\r\n 1=1\r\n \r\n <#--上一级栏目没有则取当前栏目（单个）-->\r\n <#elseif type==\"parent\">\r\n and \r\n <#if _typeid?has_content>\r\n <#if column?? && column.categoryId??>\r\n id=${column.categoryId}\r\n <#else>\r\n id=${_typeid}\r\n \r\n <#else>\r\n 1=1\r\n \r\n <#--子栏目或同级栏目（多个）-->\r\n <#elseif type==\"sonOrLevel\">\r\n and \r\n <#if _typeid?has_content>\r\n category_id= if((SELECT count(*) FROM cms_category\r\n WHERE id=${_typeid})>0,${_typeid},(select id from cms_category where id=${_typeid}))\r\n <#else>\r\n 1=1\r\n \r\n \r\n<#else> <#--默认son-->\r\n and\r\n <#if _typeid?has_content>\r\n category_id=${_typeid}\r\n <#else>\r\n (category_id=0 or category_id is null)\r\n \r\n\r\n<#--字段排序-->\r\n <#if orderby?? >\r\n ORDER BY \r\n <#if orderby==\"date\"> category_datetime\r\n <#elseif orderby==\"sort\"> category_sort\r\n <#else>cms_content.id\r\n <#else>\r\n ORDER BY id\r\n \r\n <#if order?? >\r\n <#if order==\"desc\"> desc\r\n <#if order==\"asc\"> asc\r\n ', 1);
INSERT INTO `mdiy_tag_sql` VALUES (7, 5, 'select \r\nAPP_NAME as name,\r\napp_logo as logo,\r\napp_keyword as keyword,\r\napp_description as descrip,\r\napp_copyright as copyright,\r\n<#--动态解析 -->\r\n<#if isDo?? && isDo>\r\n\"${url}\" as url,\r\n\"${url}\" as host,\r\n<#--使用地址栏的域名 -->\r\n<#elseif url??>\r\nCONCAT(\"${url}\",\"/${html}/\",app_id,\"/<#if m??>${m}\") as url,\r\n\"${url}\" as host,\r\n<#else>\r\nCONCAT(REPLACE(REPLACE(TRIM(substring_index(app_url,\"\\n\",1)), CHAR(10),\'\'), CHAR(13),\'\'),\"/html/\",app_id,\"/<#if m??>${m}\") as url,\r\nREPLACE(REPLACE(TRIM(substring_index(app_url,\"\\n\",1)), CHAR(10),\'\'), CHAR(13),\'\') as host,\r\n\r\nCONCAT(\"templets/\",app_id,\"/\",<#if m??>CONCAT(app_style,\"/${m}\")<#else>app_style) as style <#-- 判断是否为手机端 -->\r\nfrom app where app_id = ${appId} limit 1', 1);
INSERT INTO `mdiy_tag_sql` VALUES (8, 7, 'SELECT \r\ncms_content.id as id,\r\nleft(content_title,${titlelen?default(40)}) as title,\r\ncontent_title as fulltitle,\r\ncontent_author as author, \r\ncontent_source as source, \r\ncontent_details as content,\r\ncategory_title as typetitle,\r\ncms_category.id as typeid,\r\ncategory_img AS typelitpic,\r\n<#--动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/${modelName}/list.do?typeid=\", category.id) as typelink,\r\n<#else>\r\n(SELECT \"index.html\") as typelink,\r\n\r\ncontent_img as litpic,\r\n<#--内容页动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/mcms/view.do?id=\", cms_content.id) as link,\r\n<#else>\r\ncontent_url AS link,\r\n\r\ncontent_datetime as date,\r\ncontent_description as descrip,\r\nCONCAT(\"\") as hit,\r\ncontent_type as flag,\r\ncategory_title as typetitle,\r\n<#if tableName??>${tableName}.*,\r\ncontent_keyword as keyword\r\nFROM cms_content\r\nLEFT JOIN cms_category ON content_category_id=cms_category.id \r\n<#--判断是否有自定义模型表-->\r\n<#if tableName??>left join ${tableName} on ${tableName}.link_id=cms_content.id\r\nWHERE \r\n1=1\r\n<#if id??> and cms_content.id=${id}', 1);
INSERT INTO `mdiy_tag_sql` VALUES (9, 8, '<#assign select=\"(SELECT \'\')\"/>\r\n<#if orderby?? >\r\n <#if orderby==\"date\"> \r\n <#assign _orderby=\"content_datetime\">\r\n <#elseif orderby==\"updatedate\">\r\n <#assign _orderby=\"content_updatetime\">\r\n <#elseif orderby==\"hit\"> \r\n <#assign _orderby=\"content_hit\">\r\n <#elseif orderby==\"sort\">\r\n <#assign _orderby=\"content_sort\">\r\n <#else><#assign _orderby=\"cms_content.id\">\r\n <#else>\r\n <#assign _orderby=\"cms_content.id\">\r\n \r\n<#if (pageTag.preId) gt 0>\r\nSELECT \r\ncms_content.id as id,\r\nleft(content_title,${titlelen?default(40)}) as title,\r\ncontent_title as fulltitle,\r\ncontent_author as author, \r\ncontent_source as source, \r\ncontent_details as content,\r\ncategory.category_title as typename,\r\ncategory.category_id as typeid,\r\n(SELECT \"index.html\") as typelink,\r\ncontent_img as litpic,\r\n<#--内容页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", cms_content.id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n <#else>\r\n CONCAT(category_path,\"/\",cms_content.id,\".html\") AS link,\r\n \r\ncontent_datetime as date,\r\ncontent_description as descrip,\r\ncontent_hit as hit,\r\ncontent_type as flag,\r\ncontent_keyword as keyword \r\nFROM cms_content \r\nLEFT JOIN cms_category as category ON content_category_id=category.id \r\nWHERE cms_content.id=${pageTag.preId}\r\n<#else>\r\nSELECT \r\n${select} as id,\r\n${select} as title,\r\n${select} as fulltitle,\r\n${select} as author, \r\n${select} as source, \r\n${select} as content,\r\n${select} as typename,\r\n${select} as typeid,\r\n${select} as typelink,\r\n${select} as litpic,\r\n${select} as link,\r\n${select} as date,\r\n${select} as descrip,\r\n${select} as hit,\r\n${select} as flag,\r\n${select} as keyword FROM cms_content\r\n', NULL);
@@ -676,7 +693,6 @@ CREATE TABLE `role` (
-- ----------------------------
-- Records of role
-- ----------------------------
-INSERT INTO `role` VALUES (1, '超级管理员', 0, NULL);
INSERT INTO `role` VALUES (48, 'msopen', 57, 1);
-- ----------------------------
@@ -696,7 +712,6 @@ CREATE TABLE `role_model` (
-- ----------------------------
-- Records of role_model
-- ----------------------------
-INSERT INTO `role_model` VALUES (NULL, NULL);
INSERT INTO `role_model` VALUES (23, 48);
INSERT INTO `role_model` VALUES (84, 48);
INSERT INTO `role_model` VALUES (86, 48);
@@ -798,6 +813,18 @@ CREATE TABLE `system_log` (
`create_date` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`create_by` int(11) NULL DEFAULT NULL COMMENT '创建人',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1313 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统日志' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 1321 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统日志' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of system_log
+-- ----------------------------
+INSERT INTO `system_log` VALUES (1313, NULL, 'success', '{\n \"result\":true,\n \"code\":200,\n \"data\":{\n \"createBy\":0,\n \"del\":0,\n \"fieldMap\":{\n \"phone\":\"phone\",\n \"name\":\"name\",\n \"words\":\"words\"\n },\n \"id\":\"41\",\n \"modelAppId\":1,\n \"modelCustomType\":\"post\",\n \"modelField\":\"[\\r\\n{\\r\\n \\\"model\\\":\\\"name\\\",\\r\\n \\\"key\\\":\\\"name\\\",\\r\\n \\\"javaType\\\":\\\"String\\\",\\r\\n \\\"jdbcType\\\":\\\"VARCHAR\\\",\\r\\n \\\"name\\\":\\\"姓名\\\",\\r\\n \\\"type\\\":\\\"input\\\"\\r\\n }\\r\\n ,{\\r\\n \\\"model\\\":\\\"phone\\\",\\r\\n \\\"key\\\":\\\"phone\\\",\\r\\n \\\"javaType\\\":\\\"String\\\",\\r\\n \\\"jdbcType\\\":\\\"VARCHAR\\\",\\r\\n \\\"name\\\":\\\"手机\\\",\\r\\n \\\"type\\\":\\\"input\\\"\\r\\n }\\r\\n ,{\\r\\n \\\"model\\\":\\\"words\\\",\\r\\n \\\"key\\\":\\\"words\\\",\\r\\n \\\"javaType\\\":\\\"String\\\",\\r\\n \\\"jdbcType\\\":\\\"VARCHAR\\\",\\r\\n \\\"name\\\":\\\"留言\\\",\\r\\n \\\"type\\\":\\\"textarea\\\"\\r\\n }\\r\\n]\",\n \"modelJson\":\"{\\\"html\\\":\\\"\\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n\\\",\\\"script\\\":\\\" var custom_model = Vue.component(\\\\\\\"custom-model\\\\\\\",{\\\\r\\\\n el: \'#custom-model\',\\\\r\\\\n data() {\\\\r\\\\n return {\\\\r\\\\n modelId:0,\\\\r\\\\n //表单数据\\\\r\\\\n form: {\\\\r\\\\n linkId:0,\\\\r\\\\n // 姓名\\\\r\\\\n name:\'\',\\\\r\\\\n // 手机\\\\r\\\\n phone:\'\',\\\\r\\\\n // 留言\\\\r\\\\n words:\'\',\\\\r\\\\n },\\\\r\\\\n rules:{\\\\r\\\\n },\\\\r\\\\n\\\\r\\\\n }\\\\r\\\\n },\\\\r\\\\n watch:{\\\\r\\\\n },\\\\r\\\\n computed:{\\\\r\\\\n },\\\\r\\\\n methods: {\\\\r\\\\n validate(){\\\\r\\\\n var b = false\\\\r\\\\n this.$refs.form.validate((valid) => {\\\\r\\\\n b = valid;\\\\r\\\\n });\\\\r\\\\n return b;\\\\r\\\\n },\\\\r\\\\n save() {\\\\r\\\\n var that = this;\\\\r\\\\n var success = false;\\\\r\\\\n var url = ms.manager + \\\\\\\"/mdiy/model/data/save.do\\\\\\\"\\\\r\\\\n if (that.form.id > 0) {\\\\r\\\\n url = ms.manager + \\\\\\\"/mdiy/model/data/update.do\\\\\\\";\\\\r\\\\n }\\\\r\\\\n this.$refs.form.validate((valid) => {\\\\r\\\\n if (valid) {\\\\r\\\\n var data = JSON.parse(JSON.stringify(that.form));\\\\r\\\\n data.modelId = that.modelId;\\\\r\\\\n ms.http.post(url, data).then(function (res) {\\\\r\\\\n if (res.data.id > 0) {\\\\r\\\\n success = true;\\\\r\\\\n }\\\\r\\\\n });\\\\r\\\\n } else {\\\\r\\\\n return false;\\\\r\\\\n }\\\\r\\\\n })\\\\r\\\\n return success;\\\\r\\\\n },\\\\r\\\\n //获取当前意见反馈\\\\r\\\\n get(id) {\\\\r\\\\n var that = this;\\\\r\\\\n ms.http.get(ms.manager + \\\\\\\"/mdiy/model/data.do\\\\\\\", {modelId:this.modelId,linkId:id}).then(function (res) {\\\\r\\\\n if(res.result&&res.data){\\\\r\\\\n that.form = res.data;\\\\r\\\\n }\\\\r\\\\n }).catch(function (err) {\\\\r\\\\n console.log(err);\\\\r\\\\n });\\\\r\\\\n },\\\\r\\\\n },\\\\r\\\\n created() {\\\\r\\\\n this.get(this.form.linkId);\\\\r\\\\n }\\\\r\\\\n });\\\\r\\\\n\\\\r\\\\n\\\"}\",\n \"modelName\":\"意见反馈\",\n \"modelTableName\":\"mdiy_post_feedback\",\n \"modelType\":\"\",\n \"sqlWhereList\":[],\n \"updateBy\":0\n }\n}', '{\n \"modelType\":[\"\"],\n \"modelJson\":[\"{\\\"html\\\":\\\"\\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n \\\\r\\\\n\\\",\\\"field\\\":\\\"[\\\\r\\\\n{\\\\r\\\\n \\\\\\\"model\\\\\\\":\\\\\\\"name\\\\\\\",\\\\r\\\\n \\\\\\\"key\\\\\\\":\\\\\\\"name\\\\\\\",\\\\r\\\\n \\\\\\\"javaType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\r\\\\n \\\\\\\"jdbcType\\\\\\\":\\\\\\\"VARCHAR\\\\\\\",\\\\r\\\\n \\\\\\\"name\\\\\\\":\\\\\\\"姓名\\\\\\\",\\\\r\\\\n \\\\\\\"type\\\\\\\":\\\\\\\"input\\\\\\\"\\\\r\\\\n }\\\\r\\\\n ,{\\\\r\\\\n \\\\\\\"model\\\\\\\":\\\\\\\"phone\\\\\\\",\\\\r\\\\n \\\\\\\"key\\\\\\\":\\\\\\\"phone\\\\\\\",\\\\r\\\\n \\\\\\\"javaType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\r\\\\n \\\\\\\"jdbcType\\\\\\\":\\\\\\\"VARCHAR\\\\\\\",\\\\r\\\\n \\\\\\\"name\\\\\\\":\\\\\\\"手机\\\\\\\",\\\\r\\\\n \\\\\\\"type\\\\\\\":\\\\\\\"input\\\\\\\"\\\\r\\\\n }\\\\r\\\\n ,{\\\\r\\\\n \\\\\\\"model\\\\\\\":\\\\\\\"words\\\\\\\",\\\\r\\\\n \\\\\\\"key\\\\\\\":\\\\\\\"words\\\\\\\",\\\\r\\\\n \\\\\\\"javaType\\\\\\\":\\\\\\\"String\\\\\\\",\\\\r\\\\n \\\\\\\"jdbcType\\\\\\\":\\\\\\\"VARCHAR\\\\\\\",\\\\r\\\\n \\\\\\\"name\\\\\\\":\\\\\\\"留言\\\\\\\",\\\\r\\\\n \\\\\\\"type\\\\\\\":\\\\\\\"textarea\\\\\\\"\\\\r\\\\n }\\\\r\\\\n]\\\",\\\"title\\\":\\\"意见反馈\\\",\\\"script\\\":\\\" var custom_model = Vue.component(\\\\\\\"custom-model\\\\\\\",{\\\\r\\\\n el: \'#custom-model\',\\\\r\\\\n data() {\\\\r\\\\n return {\\\\r\\\\n modelId:0,\\\\r\\\\n //表单数据\\\\r\\\\n form: {\\\\r\\\\n linkId:0,\\\\r\\\\n // 姓名\\\\r\\\\n name:\'\',\\\\r\\\\n // 手机\\\\r\\\\n phone:\'\',\\\\r\\\\n // 留言\\\\r\\\\n words:\'\',\\\\r\\\\n },\\\\r\\\\n rules:{\\\\r\\\\n },\\\\r\\\\n\\\\r\\\\n }\\\\r\\\\n },\\\\r\\\\n watch:{\\\\r\\\\n },\\\\r\\\\n computed:{\\\\r\\\\n },\\\\r\\\\n methods: {\\\\r\\\\n validate(){\\\\r\\\\n var b = false\\\\r\\\\n this.$refs.form.validate((valid) => {\\\\r\\\\n b = valid;\\\\r\\\\n });\\\\r\\\\n return b;\\\\r\\\\n },\\\\r\\\\n save() {\\\\r\\\\n var that = this;\\\\r\\\\n var success = false;\\\\r\\\\n var url = ms.manager + \\\\\\\"/mdiy/model/data/save.do\\\\\\\"\\\\r\\\\n if (that.form.id > 0) {\\\\r\\\\n url = ms.manager + \\\\\\\"/mdiy/model/data/update.do\\\\\\\";\\\\r\\\\n }\\\\r\\\\n this.$', '内网IP', '/ms-mcms/ms/mdiy/post/importJson.do', 'msopen', 'manage', 'POST', 'net.mingsoft.mdiy.action.PostAction.importJson()', 'insert', '127.0.0.1', '导入', 0, NULL, NULL, '2020-01-07 14:05:43', NULL);
+INSERT INTO `system_log` VALUES (1314, NULL, 'success', '{\n \"result\":true,\n \"code\":200\n}', '{\n \"modelId\":[\"41\"],\n \"ids\":[\"1\"]\n}', '内网IP', '/ms-mcms/ms/mdiy/post/data/delete.do', 'msopen', 'manage', 'POST', 'net.mingsoft.mdiy.action.PostAction.delete()', 'delete', '127.0.0.1', '批量删除自数据接口', 0, NULL, NULL, '2020-01-07 14:09:56', NULL);
+INSERT INTO `system_log` VALUES (1315, NULL, 'success', '{\n \"result\":true,\n \"code\":200,\n \"data\":{\n \"appId\":1,\n \"contentAuthor\":\"\",\n \"contentCategoryId\":\"149\",\n \"contentDatetime\":\"2018-07-09 11:12:00\",\n \"contentDescription\":\"x\",\n \"contentDetails\":\"洛龙区人民政府门户网作为洛阳市洛龙区电子政务（网上行政）建设的重要组成部分，是政府信息公开的法定载体，是政府面向社会服务的平台，是公众与政府交流互动的桥梁，是宣传洛龙的主要窗口，对于促进政府信息公开、推进依法行政、接受公众监督、改进行政管理、全面履行政府职能和建设阳光政府具有重要意义。
\",\n \"contentDisplay\":\"0\",\n \"contentHit\":0,\n \"contentImg\":\"[{\\\"path\\\":\\\"/upload/1//article/1531105970322.jpg\\\",\\\"url\\\":\\\"/ms-mcms/upload/1//article/1531105970322.jpg\\\",\\\"uid\\\":1578390819577,\\\"status\\\":\\\"success\\\"}]\",\n \"contentKeyword\":\"x\",\n \"contentSort\":0,\n \"contentSource\":\"http://www.luolong.gov.cn/ \",\n \"contentTitle\":\"洛阳洛龙\",\n \"contentType\":\"f\",\n \"contentUrl\":\"/149\\\\222.html\",\n \"createBy\":0,\n \"del\":0,\n \"id\":\"222\",\n \"order\":\"\",\n \"remarks\":\"\",\n \"sqlWhereList\":[],\n \"updateBy\":0,\n \"updateDate\":\"2020-01-07 17:53:47\"\n }\n}', '{\n \"createDate\":[\"\"],\n \"id\":[\"222\"],\n \"remarks\":[\"\"],\n \"updateDate\":[\"\"],\n \"order\":[\"\"],\n \"contentTitle\":[\"洛阳洛龙\"],\n \"contentCategoryId\":[\"149\"],\n \"contentType\":[\"f\"],\n \"contentDisplay\":[\"0\"],\n \"contentAuthor\":[\"\"],\n \"contentSource\":[\"http://www.luolong.gov.cn/ \"],\n \"contentDatetime\":[\"2018-07-09 11:12:00\"],\n \"contentSort\":[\"0\"],\n \"contentImg\":[\"[{\\\"path\\\":\\\"/upload/1//article/1531105970322.jpg\\\",\\\"url\\\":\\\"/ms-mcms/upload/1//article/1531105970322.jpg\\\",\\\"uid\\\":1578390819577,\\\"status\\\":\\\"success\\\"}]\"],\n \"contentDescription\":[\"x\"],\n \"contentKeyword\":[\"x\"],\n \"contentDetails\":[\"洛龙区人民政府门户网作为洛阳市洛龙区电子政务（网上行政）建设的重要组成部分，是政府信息公开的法定载体，是政府面向社会服务的平台，是公众与政府交流互动的桥梁，是宣传洛龙的主要窗口，对于促进政府信息公开、推进依法行政、接受公众监督、改进行政管理、全面履行政府职能和建设阳光政府具有重要意义。
\"],\n \"contentUrl\":[\"/149\\\\222.html\"],\n \"appId\":[\"1\"],\n \"contentHit\":[\"0\"]\n}', '内网IP', '/ms-mcms/ms/cms/content/update.do', 'msopen', 'manage', 'POST', 'net.mingsoft.cms.action.ContentAction.update()', 'update', '127.0.0.1', '更新文章', 0, NULL, NULL, '2020-01-07 17:53:47', NULL);
+INSERT INTO `system_log` VALUES (1316, NULL, 'success', '{\n \"result\":true,\n \"code\":200,\n \"data\":{\n \"appId\":1,\n \"contentAuthor\":\"\",\n \"contentCategoryId\":\"149\",\n \"contentDatetime\":\"2018-07-09 11:12:00\",\n \"contentDescription\":\"\",\n \"contentDetails\":\"洛龙区人民政府门户网作为洛阳市洛龙区电子政务（网上行政）建设的重要组成部分，是政府信息公开的法定载体，是政府面向社会服务的平台，是公众与政府交流互动的桥梁，是宣传洛龙的主要窗口，对于促进政府信息公开、推进依法行政、接受公众监督、改进行政管理、全面履行政府职能和建设阳光政府具有重要意义。
\",\n \"contentDisplay\":\"0\",\n \"contentHit\":0,\n \"contentImg\":\"[{\\\"path\\\":\\\"/upload/1//article/1531105970322.jpg\\\",\\\"url\\\":\\\"/ms-mcms/upload/1//article/1531105970322.jpg\\\",\\\"uid\\\":1578390819577,\\\"status\\\":\\\"success\\\"}]\",\n \"contentKeyword\":\"\",\n \"contentSort\":0,\n \"contentSource\":\"http://www.luolong.gov.cn/ \",\n \"contentTitle\":\"洛阳洛龙\",\n \"contentType\":\"f\",\n \"contentUrl\":\"/149\\\\222.html\",\n \"createBy\":0,\n \"del\":0,\n \"id\":\"222\",\n \"order\":\"\",\n \"remarks\":\"\",\n \"sqlWhereList\":[],\n \"updateBy\":0,\n \"updateDate\":\"2020-01-07 17:53:54\"\n }\n}', '{\n \"createDate\":[\"\"],\n \"id\":[\"222\"],\n \"remarks\":[\"\"],\n \"updateDate\":[\"2020-01-07 17:53:47\"],\n \"order\":[\"\"],\n \"contentTitle\":[\"洛阳洛龙\"],\n \"contentCategoryId\":[\"149\"],\n \"contentType\":[\"f\"],\n \"contentDisplay\":[\"0\"],\n \"contentAuthor\":[\"\"],\n \"contentSource\":[\"http://www.luolong.gov.cn/ \"],\n \"contentDatetime\":[\"2018-07-09 11:12:00\"],\n \"contentSort\":[\"0\"],\n \"contentImg\":[\"[{\\\"path\\\":\\\"/upload/1//article/1531105970322.jpg\\\",\\\"url\\\":\\\"/ms-mcms/upload/1//article/1531105970322.jpg\\\",\\\"uid\\\":1578390819577,\\\"status\\\":\\\"success\\\"}]\"],\n \"contentDescription\":[\"\"],\n \"contentKeyword\":[\"\"],\n \"contentDetails\":[\"洛龙区人民政府门户网作为洛阳市洛龙区电子政务（网上行政）建设的重要组成部分，是政府信息公开的法定载体，是政府面向社会服务的平台，是公众与政府交流互动的桥梁，是宣传洛龙的主要窗口，对于促进政府信息公开、推进依法行政、接受公众监督、改进行政管理、全面履行政府职能和建设阳光政府具有重要意义。
\"],\n \"contentUrl\":[\"/149\\\\222.html\"],\n \"appId\":[\"1\"],\n \"contentHit\":[\"0\"]\n}', '内网IP', '/ms-mcms/ms/cms/content/update.do', 'msopen', 'manage', 'POST', 'net.mingsoft.cms.action.ContentAction.update()', 'update', '127.0.0.1', '更新文章', 0, NULL, NULL, '2020-01-07 17:53:55', NULL);
+INSERT INTO `system_log` VALUES (1317, '\r\n### Error updating database. Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'page_type\' in \'field list\'\r\n### The error may involve net.mingsoft.mdiy.dao.IPageDao.saveEntity-Inline\r\n### The error occurred while setting parameters\r\n### SQL: insert into mdiy_page ( page_app_id, page_path, page_title, page_key, page_type, CREATE_DATE ) values ( ?, ?, ?, ?, ?, ? )\r\n### Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'page_type\' in \'field list\'\n; bad SQL grammar []; nested exception is com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'page_type\' in \'field list\'', 'error', 'null', '{\n \"pageTitle\":[\"xxx\"],\n \"pagePath\":[\"footer.htm\"],\n \"pageKey\":[\"xxx\"],\n \"pageType\":[\"cms\"]\n}', '内网IP', '/ms-mcms/ms/mdiy/page/save.do', 'msopen', 'manage', 'POST', 'net.mingsoft.mdiy.action.PageAction.save()', 'insert', '127.0.0.1', '保存自定义页面接口', 0, NULL, NULL, '2020-01-07 17:55:01', NULL);
+INSERT INTO `system_log` VALUES (1318, NULL, 'success', '{\n \"result\":true,\n \"code\":200,\n \"data\":{\n \"createBy\":0,\n \"createDate\":\"2020-01-07 18:00:48\",\n \"del\":0,\n \"pageAppId\":1,\n \"pageId\":5,\n \"pageKey\":\"index\",\n \"pagePath\":\"index.htm\",\n \"pageTitle\":\"index\",\n \"pageType\":\"cms\",\n \"sqlWhereList\":[],\n \"updateBy\":0\n }\n}', '{\n \"pageTitle\":[\"index\"],\n \"pagePath\":[\"index.htm\"],\n \"pageKey\":[\"index\"],\n \"pageType\":[\"cms\"]\n}', '内网IP', '/ms-mcms/ms/mdiy/page/save.do', 'msopen', 'manage', 'POST', 'net.mingsoft.mdiy.action.PageAction.save()', 'insert', '127.0.0.1', '保存自定义页面接口', 0, NULL, NULL, '2020-01-07 18:00:49', NULL);
+INSERT INTO `system_log` VALUES (1319, '\r\n### Error updating database. Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'UPDATE_DATE\' in \'field list\'\r\n### The error may involve net.mingsoft.mdiy.dao.IPageDao.updateEntity-Inline\r\n### The error occurred while setting parameters\r\n### SQL: update mdiy_page SET page_app_id=?, page_path=?, page_title=?, page_key=?, page_type=?, CREATE_DATE=?, UPDATE_DATE=? where page_id = ?\r\n### Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'UPDATE_DATE\' in \'field list\'\n; bad SQL grammar []; nested exception is com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'UPDATE_DATE\' in \'field list\'', 'error', 'null', '{\n \"createDate\":[\"2020-01-07 18:00:49\"],\n \"id\":[\"\"],\n \"remarks\":[\"\"],\n \"updateDate\":[\"\"],\n \"order\":[\"\"],\n \"pageId\":[\"5\"],\n \"pageModelId\":[\"\"],\n \"pageAppId\":[\"1\"],\n \"pagePath\":[\"index.htm\"],\n \"pageTitle\":[\"index\"],\n \"pageKey\":[\"mcms\"],\n \"pageType\":[\"cms\"]\n}', '内网IP', '/ms-mcms/ms/mdiy/page/update.do', 'msopen', 'manage', 'POST', 'net.mingsoft.mdiy.action.PageAction.update()', 'update', '127.0.0.1', '更新自定义页面接口', 0, NULL, NULL, '2020-01-07 18:01:03', NULL);
+INSERT INTO `system_log` VALUES (1320, '\r\n### Error updating database. Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'del\' in \'where clause\'\r\n### The error may involve defaultParameterMap\r\n### The error occurred while setting parameters\r\n### SQL: delete from mdiy_page WHERE page_id in (?) and del != 3\r\n### Cause: com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'del\' in \'where clause\'\n; bad SQL grammar []; nested exception is com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException: Unknown column \'del\' in \'where clause\'', 'error', 'null', '[\n {\n \"createBy\":0,\n \"createDate\":\"2020-01-07 18:00:49\",\n \"del\":0,\n \"pageAppId\":1,\n \"pageId\":5,\n \"pageKey\":\"index\",\n \"pagePath\":\"index.htm\",\n \"pageTitle\":\"index\",\n \"pageType\":\"cms\",\n \"sqlWhereList\":[],\n \"updateBy\":0\n }\n]', '内网IP', '/ms-mcms/ms/mdiy/page/delete.do', 'msopen', 'manage', 'POST', 'net.mingsoft.mdiy.action.PageAction.delete()', 'delete', '127.0.0.1', '批量删除自定义页面接口', 0, NULL, NULL, '2020-01-07 18:02:23', NULL);
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
index 346ed846..ab92dc73 100644
--- a/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
@@ -49,7 +49,7 @@
category_manager_id,
app_id,
dict_id,
- category_flag,
+ category_flag,
category_path,
category_parent_id,
create_by,
@@ -74,7 +74,7 @@
#{categoryManagerId},
#{appId},
#{dictId},
- #{categoryFlag},
+ #{categoryFlag},
#{categoryPath},
#{categoryParentId},
#{createBy},
@@ -105,7 +105,7 @@
category_manager_id=#{categoryManagerId},
app_id=#{appId},
dict_id=#{dictId},
- category_flag=#{categoryFlag},
+ category_flag=#{categoryFlag},
category_path=#{categoryPath},
create_by=#{createBy},
create_date=#{createDate},
diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
index 1e680907..d0fd41b5 100644
--- a/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
+++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.xml
@@ -61,7 +61,7 @@
content_title,
content_category_id,
- content_type,
+ content_type,
content_display,
content_author,
content_source,
@@ -110,7 +110,7 @@
content_title=#{contentTitle},
content_category_id=#{contentCategoryId},
- content_type=#{contentType},
+ content_type=#{contentType},
content_display=#{contentDisplay},
content_author=#{contentAuthor},
content_source=#{contentSource},
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
index ae738281..ab65da89 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -114,6 +114,9 @@
+
+
+
列表模板
@@ -133,6 +136,22 @@
+
+
+
+
+
+
+
+
+
栏目关键字
@@ -250,11 +269,14 @@
categoryDiyUrl: '',
// 栏目管理的内容模型id
mdiyModelId: '',
+ //栏目字典
+ categoryFlag: []
},
categoryTypeOptions: [{"value": "1", "label": "列表"}, {"value": "2", "label": "封面"}],
categoryListUrlOptions: [],
categoryUrlOptions: [],
mdiyModelIdOptions: [],
+ categoryFlagOptions: [],
rules: {
// 栏目管理名称
categoryTitle: [{
@@ -331,6 +353,10 @@
if (data.categoryId == '0') {
data.categoryId = '';
}
+ if(data.categoryFlag){
+ data.categoryFlag = data.categoryFlag.join(',');
+ }
+
data.categoryImg = JSON.stringify(data.categoryImg);
ms.http.post(url, data).then(function (data) {
if (data.result) {
@@ -369,6 +395,9 @@
var that = this;
ms.http.get(ms.manager + "/cms/category/get.do", {"id": id}).then(function (res) {
if (res.result && res.data) {
+ if(res.data.categoryFlag){
+ res.data.categoryFlag = res.data.categoryFlag.split(',');
+ }
if (res.data.categoryImg) {
res.data.categoryImg = JSON.parse(res.data.categoryImg);
res.data.categoryImg.forEach(function (value) {
@@ -431,6 +460,16 @@
this.form.categoryImg.splice(index, 1);
}
},
+ //获取categoryFlag数据源
+ categoryFlagOptionsGet() {
+ var that = this;
+ ms.http.get(ms.base+'/mdiy/dict/list.do', {dictType:'栏目属性',pageSize:99999}).then(function (res) {
+ that.categoryFlagOptions = res.rows;
+ }).catch(function (err) {
+ console.log(err);
+ });
+ },
+
//categoryImg文件上传完成回调
categoryImgSuccess: function (response, file, fileList) {
this.form.categoryImg.push({url: file.url, name: file.name, path: response, uid: file.uid});
@@ -446,12 +485,14 @@
this.form.categoryImg.splice(index, 1);
}
},
+
},
created() {
this.getColumnContentModelId();
this.getTree()
this.categoryListUrlOptionsGet();
this.categoryUrlOptionsGet();
+ this.categoryFlagOptionsGet();
this.form.id = ms.util.getParameter("id");
if (this.form.id) {
this.get(this.form.id);
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
index 02ef92c0..d5be65e5 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -397,7 +397,7 @@
ms.http.get(ms.manager + "/mdiy/model/get.do",{
id:this.currCategory.mdiyModelId
}).then(function (data) {
- if(data.data.id){
+ if(data.data && data.data.id){
that.rederModel(data.data,JSON.parse(data.data.modelJson))
}
})
diff --git a/src/main/webapp/WEB-INF/manager/main.ftl b/src/main/webapp/WEB-INF/manager/main.ftl
index e5b525b1..5887c228 100644
--- a/src/main/webapp/WEB-INF/manager/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/main.ftl
@@ -1,23 +1,2830 @@
-
-
-
-
- 铭飞CMS
- 后台主界面（开源版本）-副本
+ 欢迎使用铭飞产品 技术交流加群：①242805203 ②231212174（满） ③221335098（满） 或到官方论坛进行技术交流
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 文章管理
+
+
+
+
+
+
+
+
+
+ 栏目管理
+
+
+
+
+
+
+
+
+
+ 静态化
+
+
+
+
+
+
+
+
+
+ 管理员管理
+
+
+
+
+
+
+
+
+
+ 角色管理
+
+
+
+
+
+
+
+
+
+ 菜单管理
+
+
+
+
+
+
+
+
+
+ 模板管理
+
+
+
+
+
+
+
+
+
+ 应用设置
+
+
+
+
+
+
+
+
+
+
+ MMall
+
+
+
+
+ 单商户、多商户、社区商城
+
+
+
+
+
+
+
+
+ 微信
+
+
+
+
+ 可管理多个公众号
+
+
+
+
+
+
+
+
+ MApp
+
+
+
+
+ 安卓、IOS、小程序
+
+
+
+
+
+
+
+
+ 二次开发
+
+
+
+
+ 更优质的服务体验,高效率的开发团队
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 铭飞商城多商户功能现已正式上线试...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 铭飞MS平台（一）
+
+
+ 231212174
+
+
+
+
+
+
+
+
+
+
+
+ 铭飞MS平台（二）
+
+
+ 221335098
+
+
+
+
+
+
+
+
+
+
+
+ 铭飞MS平台（三）
+
+
+ 242805203
+
+
+
+
+
+
+
+
+
+
+
+ 铭飞MS平台（四）
+
+
+ 881894877
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 商务电话
+
+
+ 19970180163
+
+
+
+
+
+
+
+
+
+
+
+ 商务QQ
+
+
+ 3336073455
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+ 
+
+