diff --git a/doc/5.3.4-up-5.3.5.sql b/doc/5.3.4-up-5.3.5.sql
deleted file mode 100644
index 300ea7bb..00000000
--- a/doc/5.3.4-up-5.3.5.sql
+++ /dev/null
@@ -1,42 +0,0 @@
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
--- ----------------------------
--- Table structure for mdiy_tag
--- ----------------------------
-DROP TABLE IF EXISTS `mdiy_tag`;
-CREATE TABLE `mdiy_tag` (
- `id` int(11) NOT NULL AUTO_INCREMENT,
- `tag_name` varchar(255) DEFAULT NULL COMMENT '标签名称',
- `tag_type` varchar(255) DEFAULT NULL COMMENT '标签类型',
- `tag_sql` text COMMENT '标签sql',
- `tag_class` varchar(255) DEFAULT NULL COMMENT '标签类',
- `tag_description` varchar(255) 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 '删除标记',
- `NOT_DEL` int(1) DEFAULT '0' COMMENT '1为不能删除，主要用于系统默认数据,0为一般数据，主要是前端控制',
- PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='标签';
-
--- ----------------------------
--- Records of mdiy_tag
--- ----------------------------
-BEGIN;
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (3, 'arclist', 'list', '<#assign _typeid=\'\'/>\n<#assign _typetitle=\'\'/>\n<#-- 分页数，默认返回20条数据 -->\n<#assign _size=\'20\'/>\n<#if column?? && column.id?? && column.id?number gt 0>\n <#assign _typeid=\'${column.id}\'>\n\n<#if typeid??>\n <#assign _typeid=\'${typeid}\'>\n\n<#if typetitle??>\n <#assign _typetitle=\'${typetitle}\'>\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=\'cms_content.update_date\'>\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.content_datetime\'>\n \n<#else>\n <#assign _orderby=\'cms_content.content_datetime\'>\n\n\nSELECT\n cms_content.id AS \"id\",\n content_title AS \"title\",\n content_short_title AS \"shorttitle\",\n content_author AS \"author\",\n content_source AS \"source\",\n content_out_link AS \"outlink\",\n content_tags AS \"tags\",\n\n category.category_title AS \"typetitle\",\n category.category_short_title AS \"typeshorttitle\",\n category.id AS \"typeid\",\n category.category_path AS \"typepath\",\n category.category_img AS \"typelitpic\",\n category.category_ico AS \"typeico\",\n category.category_keyword as \"typekeyword\",\n category.top_id as \"topid\",\n category.category_id as \"parentid\",\n category.category_parent_ids as \"parentids\",\n category.category_type AS \"type\",\n <#--列表页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'${modelName}/list.do?style=${templateName!\"\"}&typeid=\', category.category_id) as \"typelink\",\n <#else>\n <#--栏目类型为链接-->\n <#if shortSwitch?? && shortSwitch>\n CONCAT(category.category_pinyin,\'.html\') AS \"typelink\",\n <#else>\n CONCAT(category.category_path,\'/index.html\') AS \"typelink\",\n \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 <#if isDo?? && isDo>\n CONCAT(\'${modelName}/view.do?style=${templateName!\"\"}&id=\', cms_content.id) as \"link\",\n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(cms_content.id,\'.html\') AS \"link\",\n <#else>\n CONCAT(CONCAT( category.category_path, \'/\' ), CONCAT(CASE category_type WHEN \'2\' THEN \'index\' ELSE cms_content.id END , \'.html\' )) as \"link\",\n \n \n <#if tableName??>${tableName}.*,\n content_datetime AS \"date\"\nFROM\n cms_content\nLEFT JOIN\n cms_category as category\nON cms_content.category_id = category.id\n<#--判断是否有自定义模型表-->\n<#if tableName??>\n LEFT JOIN ${tableName} ON ${tableName}.link_id=cms_content.id\n\nWHERE\n content_display=0\n and category_display=\'enable\'\n and cms_content.del=0\n\n<#--文章审核-->\n<#if contentApprove?? && contentApprove>\n and cms_content.progress_status=\'终审通过\'\n\n<#--根据站点编号查询-->\n<#if appId?? >\n and cms_content.app_id=${appId}\n and cms_content.id>0\n\n<#--判断是否有搜索分类集合，暂时移除 _typeid=\"\" 条件-->\n<#if search?? && !typeid??>\n and category_is_search=\'enable\'\n <#-- 文章标签 -->\n <#if search.content_tag??>and FIND_IN_SET(\'${search.content_tag}\',content_tags) > 0\n <#if search.categoryIds?has_content>\n and (\n <#list search.categoryIds?split(\",\") as item>\n <#if item?index gt 0>\n or\n \n (cms_content.category_id=${item}\n 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}\'\n \n and FIND_IN_SET(${item},CATEGORY_PARENT_IDS) > 0)\n )\n \n )\n \n <#--标题-->\n <#if search.content_title??> and content_title like CONCAT(CONCAT(\'%\',\'${search.content_title}\'),\'%\')\n <#--作者-->\n <#if search.content_author??> and content_author like CONCAT(CONCAT(\'%\',\'${search.content_author}\'),\'%\')\n <#--来源-->\n <#if search.content_source??> and content_source like CONCAT(CONCAT(\'%\',\'${search.content_source}\'),\'%\')\n <#--属性-->\n <#if search.content_type??>\n and(<#list search.content_type?split(\',\') as item>\n <#if item?index gt 0> or\n FIND_IN_SET(\'${item}\',cms_content.content_type) > 0\n )\n \n <#--描述-->\n <#if search.content_description??>\n and content_description like CONCAT(CONCAT(\'%\',\'${search.content_description}\'),\'%\')\n \n <#--关键字-->\n <#if search.content_keyword??> and content_keyword like CONCAT(CONCAT(\'%\',\'${search.content_keyword}\'),\'%\')\n <#--内容-->\n <#if search.content_details??> and content_details like CONCAT(CONCAT(\'%\',\'${search.content_details}\'),\'%\')\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 && _typeid?string != \'0\'>\n and (cms_content.category_id=${_typeid}\n 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}\'\n \n and FIND_IN_SET(${_typeid},CATEGORY_PARENT_IDS) > 0))\n <#elseif typeids?has_content>\n and (\n <#list typeids?split(\",\") as item>\n <#if item?index gt 0>\n or\n \n (cms_content.category_id=${item}\n 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}\'\n \n and FIND_IN_SET(${item},CATEGORY_PARENT_IDS) > 0)\n )\n \n )\n \n\n<#--判断搜索分类结束-->\n<#--标题-->\n<#if content_title??> and content_title like CONCAT(CONCAT(\'%\',\'${content_title}\'),\'%\')\n<#--作者-->\n<#if content_author??> and content_author like CONCAT(CONCAT(\'%\',\'${content_author}\'),\'%\')\n<#--来源-->\n<#if content_source??> and content_source like CONCAT(CONCAT(\'%\',\'${content_source}\'),\'%\')\n<#--属性-->\n<#if content_type??> and content_type like CONCAT(CONCAT(\'%\',\'${content_type}\'),\'%\')\n<#--描述-->\n<#if content_description??> and content_description like CONCAT(CONCAT(\'%\',\'${content_description}\'),\'%\')\n<#--关键字-->\n<#if content_keyword??> and content_keyword like CONCAT(CONCAT(\'%\',\'${content_keyword}\'),\'%\')\n<#--内容-->\n<#if content_details??> and content_details like CONCAT(CONCAT(\'%\',\'${content_details}\'),\'%\')\n<#--自定义顺序-->\n<#if content_sort??> and content_sort=${content_sort}\n<#--自定义模型-->\n<#if diyModel??>\n <#list diyModel as dm>\n <#assign json=\"${dm}\"?eval />\n and ${tableName}.${json.key} like CONCAT(CONCAT(\'%\',\'${json.value}\'),\'%\')\n \n\n<#--文章属性-->\n<#if flag?? >\n and(<#list flag?split(\',\') as item>\n <#if item?index gt 0> or\n FIND_IN_SET(\'${item}\',cms_content.content_type) > 0\n )\n\n<#if noflag??>\n and(<#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 ORDER BY\n <#if topflag??>\n CASE\n <#list topflag?split(\",\") as item>\n WHEN FIND_IN_SET(\'${item}\',cms_content.content_type)>0 THEN\n ${item?index}\n \n ELSE 100\n END,\n \n ${_orderby}\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 \n\n', NULL, '文章列表', NULL, NULL, NULL, NULL, 0, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (4, 'channel', 'list', '<#assign _typeid=\'0\'/>\n<#assign _size=\'9999\'/>\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<#if size??>\n <#assign _size=\'${size}\'>\n\n\nselect\n cms_category.id as \"id\",\n cms_category.id as \"typeid\",\n cms_category.category_title as \"typetitle\",\n cms_category.category_short_title as \"typeshorttitle\",\n <#--动态链接-->\n <#if isDo?? && isDo>\n IF(cms_category.category_type=2,CONCAT(\'${modelName}/view.do?style=${templateName!\"\"}&typeid=\', cms_category.id),CONCAT(\'${modelName}/list.do?style=${templateName!\"\"}&typeid=\', cms_category.id)) as \"typelink\",\n <#else>\n <#--栏目类型为链接-->\n <#if shortSwitch?? && shortSwitch>\n CONCAT(cms_category.category_pinyin,\'.html\') AS \"typelink\",\n <#else>\n CONCAT(cms_category.category_path,\'/index.html\') as \"typelink\",\n \n \n cms_category.category_keyword as \"typekeyword\",\n cms_category.category_diy_url as \"typeurl\",\n cms_category.category_flag as \"flag\",\n cms_category.category_id as \"parentid\",\n cms_category.category_parent_ids as \"parentids\",\n cms_category.category_descrip as \"typedescrip\",\n cms_category.category_type as \"type\",\n cms_category.category_path as \"typepath\",\n cms_category.leaf as \"typeleaf\",\n cms_category.category_img as \"typelitpic\" ,\n cms_category.category_ico as \"typeico\" ,\n <#if tableName??>${tableName}.*,\n ( SELECT count(*) FROM cms_category cc WHERE cc.category_id = cms_category.id AND cc.del = 0 ) AS \"childsize\"\nfrom\n cms_category\n <#--判断是否有自定义模型表-->\n <#if tableName??>LEFT JOIN ${tableName} ON ${tableName}.link_id=cms_category.id\nwhere\n cms_category.del=0\n and cms_category.category_display = \'enable\'\n <#--自定义模型-->\n <#if diyModel??>\n <#list diyModel as dm>\n <#assign json=\"${dm}\"?eval />\n and ${tableName}.${json.key} like CONCAT(\'%\',\'${json.value}\',\'%\')\n \n \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}\',cms_category.category_flag) > 0\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}\',cms_category.category_flag)=0\n or cms_category.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 (cms_category.id = cms_category.top_id or cms_category.top_id = 0)\n \n\n <#elseif type==\'nav\'>\n and(cms_category.category_id=0 or cms_category.category_id is null)\n\n <#--同级栏目（多个）-->\n <#elseif type==\'level\'>\n <#if _typeid != \'0\'>\n and cms_category.category_id=(select category_id from cms_category where id=${_typeid})\n \n\n <#--当前栏目（单个）-->\n <#elseif type==\'self\'>\n <#if _typeid != \'0\'>\n and cms_category.id=${_typeid}\n \n\n <#--当前栏目的所属栏目（多个）-->\n <#elseif type==\'path\'>\n <#if _typeid != \'0\'>\n and cms_category.id in\n (<#if column?? && column.categoryParentIds??>${column.categoryParentIds},${_typeid})\n \n\n <#--子栏目（多个）-->\n <#elseif type==\'son\'>\n <#if _typeid != \'0\'>\n and cms_category.category_id=${_typeid}\n \n\n <#--上一级栏目没有则取当前栏目（单个）-->\n <#elseif type==\'parent\'>\n <#if _typeid != \'0\'>\n and\n <#if column?? && column.categoryId??>\n cms_category.id=${column.categoryId}\n <#else>\n cms_category.id=${_typeid}\n \n \n \n\n <#else> <#--默认顶级栏目-->\n and\n <#if _typeid != \'0\'>\n cms_category.id=${_typeid}\n <#else>\n (cms_category.category_id=0 or cms_category.category_id is null)\n \n \n\n <#--字段排序-->\n <#if type == \'path\'>\n ORDER BY cms_category.category_path asc\n <#else>\n <#if orderby?? >\n ORDER BY\n <#if orderby==\'date\'> cms_category.create_date\n <#elseif orderby==\'sort\'> cms_category.category_sort\n <#else>cms_category.id\n \n \n\n <#if order?? >\n <#if order==\'desc\'> desc\n <#if order==\'asc\'> asc\n \n \n LIMIT\n ${_size?default(9999)}\n', NULL, '通用栏目', NULL, NULL, NULL, NULL, 0, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (5, 'global', 'single', 'select\n APP_NAME as \"name\",\n app_logo as \"logo\",\n app_keyword as \"keyword\",\n app_description as \"descrip\",\n app_copyright as \"copyright\",\n \'${contextPath}\' as \"contextpath\",\n <#--动态解析 -->\n <#if isDo?? && isDo>\n \'${url}\' as \"url\",\n \'${url}\' as \"host\",\n \'/\' as \"html\",\n <#--使用地址栏的域名 -->\n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(\'${url}\',\'${appDir}<#if appDir?has_content>/\') as \"url\",\n \'<#if appDir?has_content>/${appDir}/\' as \"html\",\n <#else>\n CONCAT(CONCAT(\'${url}\',\'${html}\'),\'<#if appDir?has_content>/${appDir}\') as \"url\",\n CONCAT(CONCAT(\'/${html}\',\'<#if appDir?has_content>/${appDir}\'),\'/\') as \"html\",\n \n \'${url}\' as \"host\",\n \n CONCAT(CONCAT(CONCAT(CONCAT(\'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` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (7, 'field', 'single', 'SELECT\n cms_content.id as \"id\",\n <#--这里会存在id覆盖的情况,所以需要在cms_content.id下面-->\n <#if tableName??>${tableName}.*,\n <#--查询站点编号-->\n <#if appId??>\n cms_content.app_id as \"appId\",\n \n content_title as \"title\",\n content_short_title AS \"shorttitle\",\n content_author as \"author\",\n content_source as \"source\",\n content_out_link as \"outlink\",\n content_details as \"content\",\n content_datetime as \"date\",\n content_description as \"descrip\",\n content_keyword as \"keyword\",\n <#if contextPath?? && contextPath != \"/\">\n CONCAT(CONCAT( \'\') as \"hit\",\n <#else>\n CONCAT(CONCAT( \'\') as \"hit\",\n \n content_type as \"flag\",\n content_tags as \"tags\",\n category_title as \"typetitle\",\n cms_content.content_img as \"litpic\",\n <#--内容页动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/mcms/view.do?id=\', cms_content.id) as \"link\",\n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(cms_content.id, \'.html\' ) as \"link\",\n <#else>\n CONCAT(CONCAT( cms_category.category_path, \'/\' ), CONCAT(cms_content.id, \'.html\' )) as \"link\",\n \n \n cms_category.id as \"typeid\",\n cms_category.leaf as \"typeleaf\",\n cms_category.category_title as \"typetitle\",\n cms_category.category_short_title AS \"typeshorttitle\",\n cms_category.category_img as \"typelitpic\",\n cms_category.category_ico as \"typeico\",\n cms_category.category_path as \"typepath\",\n cms_category.top_id as \"topid\",\n cms_category.category_flag as \"typeflag\",\n cms_category.category_id as \"parentid\",\n cms_category.category_parent_ids as \"parentids\",\n cms_category.category_keyword as \"typekeyword\",\n cms_category.category_descrip as \"typedescrip\",\n <#--动态链接-->\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/list.do?typeid=\', cms_category.id) as \"typelink\"\n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(category_pinyin,\'.html\') AS \"typelink\"\n <#else>\n CONCAT(category_path,\'/index.html\') AS \"typelink\"\n \n \n\nFROM cms_content\n LEFT JOIN cms_category ON\n cms_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??>\n cms_category.id=${column.id} and\n \n <#--根据站点编号查询-->\n <#if appId??>\n cms_content.app_id = ${appId} and\n \n cms_content.del=0\n <#if id??> and cms_content.id=${id}\n\n', NULL, '文章内容', NULL, NULL, NULL, NULL, 0, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (8, 'pre', 'single', '<#assign select=\"\'\'\"/>\n<#if orderby?? >\n <#if orderby==\"date\">\n <#assign _orderby=\"content_datetime\">\n <#elseif orderby==\"updatedate\">\n <#assign _orderby=\"cms_content.update_date\">\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<#--上一页-->\n<#if pageTag.preId??>\n SELECT\n cms_content.id as \"id\",\n content_title as \"title\",\n content_author as \"author\",\n content_source as \"source\",\n content_details as \"content\",\n category.category_title as \"typename\",\n category.category_id as \"typeid\",\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/list.do?typeid=\', cms_category.id) as \"typelink\",\n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(category.category_pinyin,\'.html\') AS \"typelink\",\n <#else>\n CONCAT(category.category_path,\'/index.html\') AS \"typelink\",\n \n \n content_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 <#if shortSwitch?? && shortSwitch>\n CONCAT(cms_content.id,\'.html\') AS \"link\",\n <#else>\n CONCAT(CONCAT(category_path,\'/\'),CONCAT(cms_content.id,\'.html\')) AS \"link\",\n \n \n content_description as \"descrip\",\n content_hit as \"hit\",\n content_type as \"flag\",\n content_keyword as \"keyword\"\n FROM cms_content\n LEFT JOIN cms_category category ON cms_content.category_id=category.id\n WHERE cms_content.id=${pageTag.preId}\n<#else>\n SELECT\n ${select} as \"id\",\n \'没有了\' as \"title\",\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 \"typelink\",\n ${select} as \"date\",\n ${select} as \"descrip\",\n ${select} as \"hit\",\n ${select} as \"flag\",\n ${select} as \"keyword\"\n FROM dual\n\n', NULL, '文章上一篇', NULL, NULL, NULL, NULL, 0, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (9, 'page', 'single', '<#if pageTag??>\nselect\n <#--是否开启短链接-->\n <#if shortSwitch?? && shortSwitch>\n \'${shortSwitch?string(\'true\',\'false\')}\' as \"shortSwitch\",\n \n <#if !(pageTag.indexUrl??)>\n <#--判断是否有栏目对象，用于搜索不传栏目-->\n <#if column??>\n <#if shortSwitch?? && shortSwitch>\n <#assign path=column.categoryPinyin/>\n <#else>\n <#assign path=column.categoryPath/>\n \n <#else>\n <#assign path=\'\' />\n \n <#--总记录数、总页数-->\n \'${pageTag.total}\' as \"total\",\n \'${pageTag.size}\' as \"size\",\n\n <#--记录总数-->\n \'${pageTag.rcount}\' as \"rcount\",\n <#--当前页码-->\n \'${pageTag.pageNo}\' as \"cur\",\n <#--首页-->\n <#if shortSwitch?? && shortSwitch>\n CONCAT(\'${path}\', \'.html\') as \"index\",\n <#else>\n CONCAT(\'${path}\', \'/index.html\') as \"index\",\n \n <#--上一页-->\n <#if (pageTag.pageNo?eval-1) gt 1>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(\'${path}\',\'-${pageTag.pageNo?eval-1}.html\') as \"pre\",\n <#else>\n CONCAT(\'${path}\',\'/list-${pageTag.pageNo?eval-1}.html\') as \"pre\",\n \n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(\'${path}\',\'.html\') as \"pre\",\n <#else>\n CONCAT(\'${path}\',\'/index.html\') as \"pre\",\n \n \n <#--下一页-->\n <#if pageTag.total lte 1>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(\'${path}\', \'.html\') as \"next\",\n CONCAT(\'${path}\', \'.html\') as \"last\"\n <#else>\n CONCAT(\'${path}\', \'/index.html\') as \"next\",\n CONCAT(\'${path}\', \'/index.html\') as \"last\"\n \n <#else>\n <#if pageTag.pageNo?eval gte pageTag.total>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(\'${path}\',\'-${pageTag.total}.html\') as \"next\",\n <#else>\n CONCAT(\'${path}\',\'/list-${pageTag.total}.html\') as \"next\",\n \n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(\'${path}\',\'-${pageTag.pageNo?eval+1}.html\') as \"next\",\n <#else>\n CONCAT(\'${path}\',\'/list-${pageTag.pageNo?eval+1}.html\') as \"next\",\n \n \n <#--最后一页-->\n <#if shortSwitch?? && shortSwitch>\n CONCAT(\'${path}\',\'-${pageTag.total}.html\') as \"last\"\n <#else>\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 \'${pageTag.total}\' as \"total\",\n \'${pageTag.size}\' as \"size\",\n \'${pageTag.rcount}\' as \"rcount\",\n \'${pageTag.pageNo}\' as \"cur\"\n \n from dual\n', NULL, '通用分页', NULL, NULL, NULL, NULL, 0, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (10, 'next', 'single', '<#assign select=\"\'\'\"/>\n<#if orderby?? >\n <#if orderby==\"date\">\n <#assign _orderby=\"content_datetime\">\n <#elseif orderby==\"updatedate\">\n <#assign _orderby=\"cms_content.update_date\">\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 <#else>\n <#assign _orderby=\"cms_content.id\">\n \n<#--开始-->\n<#if pageTag.nextId??>\n SELECT\n cms_content.id as \"id\",\n content_title as \"title\",\n content_author as \"author\",\n content_source as \"source\",\n content_details as \"content\",\n category.category_title as \"typename\",\n category.category_id as \"typeid\",\n <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/list.do?typeid=\', cms_category.id) as \"typelink\",\n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(category.category_pinyin,\'.html\') AS \"typelink\",\n <#else>\n CONCAT(category.category_path,\'/index.html\') AS \"typelink\",\n \n \n content_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 <#if shortSwitch?? && shortSwitch>\n CONCAT(cms_content.id,\'.html\') AS \"link\",\n <#else>\n CONCAT(CONCAT(category_path,\'/\'),CONCAT(cms_content.id,\'.html\')) AS \"link\",\n \n \n content_description as \"descrip\",\n content_hit as \"hit\",\n content_type as \"flag\",\n content_keyword as \"keyword\"\n FROM cms_content\n LEFT JOIN cms_category category ON cms_content.category_id=category.id\n WHERE cms_content.id=${pageTag.nextId}\n<#else>\n SELECT\n ${select} as \"id\",\n \'没有了\' as \"title\",\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 FROM dual\n\n', NULL, '文章下一篇', NULL, NULL, NULL, NULL, 0, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (11, 'diyform', 'macro', '<#macro ms_diyform formName>\n\n\n', NULL, '智能表单', '57', '2022-11-15 16:10:49', NULL, NULL, 0, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (12, 'data', 'list', 'SELECT\n cms_content.id AS \"id\",\n content_title AS \"title\",\n content_author AS \"author\",\n content_source AS \"source\",\n content_details AS \"content\",\n content_out_link AS \"outlink\",\n content_short_title AS \"shorttitle\",\n category.category_title AS \"typetitle\",\n category.category_short_title AS \"typeshorttitle\",\n category.id AS \"typeid\",\n category.category_path AS \"typepath\",\n category.category_img AS \"typelitpic\",\n category.category_ico AS \"typeico\",\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 <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/list.do?style=${templateName!\"\"}&typeid=\', category.category_id) AS \"typelink\",\n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(category_pinyin,\'.html\') AS \"typelink\",\n <#else>\n CONCAT(category_path,\'/index.html\') AS \"typelink\",\n \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 <#if isDo?? && isDo>\n CONCAT(\'/${modelName}/view.do?style=${templateName!\"\"}&id=\', cms_content.id) AS \"link\",\n <#else>\n <#if shortSwitch?? && shortSwitch>\n CONCAT(cms_content.id,\'.html\') AS \"link\",\n <#else>\n CONCAT(CONCAT(CONCAT(category.category_path,\'/\'),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 category ON cms_content.category_id = category.id\n <#--判断是否有自定义模型表-->\n <#if tableName??>\n LEFT JOIN ${tableName} ON ${tableName}.link_id=cms_content.id\n \nWHERE\n content_display=0\n and category_display=\'enable\'\n and cms_content.del=0\n <#--根据站点编号查询-->\n <#if appId?? >\n and cms_content.app_id=${appId}\n \n and cms_content.id=${dataid}\n\n', NULL, '单篇', '57', '2022-11-15 16:10:49', NULL, NULL, 0, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (17, 'tag', 'single', '<#assign _typeid=\'0\'/>\n<#assign order=\'desc\'/>\n<#assign _size=\'99\'/>\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<#if size??>\n <#assign _size=\'${size}\'>\n\n\nSELECT\n GROUP_CONCAT(DISTINCT content_tags ) AS tags\nFROM\n cms_content\nLEFT JOIN cms_category ON cms_content.category_id = cms_category.id\nWHERE\n cms_category.category_display = \'enable\'\n AND cms_content.del = 0\n AND cms_content.content_display = 0\n AND LENGTH( cms_content.content_tags )>0\n <#if _typeid != \'0\'>\n AND (cms_category.id = ${_typeid} or FIND_IN_SET(${_typeid},cms_category.category_parent_ids) > 0)\n \n <#if appId??>\n AND cms_content.app_id = ${appId}\n \nORDER BY CONTENT_HIT DESC\nLimit ${_size}\n', '', '文章标签配置，不提供模板使用', '', '2023-06-12 17:26:19', '57', '2023-05-23 09:31:49', 57, 1);
-INSERT INTO `mdiy_tag` (`id`, `tag_name`, `tag_type`, `tag_sql`, `tag_class`, `tag_description`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (18, 'tags', 'macro', '<#assign tags=\"\">\n<#macro ms_tags>\n <#if tag??>\n <#assign ___tags = tag.tags?split(\",\")>\n <#list ___tags as tag>\n <#list ___tags as _tag>\n <#if tag == _tag>\n <#if tag_index == _tag_index>\n <#assign tags+=tag+\",\">\n <#else>\n <#break>\n \n \n \n \n \n', '', '文章标签', '', '2023-06-12 17:26:21', '57', '2023-05-23 09:31:40', 57, 1);
-COMMIT;
-
-ALTER TABLE `mdiy_model` ADD COLUMN `model_id_type` int(1) NULL COMMENT '0雪花1自增长' AFTER `model_name`;
-SET FOREIGN_KEY_CHECKS = 1;
diff --git a/doc/5.3.5-up-5.3.6.sql b/doc/5.3.5-up-5.3.6.sql
new file mode 100644
index 00000000..f5feddb0
--- /dev/null
+++ b/doc/5.3.5-up-5.3.6.sql
@@ -0,0 +1,9 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+ALTER TABLE `cms_content` MODIFY COLUMN `create_date` datetime NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间' ;
+ALTER TABLE `app` MODIFY COLUMN `id` varchar(20) NOT NULL COMMENT '站点id';
+ALTER TABLE `mdiy_model` MODIFY COLUMN `model_json` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT 'json';
+ALTER TABLE `logger` MODIFY COLUMN `log_param` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '请求参数';
+
+SET FOREIGN_KEY_CHECKS = 1;
diff --git a/doc/mcms-5.3.5.sql b/doc/mcms-5.3.6.sql
similarity index 93%
rename from doc/mcms-5.3.5.sql
rename to doc/mcms-5.3.6.sql
index 7dcae487..be92c5ab 100644
--- a/doc/mcms-5.3.5.sql
+++ b/doc/mcms-5.3.6.sql
@@ -6,7 +6,7 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
DROP TABLE IF EXISTS `app`;
CREATE TABLE `app` (
- `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '站点id',
+ `id` varchar(20) NOT NULL COMMENT '站点id',
`app_name` varchar(60) NOT NULL COMMENT '站点名称',
`app_url` varchar(200) NOT NULL COMMENT '站点域名，多个回车换行显示',
`app_logo` varchar(4000) DEFAULT NULL COMMENT '网站logo',
@@ -25,13 +25,13 @@ CREATE TABLE `app` (
`create_by` varchar(11) DEFAULT NULL,
`del` int(1) DEFAULT '0',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='应用表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='应用表';
-- ----------------------------
-- Records of app
-- ----------------------------
BEGIN;
-INSERT INTO `app` (`id`, `app_name`, `app_url`, `app_logo`, `app_keyword`, `app_copyright`, `app_style`, `app_description`, `app_pay`, `app_state`, `app_datetime`, `app_pay_date`, `app_dir`, `update_date`, `update_by`, `create_date`, `create_by`, `del`) VALUES (1, '5.3.5 铭飞MCMS', 'http://localhost:8080/', '[{\"url\":\"/upload/1/appLogo/1609397756549.png\",\"name\":\"logo_small.png\",\"path\":\"/upload/1/appLogo/1609397756549.png\",\"uid\":1685699633311,\"status\":\"success\"}]', 'CMS,免费CMS,免费开源Java CMS,CMS系统,Java CMS,CMS内容管理系统,企业CMS,HTML网页模板,CMS模板,CMS源码,网站源码,信创系统软件,安可系统,网站建设,模板网站,建站模板,建站工具,建站平台,建站工具', '站点版权信息，可配置', 'default', '基于java开发的一套java cms，也是轻量级开源内容管理系统，CMS简洁、安全、开源、免费，可运行在Linux、Windows、MacOSX、Solaris等各种平台上，专注为公司企业、个人站长快速建站提供解决方案，铭飞MS平台为您提供各类cms网站模板下载,公司网站、企业网站模板、网站后台系统模板、免费网站模板,10年建站公司老品牌值得信赖的cms!', '', 0, NULL, '2019-11-17 00:00:00', 'web', '2023-06-29 09:35:00', '57', NULL, '', 0);
+INSERT INTO `app` (`id`, `app_name`, `app_url`, `app_logo`, `app_keyword`, `app_copyright`, `app_style`, `app_description`, `app_pay`, `app_state`, `app_datetime`, `app_pay_date`, `app_dir`, `update_date`, `update_by`, `create_date`, `create_by`, `del`) VALUES ('1', '5.3.6 铭飞MCMS', 'http://localhost:8081/', '[{\"url\":\"/upload/1/appLogo/1609397756549.png\",\"name\":\"logo_small.png\",\"path\":\"/upload/1/appLogo/1609397756549.png\",\"uid\":1685699633311,\"status\":\"success\"}]', 'CMS,免费CMS,免费开源Java CMS,CMS系统,Java CMS,CMS内容管理系统,企业CMS,HTML网页模板,CMS模板,CMS源码,网站源码,信创系统软件,安可系统,网站建设,模板网站,建站模板,建站工具,建站平台,建站工具', '站点版权信息，可配置', 'default', '基于java开发的一套java cms，也是轻量级开源内容管理系统，CMS简洁、安全、开源、免费，可运行在Linux、Windows、MacOSX、Solaris等各种平台上，专注为公司企业、个人站长快速建站提供解决方案，铭飞MS平台为您提供各类cms网站模板下载,公司网站、企业网站模板、网站后台系统模板、免费网站模板,10年建站公司老品牌值得信赖的cms!', '', 0, NULL, '2019-11-17 00:00:00', 'web', '2024-02-01 16:29:30', '57', NULL, '', 0);
COMMIT;
-- ----------------------------
@@ -122,7 +122,7 @@ CREATE TABLE `cms_content` (
`update_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
`has_list_html` int(1) DEFAULT '0' COMMENT '栏目静态化标识 0表示未被自动静态化,1反之',
`update_by` varchar(11) DEFAULT NULL COMMENT '修改人',
- `create_date` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
+ `create_date` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`create_by` varchar(11) DEFAULT NULL COMMENT '创建人',
`del` int(1) DEFAULT '0' COMMENT '删除标记',
PRIMARY KEY (`id`) USING BTREE,
@@ -181,7 +181,7 @@ INSERT INTO `cms_content` (`id`, `category_id`, `content_details`, `content_titl
INSERT INTO `cms_content` (`id`, `category_id`, `content_details`, `content_title`, `content_short_title`, `content_keyword`, `content_description`, `content_img`, `content_source`, `content_author`, `content_display`, `content_type`, `content_datetime`, `content_sort`, `content_tags`, `content_hit`, `content_out_link`, `has_detail_html`, `update_date`, `has_list_html`, `update_by`, `create_date`, `create_by`, `del`) VALUES (1666748457335279617, 1329316146811314177, '', '分享插件', '', '', '', '[{\"url\":\"/upload/1/cms/content/1686218772032.png\",\"name\":\"1680171316440.png\",\"path\":\"/upload/1/cms/content/1686218772032.png\",\"uid\":1686218772009,\"status\":\"success\"}]', '', '', '0', '', '2023-06-08 18:05:55', 0, '', 0, '', 0, '2023-09-28 16:31:32', 0, '57', '2023-09-28 16:28:49', '57', 0);
INSERT INTO `cms_content` (`id`, `category_id`, `content_details`, `content_title`, `content_short_title`, `content_keyword`, `content_description`, `content_img`, `content_source`, `content_author`, `content_display`, `content_type`, `content_datetime`, `content_sort`, `content_tags`, `content_hit`, `content_out_link`, `has_detail_html`, `update_date`, `has_list_html`, `update_by`, `create_date`, `create_by`, `del`) VALUES (1674243446207381505, 1666653706550321166, '点击打开
', '信创国产化解决方案', '', '', '', '[{\"url\":\"blob:http://localhost:8080/dfc5bbe5-03fd-4b96-9941-066421106247\",\"name\":\"1609397756549.png .png\",\"path\":\"/upload/1/cms/content/1688005871192.png\",\"uid\":1688005870964,\"status\":\"success\"}]', '', '', '0', '', '2023-06-29 10:27:30', 0, '', 0, 'https://www.mingsoft.net/banben.html', 0, '2023-06-29 10:31:13', 0, '57', '2023-06-29 10:28:38', '57', 0);
INSERT INTO `cms_content` (`id`, `category_id`, `content_details`, `content_title`, `content_short_title`, `content_keyword`, `content_description`, `content_img`, `content_source`, `content_author`, `content_display`, `content_type`, `content_datetime`, `content_sort`, `content_tags`, `content_hit`, `content_out_link`, `has_detail_html`, `update_date`, `has_list_html`, `update_by`, `create_date`, `create_by`, `del`) VALUES (1674243652642635777, 1666653706550321167, '点击打开
', '低代码开发解决方案', '', '', '', '[{\"url\":\"blob:http://localhost:8080/b369fa81-fd5e-41db-9377-b2538b556b03\",\"name\":\"1609397756549.png .png\",\"path\":\"/upload/1/cms/content/1688005911798.png\",\"uid\":1688005911720,\"status\":\"success\"}]', '', '', '0', '', '2023-06-29 10:28:39', 0, '', 0, 'https://www.mingsoft.net/', 0, '2023-06-29 10:31:53', 0, '57', '2023-06-29 10:29:27', '57', 0);
-INSERT INTO `cms_content` (`id`, `category_id`, `content_details`, `content_title`, `content_short_title`, `content_keyword`, `content_description`, `content_img`, `content_source`, `content_author`, `content_display`, `content_type`, `content_datetime`, `content_sort`, `content_tags`, `content_hit`, `content_out_link`, `has_detail_html`, `update_date`, `has_list_html`, `update_by`, `create_date`, `create_by`, `del`) VALUES (1674338953676128258, 1666653706550321162, '', '任务大厅', '', '', '', '[{\"url\":\"/upload/1/cms/content/1686278659721.jpg\",\"name\":\"a.png\",\"path\":\"/upload/1/cms/content/1686278659721.jpg\",\"uid\":16098386909801,\"status\":\"success\"}]', 'https://www.mingsoft.net/renwudating.html', '', '0', '', '2023-06-29 16:47:51', 0, '', 0, '', 0, '2023-06-29 17:05:47', 0, '57', '2023-06-29 17:05:47', '57', 0);
+INSERT INTO `cms_content` (`id`, `category_id`, `content_details`, `content_title`, `content_short_title`, `content_keyword`, `content_description`, `content_img`, `content_source`, `content_author`, `content_display`, `content_type`, `content_datetime`, `content_sort`, `content_tags`, `content_hit`, `content_out_link`, `has_detail_html`, `update_date`, `has_list_html`, `update_by`, `create_date`, `create_by`, `del`) VALUES (1674338953676128258, 1666653706550321162, '', '任务大厅', '', '', '', '[{\"url\":\"/upload/1/cms/content/1686278659721.jpg\",\"name\":\"a.png\",\"path\":\"/upload/1/cms/content/1686278659721.jpg\",\"uid\":16098386909801,\"status\":\"success\"}]', 'https://www.mingsoft.net/renwudating.html', '', '0', '', '2023-06-29 16:47:51', 0, '', 0, '', 0, '2024-02-04 15:11:23', 0, '57', '2023-06-29 17:05:47', '57', 0);
COMMIT;
-- ----------------------------
@@ -200,15 +200,12 @@ CREATE TABLE `cms_history_log` (
`create_by` varchar(11) DEFAULT NULL COMMENT '创建人',
`del` int(1) DEFAULT '0' COMMENT '删除标记',
PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='文章浏览记录';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='文章浏览记录';
-- ----------------------------
-- Records of cms_history_log
-- ----------------------------
BEGIN;
-INSERT INTO `cms_history_log` (`id`, `content_id`, `people_id`, `hl_ip`, `hl_is_mobile`, `update_date`, `update_by`, `create_date`, `create_by`, `del`) VALUES (99, 1666653707447902208, NULL, '192.168.0.61', '0', NULL, NULL, '2023-09-28 16:32:37', NULL, 0);
-INSERT INTO `cms_history_log` (`id`, `content_id`, `people_id`, `hl_ip`, `hl_is_mobile`, `update_date`, `update_by`, `create_date`, `create_by`, `del`) VALUES (100, 1666653707447902208, NULL, '192.168.0.61', '0', NULL, NULL, '2023-09-28 16:32:42', NULL, 0);
-INSERT INTO `cms_history_log` (`id`, `content_id`, `people_id`, `hl_ip`, `hl_is_mobile`, `update_date`, `update_by`, `create_date`, `create_by`, `del`) VALUES (101, 1666653707447902208, NULL, '192.168.0.61', '0', NULL, NULL, '2023-09-28 16:33:08', NULL, 0);
COMMIT;
-- ----------------------------
@@ -219,7 +216,7 @@ CREATE TABLE `logger` (
`id` bigint(20) unsigned NOT NULL,
`log_error_msg` text COMMENT '错误消息',
`log_result` text COMMENT '返回参数',
- `log_param` text COMMENT '请求参数',
+ `log_param` longtext COMMENT '请求参数',
`log_location` varchar(255) DEFAULT NULL COMMENT '所在地区',
`log_user` varchar(255) DEFAULT NULL COMMENT '操作人员',
`log_user_type` varchar(255) DEFAULT NULL COMMENT '用户类型',
@@ -322,7 +319,7 @@ CREATE TABLE `mdiy_dict` (
UNIQUE KEY `inx_unique` (`dict_value`,`dict_label`,`dict_type`) USING BTREE,
KEY `inx_dict_value` (`dict_value`) USING BTREE,
KEY `inx_dict_label` (`dict_label`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=652 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC COMMENT='字典表';
+) ENGINE=InnoDB AUTO_INCREMENT=651 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC COMMENT='字典表';
-- ----------------------------
-- Records of mdiy_dict
@@ -344,13 +341,40 @@ INSERT INTO `mdiy_dict` (`id`, `dict_value`, `dict_label`, `dict_type`, `dict_de
INSERT INTO `mdiy_dict` (`id`, `dict_value`, `dict_label`, `dict_type`, `dict_description`, `is_child`, `dict_enable`, `dict_remarks`, `dict_sort`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`, `NOT_DEL`) VALUES (650, '时政热点', '时政热点', '文章标签', NULL, NULL, '1', NULL, 0, '57', '2023-09-28 16:27:43', '106', '2023-06-08 15:13:13', 0, 0);
COMMIT;
+-- ----------------------------
+-- Table structure for mdiy_form_test
+-- ----------------------------
+DROP TABLE IF EXISTS `mdiy_form_test`;
+CREATE TABLE `mdiy_form_test` (
+ `id` varchar(19) NOT NULL,
+ `TEXTAREA_C` varchar(255) DEFAULT NULL COMMENT '多行文本',
+ `input_1700029713000_79971` varchar(255) DEFAULT NULL COMMENT '单行文本',
+ `SELECT_C` varchar(255) DEFAULT NULL COMMENT '下拉选择框',
+ `TEXTAREA_CDD` varchar(255) DEFAULT NULL COMMENT '多行文本',
+ `MONEY_A` decimal(11,3) DEFAULT NULL COMMENT '金钱',
+ `INPUT_C` varchar(255) DEFAULT NULL COMMENT '单行文本',
+ `LINK_ID` bigint(20) DEFAULT NULL,
+ `CREATE_DATE` datetime DEFAULT NULL COMMENT '创建时间',
+ `CREATE_BY` varchar(50) DEFAULT NULL COMMENT '创建人',
+ `UPDATE_DATE` datetime DEFAULT NULL COMMENT '修改时间',
+ `UPDATE_BY` varchar(50) DEFAULT NULL COMMENT '修改人',
+ `DEL` int(1) DEFAULT '0' COMMENT '删除标记',
+ PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='test1';
+
+-- ----------------------------
+-- Records of mdiy_form_test
+-- ----------------------------
+BEGIN;
+COMMIT;
+
-- ----------------------------
-- Table structure for mdiy_model
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_model`;
CREATE TABLE `mdiy_model` (
`ID` bigint(19) unsigned NOT NULL,
- `model_json` text COMMENT 'json',
+ `model_json` longtext COMMENT 'json',
`model_table_name` varchar(255) DEFAULT NULL COMMENT '模型表名',
`model_name` varchar(30) DEFAULT NULL COMMENT '模型名称',
`model_id_type` int(1) DEFAULT NULL COMMENT '0雪花1自增长',
@@ -370,6 +394,7 @@ CREATE TABLE `mdiy_model` (
-- Records of mdiy_model
-- ----------------------------
BEGIN;
+INSERT INTO `mdiy_model` (`ID`, `model_json`, `model_table_name`, `model_name`, `model_id_type`, `model_type`, `model_field`, `model_custom_type`, `update_date`, `update_by`, `create_date`, `create_by`, `del`, `NOT_DEL`) VALUES (1752985909729878018, '{\"searchJson\":\"[\\n // 多行文本\\n {\'action\':\'and\', \'field\': \'TEXTAREA_C\', \'el\': \'eq\', \'model\': \'textareaC\', \'name\': \'多行文本\', \'type\': \'textarea\'},\\n //单行文本\\n {\'isSearch\':\'true\',\'action\':\'and\', \'field\': \'input_1700029713000_79971\', \'el\': \'eq\', \'model\': \'input170002971300079971\', \'name\': \'单行文本\', \'type\': \'input\'},\\n // 下拉选择框\\n {\'isSearch\':\'true\',\'action\':\'and\', \'field\': \'SELECT_C\', \'el\': \'eq\', \'model\': \'selectC\', \'name\': \'下拉选择框\', \'key\': \'value\', \'title\': \'label\', \'type\': \'select\', \'multiple\': false},\\n // 多行文本\\n {\'action\':\'and\', \'field\': \'TEXTAREA_CDD\', \'el\': \'eq\', \'model\': \'textareaCdd\', \'name\': \'多行文本\', \'type\': \'textarea\'},\\n // 金钱\\n {action:\'and\', field: \'MONEY_A\', el: \'eq\', model: \'moneyA\', name: \'金钱\', type: \'number\'},\\n //单行文本\\n {\'isSearch\':\'true\',\'action\':\'and\', \'field\': \'INPUT_C\', \'el\': \'eq\', \'model\': \'inputC\', \'name\': \'单行文本\', \'type\': \'input\'},\\n]\\n\",\"isWebCode\":true,\"form\":\"[{\\\"type\\\":\\\"textarea\\\",\\\"name\\\":\\\"多行文本\\\",\\\"icon\\\":\\\"icon-duohangwenben2\\\",\\\"pmofAllowUpdate\\\":1,\\\"pmofAllowGenerater\\\":1,\\\"pmofAllowRepet\\\":1,\\\"pmofAllowValidator\\\":1,\\\"pmofAllowEmpty\\\":0,\\\"pmofLength\\\":255,\\\"pmofType\\\":\\\"VARCHAR\\\",\\\"pmofJavaType\\\":\\\"String\\\",\\\"pmofSort\\\":0,\\\"likeSearch\\\":false,\\\"help\\\":\\\"\\\",\\\"options\\\":{\\\"isShow\\\":true,\\\"readonly\\\":false,\\\"editorReadonly\\\":true,\\\"width\\\":\\\"100%\\\",\\\"defaultValue\\\":\\\"\\\",\\\"required\\\":false,\\\"disabled\\\":false,\\\"isPattern\\\":false,\\\"isLength\\\":false,\\\"pattern\\\":\\\"\\\",\\\"placeholder\\\":\\\"\\\",\\\"lengthConfig\\\":{\\\"min\\\":0,\\\"max\\\":100},\\\"table\\\":{\\\"search\\\":false,\\\"align\\\":\\\"left\\\"},\\\"remoteFunc\\\":\\\"func_1700029731000_90699\\\"},\\\"key\\\":\\\"1700029731000_90699\\\",\\\"model\\\":\\\"TEXTAREA_C\\\",\\\"rules\\\":\\\"[]\\\"},{\\\"type\\\":\\\"grid\\\",\\\"name\\\":\\\"栅格布局\\\",\\\"icon\\\":\\\"icon-zhagebuju\\\",\\\"columns\\\":[{\\\"span\\\":12,\\\"list\\\":[{\\\"type\\\":\\\"input\\\",\\\"name\\\":\\\"单行文本\\\",\\\"icon\\\":\\\"icon-danhangwenben\\\",\\\"pmofAllowUpdate\\\":1,\\\"pmofAllowGenerater\\\":1,\\\"pmofAllowRepet\\\":1,\\\"pmofAllowValidator\\\":1,\\\"pmofAllowEmpty\\\":0,\\\"pmofLength\\\":255,\\\"pmofType\\\":\\\"VARCHAR\\\",\\\"pmofJavaType\\\":\\\"String\\\",\\\"pmofSort\\\":0,\\\"likeSearch\\\":true,\\\"help\\\":\\\"\\\",\\\"options\\\":{\\\"isShow\\\":true,\\\"isFk\\\":false,\\\"readonly\\\":false,\\\"width\\\":\\\"100%\\\",\\\"repeat\\\":false,\\\"defaultValue\\\":\\\"\\\",\\\"clearable\\\":true,\\\"isLength\\\":true,\\\"lengthConfig\\\":{\\\"min\\\":0,\\\"max\\\":255},\\\"required\\\":false,\\\"dataType\\\":\\\"string\\\",\\\"isPattern\\\":false,\\\"isDataType\\\":false,\\\"pattern\\\":\\\"\\\",\\\"placeholder\\\":\\\"\\\",\\\"disabled\\\":false,\\\"table\\\":{\\\"search\\\":true,\\\"show\\\":true,\\\"align\\\":\\\"left\\\"},\\\"remoteFunc\\\":\\\"func_1700029713000_79971\\\"},\\\"key\\\":\\\"1700029713000_79971\\\",\\\"model\\\":\\\"input_1700029713000_79971\\\",\\\"rules\\\":\\\"[{\\\\\\\"min\\\\\\\":0,\\\\\\\"max\\\\\\\":255,\\\\\\\"message\\\\\\\":\\\\\\\"单行文本长度必须为0-255\\\\\\\"}]\\\"}]},{\\\"span\\\":12,\\\"list\\\":[]}],\\\"options\\\":{\\\"gutter\\\":0,\\\"isShow\\\":true,\\\"justify\\\":\\\"start\\\",\\\"align\\\":\\\"top\\\",\\\"table\\\":{\\\"width\\\":80,\\\"align\\\":\\\"center\\\",\\\"sort\\\":0},\\\"remoteFunc\\\":\\\"func_1700020056000_58191\\\"},\\\"key\\\":\\\"1700020056000_58191\\\",\\\"model\\\":\\\"grid_1700020056000_58191\\\",\\\"rules\\\":\\\"[]\\\",\\\"pmofAllowEmpty\\\":0},{\\\"type\\\":\\\"select\\\",\\\"name\\\":\\\"下拉选择框\\\",\\\"icon\\\":\\\"icon-xialaxuanze\\\",\\\"pmofAllowUpdate\\\":1,\\\"pmofAllowGenerater\\\":1,\\\"pmofAllowRepet\\\":1,\\\"pmofAllowValidator\\\":1,\\\"pmofAllowEmpty\\\":0,\\\"pmofLength\\\":255,\\\"pmofType\\\":\\\"VARCHAR\\\",\\\"pmofJavaType\\\":\\\"String\\\",\\\"likeSearch\\\":false,\\\"pmofSort\\\":0,\\\"help\\\":\\\"\\\",\\\"options\\\":{\\\"isShow\\\":true,\\\"defaultValue\\\":\\\"\\\",\\\"multiple\\\":false,\\\"disabled\\\":false,\\\"clearable\\\":true,\\\"placeholder\\\":\\\"\\\",\\\"required\\\":false,\\\"showLabel\\\":true,\\\"width\\\":\\\"100%\\\",\\\"options\\\":[{\\\"value\\\":\\\"1\\\",\\\"label\\\":\\\"下拉框1\\\"},{\\\"value\\\":\\\"2\\\",\\\"label\\\":\\\"下拉框2\\\"},{\\\"value\\\":\\\"3\\\",\\\"label\\\":\\\"下拉框3\\\"}],\\\"remoteType\\\":\\\"static\\\",\\\"dictType\\\":\\\"test\\\",\\\"filterable\\\":false,\\\"remoteOptions\\\":[],\\\"props\\\":{\\\"value\\\":\\\"value\\\",\\\"label\\\":\\\"label\\\"},\\\"remoteFunc\\\":\\\"func_1701249506000_32416\\\",\\\"remoteUrl\\\":\\\"\\\",\\\"table\\\":{\\\"search\\\":true,\\\"show\\\":true,\\\"align\\\":\\\"left\\\"}},\\\"key\\\":\\\"1701249506000_32416\\\",\\\"model\\\":\\\"SELECT_C\\\",\\\"rules\\\":\\\"[]\\\"},{\\\"type\\\":\\\"textarea\\\",\\\"name\\\":\\\"多行文本\\\",\\\"icon\\\":\\\"icon-duohangwenben2\\\",\\\"pmofAllowUpdate\\\":1,\\\"pmofAllowGenerater\\\":1,\\\"pmofAllowRepet\\\":1,\\\"pmofAllowValidator\\\":1,\\\"pmofAllowEmpty\\\":1,\\\"pmofLength\\\":255,\\\"pmofType\\\":\\\"VARCHAR\\\",\\\"pmofJavaType\\\":\\\"String\\\",\\\"pmofSort\\\":0,\\\"likeSearch\\\":false,\\\"help\\\":\\\"\\\",\\\"options\\\":{\\\"isShow\\\":true,\\\"readonly\\\":false,\\\"editorReadonly\\\":true,\\\"width\\\":\\\"100%\\\",\\\"defaultValue\\\":\\\"\\\",\\\"required\\\":true,\\\"disabled\\\":false,\\\"isPattern\\\":false,\\\"isLength\\\":false,\\\"pattern\\\":\\\"\\\",\\\"placeholder\\\":\\\"\\\",\\\"lengthConfig\\\":{\\\"min\\\":0,\\\"max\\\":100},\\\"table\\\":{\\\"search\\\":false,\\\"align\\\":\\\"left\\\"},\\\"remoteFunc\\\":\\\"func_1701508331000_85555\\\"},\\\"key\\\":\\\"1701508331000_85555\\\",\\\"model\\\":\\\"TEXTAREA_CDD\\\",\\\"rules\\\":\\\"[{\\\\\\\"required\\\\\\\":true,\\\\\\\"message\\\\\\\":\\\\\\\"多行文本不能为空\\\\\\\"}]\\\"},{\\\"type\\\":\\\"money\\\",\\\"name\\\":\\\"金钱\\\",\\\"icon\\\":\\\"icon-jinqian\\\",\\\"pmofAllowUpdate\\\":1,\\\"pmofAllowGenerater\\\":1,\\\"pmofAllowRepet\\\":1,\\\"pmofAllowValidator\\\":1,\\\"pmofAllowEmpty\\\":0,\\\"pmofLength\\\":11,\\\"pmofType\\\":\\\"DECIMAL\\\",\\\"pmofJavaType\\\":\\\"Double\\\",\\\"pmofSort\\\":0,\\\"likeSearch\\\":false,\\\"help\\\":\\\"\\\",\\\"options\\\":{\\\"isShow\\\":true,\\\"width\\\":\\\"100%\\\",\\\"defaultValue\\\":\\\"\\\",\\\"required\\\":false,\\\"placeholder\\\":\\\"\\\",\\\"disabled\\\":false,\\\"table\\\":{\\\"show\\\":true,\\\"align\\\":\\\"left\\\"},\\\"remoteFunc\\\":\\\"func_1701942676000_16555\\\"},\\\"key\\\":\\\"1701942676000_16555\\\",\\\"model\\\":\\\"MONEY_A\\\",\\\"rules\\\":\\\"[]\\\"},{\\\"type\\\":\\\"input\\\",\\\"name\\\":\\\"单行文本\\\",\\\"icon\\\":\\\"icon-danhangwenben\\\",\\\"pmofAllowUpdate\\\":1,\\\"pmofAllowGenerater\\\":1,\\\"pmofAllowRepet\\\":1,\\\"pmofAllowValidator\\\":1,\\\"pmofAllowEmpty\\\":0,\\\"pmofLength\\\":255,\\\"pmofType\\\":\\\"VARCHAR\\\",\\\"pmofJavaType\\\":\\\"String\\\",\\\"pmofSort\\\":0,\\\"likeSearch\\\":true,\\\"help\\\":\\\"\\\",\\\"options\\\":{\\\"isShow\\\":true,\\\"isFk\\\":false,\\\"readonly\\\":false,\\\"width\\\":\\\"100%\\\",\\\"repeat\\\":false,\\\"defaultValue\\\":\\\"\\\",\\\"clearable\\\":true,\\\"isLength\\\":true,\\\"lengthConfig\\\":{\\\"min\\\":0,\\\"max\\\":255},\\\"required\\\":false,\\\"dataType\\\":\\\"string\\\",\\\"isPattern\\\":false,\\\"isDataType\\\":false,\\\"pattern\\\":\\\"\\\",\\\"placeholder\\\":\\\"\\\",\\\"disabled\\\":false,\\\"table\\\":{\\\"search\\\":true,\\\"show\\\":true,\\\"align\\\":\\\"left\\\"},\\\"remoteFunc\\\":\\\"func_1701942534000_65162\\\"},\\\"key\\\":\\\"1701942534000_65162\\\",\\\"model\\\":\\\"INPUT_C\\\",\\\"rules\\\":\\\"[{\\\\\\\"min\\\\\\\":0,\\\\\\\"max\\\\\\\":255,\\\\\\\"message\\\\\\\":\\\\\\\"单行文本长度必须为0-255\\\\\\\"}]\\\"}]\",\"isWebSubmit\":false,\"html\":\"\\n\\n \\n \\t\\n\\t \\n\\t 0?true:false\\\"\\n v-model=\\\"form.textareaC\\\"\\n :style=\\\"{width: \'100%\'}\\\"\\n placeholder=\\\"请输入内容\\\">\\n \\n\\t \\n\\t \\n \\n \\n \\n\\t \\n\\t \\n \\n\\t \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\t\\n\\t \\n\\t 0?true:false\\\"\\n v-model=\\\"form.textareaCdd\\\"\\n :style=\\\"{width: \'100%\'}\\\"\\n placeholder=\\\"请输入内容\\\">\\n \\n\\t \\n\\t \\n \\n \\n \\n \\n\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t\\n \\n \\n \\n\\t \\n\\t \\n \\n\\t \\n \\n\",\"script\":\"var custom_model = Vue.component(\\\"custom-model\\\",{\\n el: \'#custom-model\',\\n data:function() {\\n return {\\n modelId:0,\\n modelName: \\\"test1\\\",\\n // 下拉选择框\\n selectCOptions:[{\\\"value\\\":\\\"1\\\",\\\"label\\\":\\\"下拉框1\\\"},{\\\"value\\\":\\\"2\\\",\\\"label\\\":\\\"下拉框2\\\"},{\\\"value\\\":\\\"3\\\",\\\"label\\\":\\\"下拉框3\\\"}],\\n //表单数据\\n form: {\\n linkId:0,\\n // 多行文本 \\n textareaC:\'\',\\n // 单行文本\\n input170002971300079971:\'\',\\n \\t\\t\\t\\t// 下拉选择框\\n \\t\\t\\t\\tselectC:\\\"\\\",\\n // 多行文本 \\n textareaCdd:\'\',\\n // 金钱\\n moneyA:0,\\n // 单行文本\\n inputC:\'\',\\n },\\n\\n rules:{\\n // 单行文本\\n input170002971300079971: [{\\\"min\\\":0,\\\"max\\\":255,\\\"message\\\":\\\"单行文本长度必须为0-255\\\"}],\\n // 多行文本\\n textareaCdd: [{\\\"required\\\":true,\\\"message\\\":\\\"多行文本不能为空\\\"}],\\n // 单行文本\\n inputC: [{\\\"min\\\":0,\\\"max\\\":255,\\\"message\\\":\\\"单行文本长度必须为0-255\\\"}],\\n },\\n }\\n },\\n watch:{\\n },\\n components:{\\n },\\n computed:{\\n },\\n methods: {\\n //下拉选择框 列表格式化\\n\\t\\tselectCFormat:function(row, column, cellValue, index){\\n\\t\\t\\tvar value=\\\"\\\";\\n \\n\\t\\t\\tif(cellValue){\\n\\t\\t\\t\\tvar data = this.selectCOptions.find(function(value){\\n\\t\\t\\t\\t\\treturn value.value==cellValue;\\n\\t\\t\\t\\t})\\n\\t\\t\\t\\tif(data&&data.label){\\n\\t\\t\\t\\t\\tvalue = data.label;\\n\\t\\t\\t\\t}\\n\\t\\t\\t}\\n\\n\\t\\t\\treturn value;\\n\\t\\t},\\n\\n\\t\\t//获取selectC数据源\\n\\n\\n validate:function(){\\n var b = false\\n this.$refs.form.validate(function(valid){\\n b = valid;\\n });\\n return b;\\n },\\n save:function(callback) {\\n var that = this;\\n var url = this.formURL.save.url;\\n if (that.form.id > 0) {\\n url = this.formURL.update.url;\\n }\\n this.$refs.form.validate(function(valid) {\\n if (valid) {\\n var form = JSON.parse(JSON.stringify(that.form));\\n form.modelId = that.modelId;\\n ms.http.post(url, form).then(function (res) {\\n if(callback) {\\n callback(res);\\n }\\n });\\n } else{\\n callback({\\n result:false,msg:\'请检查表单输入项\'\\n });\\n }\\n })\\n },\\n //获取当前test1\\n get:function() {\\n var that = this;\\n //暂时注释因为自定义配置存在回显问题\\n //if(this.formURL && this.formURL.get.params.id==null && this.formURL.get.params.linkId==null) {\\n // return;\\n //}\\n ms.http.get(this.formURL.get.url, Object.assign({\\\"modelId\\\":that.modelId},this.formURL.get.params)).then(function (res) {\\n if(res.result&&res.data){\\n that.form = res.data;\\n }\\n }).catch(function (err) {\\n console.log(err);\\n });\\n },\\n\\n },\\n created:function() {\\n var that = this;\\n //渲染create\\n debugger;\\n //加载下拉选择框 数据\\n that.get();\\n }\\n});\",\"sql\":\"\\n -- TEST\\n CREATE TABLE `{model}TEST` (\\n `id` varchar(19) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,\\n `TEXTAREA_C` VARCHAR(255) DEFAULT NULL COMMENT \'多行文本\',\\n `input_1700029713000_79971` VARCHAR(255) DEFAULT NULL COMMENT \'单行文本\',\\n `SELECT_C` VARCHAR(255) DEFAULT NULL COMMENT \'下拉选择框\',\\n `TEXTAREA_CDD` VARCHAR(255) DEFAULT NULL COMMENT \'多行文本\',\\n `MONEY_A` DECIMAL(11,3) DEFAULT NULL COMMENT \'金钱\',\\n `INPUT_C` VARCHAR(255) DEFAULT NULL COMMENT \'单行文本\',\\n `LINK_ID` BIGINT(20) DEFAULT NULL,\\n `CREATE_DATE` DATETIME DEFAULT NULL COMMENT \'创建时间\',\\n `CREATE_BY` VARCHAR(50) DEFAULT NULL COMMENT \'创建人\',\\n `UPDATE_DATE` DATETIME DEFAULT NULL COMMENT \'修改时间\',\\n `UPDATE_BY` VARCHAR(50) DEFAULT NULL COMMENT \'修改人\',\\n `DEL` INT(1) DEFAULT 0 COMMENT \'删除标记\',\\n PRIMARY KEY (`ID`) USING BTREE\\n ) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT=\'test1\';\\n \\n\",\"tableName\":\"TEST\"}', 'MDIY_FORM_TEST', 'test1', 0, '', '\n[\n {\n \"model\":\"textareaC\",\n \"key\":\"TEXTAREA_C\",\n \"field\":\"TEXTAREA_C\",\n \"javaType\":\"String\",\n \"jdbcType\":\"VARCHAR\",\n \"name\":\"多行文本\",\n \"type\":\"textarea\",\n \"length\":\"255\",\n \"isShow\":false,\n \"isSearch\":false\n }\n ,\n {\n \"model\":\"input170002971300079971\",\n \"key\":\"input_1700029713000_79971\",\n \"field\":\"input_1700029713000_79971\",\n \"javaType\":\"String\",\n \"jdbcType\":\"VARCHAR\",\n \"name\":\"单行文本\",\n \"type\":\"input\",\n \"length\":\"255\",\n \"isShow\":true,\n \"isSearch\":true\n }\n ,{\n \"model\":\"selectC\",\n \"key\":\"SELECT_C\",\n \"field\":\"SELECT_C\",\n \"javaType\":\"String\",\n \"jdbcType\":\"VARCHAR\",\n \"name\":\"下拉选择框\",\n \"type\":\"select\",\n \"length\":\"255\",\n \"isShow\":true,\n \"isSearch\":true\n }\n ,{\n \"model\":\"textareaCdd\",\n \"key\":\"TEXTAREA_CDD\",\n \"field\":\"TEXTAREA_CDD\",\n \"javaType\":\"String\",\n \"jdbcType\":\"VARCHAR\",\n \"name\":\"多行文本\",\n \"type\":\"textarea\",\n \"length\":\"255\",\n \"isShow\":false,\n \"isSearch\":false\n }\n ,{\n \"model\":\"moneyA\",\n \"key\":\"MONEY_A\",\n \"field\":\"MONEY_A\",\n \"javaType\":\"Double\",\n \"jdbcType\":\"DECIMAL\",\n \"name\":\"金钱\",\n \"type\":\"money\",\n \"length\":\"11\",\n \"isShow\":true,\n \"isSearch\":false\n }\n ,{\n \"model\":\"inputC\",\n \"key\":\"INPUT_C\",\n \"field\":\"INPUT_C\",\n \"javaType\":\"String\",\n \"jdbcType\":\"VARCHAR\",\n \"name\":\"单行文本\",\n \"type\":\"input\",\n \"length\":\"255\",\n \"isShow\":true,\n \"isSearch\":true\n }\n]\n\n', 'form', NULL, NULL, NULL, NULL, 0, 0);
COMMIT;
-- ----------------------------
@@ -463,7 +488,7 @@ CREATE TABLE `model` (
KEY `idx_model_id` (`model_id`) USING BTREE,
KEY `idx_model_title` (`model_title`,`model_url`) USING BTREE,
CONSTRAINT `fk_model_id` FOREIGN KEY (`model_id`) REFERENCES `model` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=1818 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='模块表';
+) ENGINE=InnoDB AUTO_INCREMENT=1820 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='模块表';
-- ----------------------------
-- Records of model
@@ -555,6 +580,8 @@ INSERT INTO `model` (`id`, `model_id`, `model_parent_ids`, `model_code`, `model_
INSERT INTO `model` (`id`, `model_id`, `model_parent_ids`, `model_code`, `model_title`, `model_url`, `model_icon`, `model_sort`, `model_ismenu`, `IS_CHILD`, `model_datetime`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`) VALUES (1815, 1812, '1700,1812', '15725929177744138', '修改', 'mdiy:dict:update', NULL, 0, 0, NULL, '2023-08-12 09:11:16', NULL, NULL, NULL, NULL, 0);
INSERT INTO `model` (`id`, `model_id`, `model_parent_ids`, `model_code`, `model_title`, `model_url`, `model_icon`, `model_sort`, `model_ismenu`, `IS_CHILD`, `model_datetime`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`) VALUES (1816, 1812, '1700,1812', '15725929177748034', '删除', 'mdiy:dict:del', NULL, 0, 0, NULL, '2023-08-12 09:11:16', NULL, NULL, NULL, NULL, 0);
INSERT INTO `model` (`id`, `model_id`, `model_parent_ids`, `model_code`, `model_title`, `model_url`, `model_icon`, `model_sort`, `model_ismenu`, `IS_CHILD`, `model_datetime`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`) VALUES (1817, 1812, '1700,1812', NULL, '导入', 'mdiy:dict:importJson', NULL, 0, 0, NULL, '2023-08-12 09:11:17', NULL, NULL, NULL, NULL, 0);
+INSERT INTO `model` (`id`, `model_id`, `model_parent_ids`, `model_code`, `model_title`, `model_url`, `model_icon`, `model_sort`, `model_ismenu`, `IS_CHILD`, `model_datetime`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`) VALUES (1818, 84, '84', '', '系统信息', 'basic/system/index.do', '', 11, 1, '', '2024-02-01 16:33:10', '57', '2024-02-04 16:52:14', '', NULL, 0);
+INSERT INTO `model` (`id`, `model_id`, `model_parent_ids`, `model_code`, `model_title`, `model_url`, `model_icon`, `model_sort`, `model_ismenu`, `IS_CHILD`, `model_datetime`, `UPDATE_BY`, `UPDATE_DATE`, `CREATE_BY`, `CREATE_DATE`, `DEL`) VALUES (1819, 1818, '84,1818', NULL, '查看', 'system:view', NULL, 0, 0, NULL, '2024-02-01 16:33:10', NULL, NULL, NULL, NULL, 0);
COMMIT;
-- ----------------------------
@@ -593,7 +620,7 @@ CREATE TABLE `role_model` (
KEY `fk_role_id` (`role_id`) USING BTREE,
CONSTRAINT `fk_rm_model_id` FOREIGN KEY (`model_id`) REFERENCES `model` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION,
CONSTRAINT `fk_rm_role_id` FOREIGN KEY (`role_id`) REFERENCES `role` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
-) ENGINE=InnoDB AUTO_INCREMENT=99 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='角色模块关联表';
+) ENGINE=InnoDB AUTO_INCREMENT=101 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='角色模块关联表';
-- ----------------------------
-- Records of role_model
@@ -685,6 +712,8 @@ INSERT INTO `role_model` (`id`, `model_id`, `role_id`) VALUES (95, 1814, 48);
INSERT INTO `role_model` (`id`, `model_id`, `role_id`) VALUES (96, 1815, 48);
INSERT INTO `role_model` (`id`, `model_id`, `role_id`) VALUES (97, 1816, 48);
INSERT INTO `role_model` (`id`, `model_id`, `role_id`) VALUES (98, 1817, 48);
+INSERT INTO `role_model` (`id`, `model_id`, `role_id`) VALUES (99, 1818, 48);
+INSERT INTO `role_model` (`id`, `model_id`, `role_id`) VALUES (100, 1819, 48);
COMMIT;
SET FOREIGN_KEY_CHECKS = 1;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1736f308..02df00e1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,6 +1,6 @@
spring:
datasource:
- url: jdbc:mysql://localhost:3306/mcms?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=true
+ url: jdbc:mysql://localhost:3306/mcms?useUnicode=true&serverTimezone=Asia/Shanghai&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&allowMultiQueries=true&useSSL=false
username: root
password: root
filters: wall,mergeStat