升级为平台ms

README.md

-# 铭飞业务系统基础开发平台 此系统为演示版
-当前版本:4.7.0 <br/>
+# 铭飞业务系统基础开发平台
+线上ms.mingsoft.net
+
+当前版本:4.7.1 <br/>
 铭飞MS官网:http://ms.mingsoft.net<br/>
+演示版:http://demo.cms.mingsoft.net/ms/login.do<br/>
 官网同时提供一键运行版本下载，请步移官网....<br/>
 QQ交流群号：[![加入QQ群](https://img.shields.io/badge/三群-242805203-blue.svg)](https://jq.qq.com/?_wv=1027&k=5oF19sl)  [![加入QQ群](https://img.shields.io/badge/一群-231212174-blue.svg)](https://jq.qq.com/?_wv=1027&k=5zykX7V)  [![加入QQ群](https://img.shields.io/badge/二群-221335098-blue.svg)](https://jq.qq.com/?_wv=1027&k=56BqFKu) 
 

doc/4.7.0-to-4.7.1-mysql.sql

@@ -50,7 +50,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.categoryId gt 0 >\r\n  <#assign  _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n  <#assign  _typeid=\"${typeid}\">\r\n</#if>\r\n<#if size??>\r\n  <#assign  _size=\"${size}\">\r\n</#if>\r\n<#if orderby?? >\r\n      <#if orderby==\"date\"> \r\n	   <#assign  _orderby=\"basic_datetime\">\r\n      <#elseif orderby==\"updatedate\">\r\n <#assign  _orderby=\"basic_updatetime\">\r\n      <#elseif orderby==\"hit\"> \r\n	  <#assign  _orderby=\"basic_hit\">\r\n      <#elseif orderby==\"sort\">\r\n	   <#assign  _orderby=\"basic_sort\">\r\n      <#else><#assign  _orderby=\"basic_id\"></#if>\r\n   <#else>\r\n   <#assign  _orderby=\"basic_id\">\r\n  </#if>\r\nSELECT\r\n  basic_id AS id,\r\n  @rownum := @rownum + 1 AS `index`,\r\n  LEFT (basic_title, ${titlelen ?default(40)}) AS title,\r\n  basic_title AS fulltitle,\r\n  article_author AS author,\r\n  article_source AS source,\r\n  article_content AS content,\r\n  category.category_title AS typename,\r\n  category.category_id AS typeid,\r\n  category.category_smallimg 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  </#if>\r\n  basic.basic_thumbnails AS litpic,\r\n  <#--内容页动态链接-->\r\n  <#if isDo?? && isDo>\r\n   CONCAT(\"/${modelName}/view.do?id=\", basic_id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n  <#else>\r\n\r\n  CONCAT(basic_column.column_path,\"/\",basic_id,\".html\") AS link,\r\n  </#if>\r\n  basic_datetime AS date,<#if tableName??>${tableName}.*,</#if>\r\n  basic_description AS descrip,\r\n  basic_hit AS hit,\r\n  article_type AS flag,\r\n  category_title AS typetitle,\r\n  cms_article.article_keyword AS keyword \r\nFROM\r\n  (SELECT @rownum := 0) r,\r\n  basic\r\n  LEFT JOIN cms_article ON cms_article.article_basicid = basic.basic_id\r\n  LEFT JOIN category ON basic_categoryid = category.category_id\r\n  LEFT JOIN basic_column ON basic_column.column_category_id = basic.basic_categoryid \r\n  <#--判断是否有自定义模型表-->\r\n  <#if tableName??>LEFT JOIN ${tableName} ON ${tableName}.basicId=cms_article.article_basicid </#if>\r\nWHERE  \r\n  basic.basic_display=0 \r\n  <#--根据站点编号查询-->\r\n  <#if appId?? >\r\n    and (basic.basic_appid=${appId} or  cms_article.ARTICLE_WEBID=${appId})\r\n	and cms_article.article_basicid>0\r\n  </#if>\r\n  <#--根据模块编号查询分类-->\r\n  <#if column?? && column.categoryModelId?has_content>\r\n    and category_modelid=${column.categoryModelId}\r\n  </#if>\r\n  <#--判断是否有搜索分类集合-->\r\n  <#if search??>\r\n		<#if search.categoryIds??>and FIND_IN_SET(category_categoryid,\'${search.categoryIds}\')</#if>\r\n			<#--标题-->\r\n			<#if search.basic_title??> and basic_title like CONCAT(\"%\",\'${search.basic_title}\',\"%\")</#if>\r\n			<#--作者-->\r\n			<#if search.article_author??> and article_author like CONCAT(\"%\",\'${search.article_author}\',\"%\")</#if>\r\n			<#--来源-->\r\n			<#if search.article_source??> and article_source like CONCAT(\"%\",\'${search.article_source}\',\"%\")</#if>\r\n			<#--属性-->\r\n			<#if search.article_type??> and article_type like CONCAT(\"%\",\'${search.article_type}\',\"%\")</#if>\r\n			<#--图片-->\r\n			<#if search.basic_thumbnails??> and basic_thumbnails like CONCAT(\"%\",\'${search.basic_thumbnails}\',\"%\")</#if>\r\n			<#--描述-->\r\n			<#if search.basic_description??> and basic_description like CONCAT(\"%\",\'${search.basic_description}\',\"%\")</#if>\r\n			<#--关键字-->\r\n			<#if search.article_keyword??> and article_keyword like CONCAT(\"%\",\'${search.article_keyword}\',\"%\")</#if>\r\n			<#--内容-->\r\n			<#if search.article_content??> and article_content like CONCAT(\"%\",\'${search.article_content}\',\"%\")</#if>\r\n			<#--自定义顺序-->\r\n			<#if search.article_freeorder??> and article_freeorder=${search.article_freeorder}</#if>\r\n  <#else><#--查询栏目-->\r\n    <#if _typeid?has_content> and (basic_categoryid=${_typeid} or basic_categoryid in \r\n  (select category_id FROM category where category.del=0 and find_in_set(${_typeid},CATEGORY_PARENT_ID))) </#if>\r\n </#if>\r\n  <#--标题-->\r\n  <#if basic_title??> and basic_title like CONCAT(\"%\",\'${basic_title}\',\"%\")</#if>\r\n  <#--作者-->\r\n  <#if article_author??> and article_author like CONCAT(\"%\",\'${article_author}\',\"%\")</#if>\r\n  <#--来源-->\r\n  <#if article_source??> and article_source like CONCAT(\"%\",\'${article_source}\',\"%\")</#if>\r\n  <#--属性-->\r\n  <#if article_type??> and article_type like CONCAT(\"%\",\'${article_type}\',\"%\")</#if>\r\n  <#--图片-->\r\n  <#if basic_thumbnails??> and basic_thumbnails like CONCAT(\"%\",\'${basic_thumbnails}\',\"%\")</#if>\r\n  <#--描述-->\r\n  <#if basic_description??> and basic_description like CONCAT(\"%\",\'${basic_description}\',\"%\")</#if>\r\n  <#--关键字-->\r\n  <#if article_keyword??> and article_keyword like CONCAT(\"%\",\'${article_keyword}\',\"%\")</#if>\r\n  <#--内容-->\r\n  <#if article_content??> and article_content like CONCAT(\"%\",\'${article_content}\',\"%\")</#if>\r\n  <#--自定义顺序-->\r\n  <#if article_freeorder??> and article_freeorder=${article_freeorder}</#if>\r\n  <#--自定义模型-->\r\n  <#if diyModel??> \r\n    <#list diyModel as dm>\r\n      and ${tableName}.${dm.key} = \"${dm.value}\" \r\n    </#list>\r\n  </#if>\r\n  <#--文章属性-->\r\n  <#if flag?? >\r\n      and cms_article.article_type like CONCAT(\'%\',\'${flag}\',\'%\') \r\n  </#if>\r\n  <#if noflag?? >\r\n      and cms_article.article_type not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n  </#if>\r\n  <#--字段排序-->\r\n  <#if orderby?? >\r\n    ORDER BY \r\n      <#if orderby==\"date\"> basic.basic_datetime\r\n      <#elseif orderby==\"updatedate\"> basic.basic_updatetime\r\n      <#elseif orderby==\"hit\"> basic.basic_hit\r\n      <#elseif orderby==\"sort\"> basic.basic_sort\r\n      <#else>basic.basic_id</#if>\r\n <#else>\r\n    ORDER BY   basic.basic_id\r\n  </#if>\r\n  <#if order?? >\r\n      <#if order==\"desc\"> desc</#if>\r\n      <#if order==\"asc\"> asc</#if>\r\n  </#if>\r\n   LIMIT \r\n    <#--判断是否分页-->\r\n  <#if ispaging?? && (pageTag.pageNo)??>${(pageTag.pageNo-1)*_size?eval},${_size?default(20)}\r\n  <#else>${_size?default(20)}</#if>', '1');
+INSERT INTO `mdiy_tag_sql` VALUES ('5', '3', '<#assign _typeid=\"\"/>\r\n<#assign _size=\"20\"/>\r\n<#if column?? && column.categoryId gt 0 >\r\n  <#assign  _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n  <#assign  _typeid=\"${typeid}\">\r\n</#if>\r\n<#if size??>\r\n  <#assign  _size=\"${size}\">\r\n</#if>\r\n<#if orderby?? >\r\n      <#if orderby==\"date\"> \r\n	   <#assign  _orderby=\"basic_datetime\">\r\n      <#elseif orderby==\"updatedate\">\r\n <#assign  _orderby=\"basic_updatetime\">\r\n      <#elseif orderby==\"hit\"> \r\n	  <#assign  _orderby=\"basic_hit\">\r\n      <#elseif orderby==\"sort\">\r\n	   <#assign  _orderby=\"basic_sort\">\r\n      <#else><#assign  _orderby=\"basic_id\"></#if>\r\n   <#else>\r\n   <#assign  _orderby=\"basic_id\">\r\n  </#if>\r\nSELECT\r\n  basic_id AS id,\r\n  @rownum := @rownum + 1 AS `index`,\r\n  LEFT (basic_title, ${titlelen ?default(40)}) AS title,\r\n  basic_title AS fulltitle,\r\n  article_author AS author,\r\n  article_source AS source,\r\n  article_content AS content,\r\n  category.category_title AS typename,\r\n  category.category_id AS typeid,\r\n  category.category_smallimg 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  </#if>\r\n  basic.basic_thumbnails AS litpic,\r\n  <#--内容页动态链接-->\r\n  <#if isDo?? && isDo>\r\n   CONCAT(\"/${modelName}/view.do?id=\", basic_id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n  <#else>\r\n\r\n  CONCAT(basic_column.column_path,\"/\",basic_id,\".html\") AS link,\r\n  </#if>\r\n  basic_datetime AS date,<#if tableName??>${tableName}.*,</#if>\r\n  basic_description AS descrip,\r\n  basic_hit AS hit,\r\n  article_type AS flag,\r\n  category_title AS typetitle,\r\n  cms_article.article_keyword AS keyword \r\nFROM\r\n  (SELECT @rownum := 0) r,\r\n  basic\r\n  LEFT JOIN cms_article ON cms_article.article_basicid = basic.basic_id\r\n  LEFT JOIN category ON basic_categoryid = category.category_id\r\n  LEFT JOIN basic_column ON basic_column.column_category_id = basic.basic_categoryid \r\n  <#--判断是否有自定义模型表-->\r\n  <#if tableName??>LEFT JOIN ${tableName} ON ${tableName}.basicId=cms_article.article_basicid </#if>\r\nWHERE  \r\n  basic.basic_display=0 \r\n  <#--根据站点编号查询-->\r\n  <#if appId?? >\r\n    and (basic.basic_appid=${appId} or  cms_article.ARTICLE_WEBID=${appId})\r\n	and cms_article.article_basicid>0\r\n  </#if>\r\n  <#--根据模块编号查询分类-->\r\n  <#if column?? && column.categoryModelId?has_content>\r\n    and category_modelid=${column.categoryModelId}\r\n  </#if>\r\n  <#--判断是否有搜索分类集合-->\r\n  <#if search??>\r\n		<#if search.categoryIds??>and FIND_IN_SET(category_categoryid,\'${search.categoryIds}\')</#if>\r\n			<#--标题-->\r\n			<#if search.basic_title??> and basic_title like CONCAT(\"%\",\'${search.basic_title}\',\"%\")</#if>\r\n			<#--作者-->\r\n			<#if search.article_author??> and article_author like CONCAT(\"%\",\'${search.article_author}\',\"%\")</#if>\r\n			<#--来源-->\r\n			<#if search.article_source??> and article_source like CONCAT(\"%\",\'${search.article_source}\',\"%\")</#if>\r\n			<#--属性-->\r\n			<#if search.article_type??> and article_type like CONCAT(\"%\",\'${search.article_type}\',\"%\")</#if>\r\n			<#--图片-->\r\n			<#if search.basic_thumbnails??> and basic_thumbnails like CONCAT(\"%\",\'${search.basic_thumbnails}\',\"%\")</#if>\r\n			<#--描述-->\r\n			<#if search.basic_description??> and basic_description like CONCAT(\"%\",\'${search.basic_description}\',\"%\")</#if>\r\n			<#--关键字-->\r\n			<#if search.article_keyword??> and article_keyword like CONCAT(\"%\",\'${search.article_keyword}\',\"%\")</#if>\r\n			<#--内容-->\r\n			<#if search.article_content??> and article_content like CONCAT(\"%\",\'${search.article_content}\',\"%\")</#if>\r\n			<#--自定义顺序-->\r\n			<#if search.article_freeorder??> and article_freeorder=${search.article_freeorder}</#if>\r\n  <#else><#--查询栏目-->\r\n    <#if _typeid?has_content> and (basic_categoryid=${_typeid} or basic_categoryid in \r\n  (select category_id FROM category where category.del=0 and find_in_set(${_typeid},CATEGORY_PARENT_ID))) </#if>\r\n </#if>\r\n  <#--标题-->\r\n  <#if basic_title??> and basic_title like CONCAT(\"%\",\'${basic_title}\',\"%\")</#if>\r\n  <#--作者-->\r\n  <#if article_author??> and article_author like CONCAT(\"%\",\'${article_author}\',\"%\")</#if>\r\n  <#--来源-->\r\n  <#if article_source??> and article_source like CONCAT(\"%\",\'${article_source}\',\"%\")</#if>\r\n  <#--属性-->\r\n  <#if article_type??> and article_type like CONCAT(\"%\",\'${article_type}\',\"%\")</#if>\r\n  <#--图片-->\r\n  <#if basic_thumbnails??> and basic_thumbnails like CONCAT(\"%\",\'${basic_thumbnails}\',\"%\")</#if>\r\n  <#--描述-->\r\n  <#if basic_description??> and basic_description like CONCAT(\"%\",\'${basic_description}\',\"%\")</#if>\r\n  <#--关键字-->\r\n  <#if article_keyword??> and article_keyword like CONCAT(\"%\",\'${article_keyword}\',\"%\")</#if>\r\n  <#--内容-->\r\n  <#if article_content??> and article_content like CONCAT(\"%\",\'${article_content}\',\"%\")</#if>\r\n  <#--自定义顺序-->\r\n  <#if article_freeorder??> and article_freeorder=${article_freeorder}</#if>\r\n  <#--自定义模型-->\r\n  <#if diyModel??> \r\n    <#list diyModel as dm>\r\n      and ${tableName}.${dm.key} = \"${dm.value}\" \r\n    </#list>\r\n  </#if>\r\n  <#--文章属性-->\r\n  <#if flag?? >\r\n      and cms_article.article_type like CONCAT(\'%\',\'${flag}\',\'%\') \r\n  </#if>\r\n  <#if noflag?? >\r\n      and cms_article.article_type not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n  </#if>\r\n  <#--字段排序-->\r\n  <#if orderby?? >\r\n    ORDER BY \r\n      <#if orderby==\"date\"> basic.basic_datetime\r\n      <#elseif orderby==\"updatedate\"> basic.basic_updatetime\r\n      <#elseif orderby==\"hit\"> basic.basic_hit\r\n      <#elseif orderby==\"sort\"> basic.basic_sort\r\n      <#else>basic.basic_id</#if>\r\n <#else>\r\n    ORDER BY   basic.basic_id\r\n  </#if>\r\n  <#if order?? >\r\n      <#if order==\"desc\"> desc</#if>\r\n      <#if order==\"asc\"> asc</#if>\r\n  </#if>\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)}</#if>', '1');
 INSERT INTO `mdiy_tag_sql` VALUES ('6', '4', '<#assign _typeid=\"\"/>\r\n<#if column?? && column.categoryId gt 0>\r\n	<#assign  _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n	<#assign  _typeid=\"${typeid}\">\r\n</#if>\r\nselect \r\n	@rownum := @rownum + 1 AS typeindex,\r\n	category_id as id,\r\n	category_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</#if> = category_id ,\"${class!\'\'}\",\"\") as class,\r\n	<#--动态链接-->\r\n	<#if isDo?? && isDo>\r\n	CONCAT(\"/${modelName}/list.do?typeid=\", category_id) as typelink,\r\n	<#else>\r\n	CONCAT(column_path,\"/index.html\") as typelink,\r\n	</#if>\r\n	column_keyword as typekeyword,\r\n	column_diy_url as typeurl,\r\n	column_flag as flag,\r\n	column_descrip as typedescrip,\r\n	category_smallimg as typelitpic  \r\n	from (SELECT @rownum := 0) r,category  \r\n	LEFT JOIN basic_column bc on bc.column_category_id=category.category_id where \r\n	category.del=0 \r\n	<#--根据站点编号查询-->\r\n	<#if appId?? >\r\n		and category.category_appid=${appId}\r\n	</#if>\r\n	<#--根据模块编号查询分类-->\r\n	<#if column?? && column.categoryModelId?has_content>\r\n		and category_modelid=${column.categoryModelId}\r\n	</#if>\r\n	<#--栏目属性-->\r\n	<#if flag?? >\r\n		and bc.column_flag like CONCAT(\'%\',\'${flag}\',\'%\') \r\n	</#if>\r\n	<#if noflag?? >\r\n		and bc.column_flag not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n	</#if>\r\n<#if type?has_content>\r\n	<#--顶级栏目（单个）-->\r\n	<#if type==\"top\">\r\n		and category_id=(select left(category_parent_id,LOCATE(\",\",category_parent_id)-1) from category where category_id = ${_typeid})\r\n	<#elseif type==\"nav\">\r\n		and(category_categoryid=0 or category_categoryid is null)\r\n	<#--同级栏目（多个）-->\r\n	<#elseif type==\"level\">\r\n		and\r\n		<#if _typeid?has_content>\r\n		 category_categoryid=(select category_categoryid from category where category_id=${_typeid})\r\n		<#else>\r\n		 1=1\r\n		</#if>\r\n  	<#--当前栏目（单个）-->\r\n	<#elseif type==\"self\">\r\n		 and \r\n		 <#if _typeid?has_content>\r\n		  category_id=${_typeid}\r\n		 <#else>\r\n		 1=1\r\n		 </#if>\r\n	<#--当前栏目的所属栏目（多个）-->\r\n	<#elseif type==\"path\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		   category_id in (<#if column?? && column.categoryParentId??>${column.categoryParentId},</#if>${_typeid})\r\n		 <#else>\r\n		  1=1\r\n		 </#if>\r\n	<#--子栏目（多个）-->\r\n	<#elseif type==\"son\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		  category_categoryid=${_typeid}\r\n		 <#else>\r\n		  1=1\r\n		 </#if>\r\n		 <#--上一级栏目没有则取当前栏目（单个）-->\r\n	<#elseif type==\"parent\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		   <#if column?? && column.categoryCategoryId?? && column.categoryCategoryId!=0>\r\n				category_id=${column.categoryCategoryId}\r\n			 <#else>\r\n			  category_id=${_typeid}\r\n			 </#if>\r\n		 <#else>\r\n		  1=1\r\n	</#if>\r\n	<#--子栏目或同级栏目（多个）-->\r\n	<#elseif type==\"sonOrLevel\">\r\n		 and \r\n		 <#if _typeid?has_content>\r\n	 	 category_categoryid= if((SELECT count(*) FROM category\r\n		 LEFT JOIN basic_column bc ON bc.column_category_id = category.category_id \r\n		 WHERE category_categoryid=${_typeid})>0,${_typeid},(select category_categoryid from category where category_id=${_typeid}))\r\n		 <#else>\r\n		 1=1\r\n		 </#if>\r\n	</#if>\r\n<#else> <#--默认son-->\r\n	 and\r\n	<#if _typeid?has_content>\r\n	 category_categoryid=${_typeid}\r\n	<#else>\r\n	 (category_categoryid=0 or category_categoryid is null)\r\n	</#if>\r\n</#if>', '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}</#if>\") 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}</#if>\") as url,\r\nREPLACE(REPLACE(TRIM(substring_index(app_url,\"\\n\",1)), CHAR(10),\'\'), CHAR(13),\'\') as host,\r\n</#if>\r\nCONCAT(\"templets/\",app_id,\"/\",<#if m??>CONCAT(app_style,\"/${m}\")<#else>app_style</#if>) as style <#-- 判断是否为手机端 -->\r\nfrom app where app_id = ${appId} limit 1', '1');
 INSERT INTO `mdiy_tag_sql` VALUES ('8', '7', 'SELECT \r\nbasic_id as id,\r\nleft(basic_title,${titlelen?default(40)}) as title,\r\nbasic_title as fulltitle,\r\narticle_author as author, \r\narticle_source as source, \r\narticle_content as content,\r\ncategory.category_title as typetitle,\r\ncategory.category_id as typeid,\r\ncategory.category_smallimg AS typelitpic,\r\n<#--动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/${modelName}/list.do?typeid=\", category.category_id) as typelink,\r\n<#else>\r\n(SELECT \"index.html\") as typelink,\r\n</#if>\r\nbasic.basic_thumbnails as litpic,\r\n<#--内容页动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/mcms/view.do?id=\", basic_id) as link,\r\n<#else>\r\ncms_article.article_url AS link,\r\n</#if>\r\nbasic_datetime as date,\r\nbasic_description as descrip,\r\nCONCAT(\"<script type=\'text/javascript\' src=\'${url}/basic/\",basic_id,\"/hit.do\'></script>\") as hit,\r\narticle_type as flag,\r\ncategory_title as typetitle,\r\n<#if tableName??>${tableName}.*,</#if>\r\ncms_article.article_keyword as keyword\r\nFROM basic LEFT JOIN cms_article ON cms_article.article_basicid = basic.basic_id \r\nLEFT JOIN category ON basic_categoryid=category.category_id \r\nLEFT JOIN basic_column ON basic_column.column_category_id=basic.basic_categoryid\r\n<#--判断是否有自定义模型表-->\r\n<#if tableName??>left join ${tableName} on ${tableName}.basicId=cms_article.ARTICLE_BASICID</#if>\r\nWHERE \r\n1=1\r\n<#if id??> and basic_id=${id}</#if>', '1');

doc/db-mcms-mysql-4.7.1.sql

@@ -913,7 +913,7 @@ CREATE TABLE `mdiy_tag_sql` (
 -- Records of mdiy_tag_sql
 -- ----------------------------
 BEGIN;
-INSERT INTO `mdiy_tag_sql` VALUES (5, 3, '<#assign _typeid=\"\"/>\r\n<#assign _size=\"20\"/>\r\n<#if column?? && column.categoryId gt 0 >\r\n  <#assign  _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n  <#assign  _typeid=\"${typeid}\">\r\n</#if>\r\n<#if size??>\r\n  <#assign  _size=\"${size}\">\r\n</#if>\r\n<#if orderby?? >\r\n      <#if orderby==\"date\"> \r\n	   <#assign  _orderby=\"basic_datetime\">\r\n      <#elseif orderby==\"updatedate\">\r\n <#assign  _orderby=\"basic_updatetime\">\r\n      <#elseif orderby==\"hit\"> \r\n	  <#assign  _orderby=\"basic_hit\">\r\n      <#elseif orderby==\"sort\">\r\n	   <#assign  _orderby=\"basic_sort\">\r\n      <#else><#assign  _orderby=\"basic_id\"></#if>\r\n   <#else>\r\n   <#assign  _orderby=\"basic_id\">\r\n  </#if>\r\nSELECT\r\n  basic_id AS id,\r\n  @rownum := @rownum + 1 AS `index`,\r\n  LEFT (basic_title, ${titlelen ?default(40)}) AS title,\r\n  basic_title AS fulltitle,\r\n  article_author AS author,\r\n  article_source AS source,\r\n  article_content AS content,\r\n  category.category_title AS typename,\r\n  category.category_id AS typeid,\r\n  category.category_smallimg 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  </#if>\r\n  basic.basic_thumbnails AS litpic,\r\n  <#--内容页动态链接-->\r\n  <#if isDo?? && isDo>\r\n   CONCAT(\"/${modelName}/view.do?id=\", basic_id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n  <#else>\r\n\r\n  CONCAT(basic_column.column_path,\"/\",basic_id,\".html\") AS link,\r\n  </#if>\r\n  basic_datetime AS date,<#if tableName??>${tableName}.*,</#if>\r\n  basic_description AS descrip,\r\n  basic_hit AS hit,\r\n  article_type AS flag,\r\n  category_title AS typetitle,\r\n  cms_article.article_keyword AS keyword \r\nFROM\r\n  (SELECT @rownum := 0) r,\r\n  basic\r\n  LEFT JOIN cms_article ON cms_article.article_basicid = basic.basic_id\r\n  LEFT JOIN category ON basic_categoryid = category.category_id\r\n  LEFT JOIN basic_column ON basic_column.column_category_id = basic.basic_categoryid \r\n  <#--判断是否有自定义模型表-->\r\n  <#if tableName??>LEFT JOIN ${tableName} ON ${tableName}.basicId=cms_article.article_basicid </#if>\r\nWHERE  \r\n  basic.basic_display=0 \r\n  <#--根据站点编号查询-->\r\n  <#if appId?? >\r\n    and (basic.basic_appid=${appId} or  cms_article.ARTICLE_WEBID=${appId})\r\n	and cms_article.article_basicid>0\r\n  </#if>\r\n  <#--根据模块编号查询分类-->\r\n  <#if column?? && column.categoryModelId?has_content>\r\n    and category_modelid=${column.categoryModelId}\r\n  </#if>\r\n  <#--判断是否有搜索分类集合-->\r\n  <#if search??>\r\n		<#if search.categoryIds??>and FIND_IN_SET(category_categoryid,\'${search.categoryIds}\')</#if>\r\n			<#--标题-->\r\n			<#if search.basic_title??> and basic_title like CONCAT(\"%\",\'${search.basic_title}\',\"%\")</#if>\r\n			<#--作者-->\r\n			<#if search.article_author??> and article_author like CONCAT(\"%\",\'${search.article_author}\',\"%\")</#if>\r\n			<#--来源-->\r\n			<#if search.article_source??> and article_source like CONCAT(\"%\",\'${search.article_source}\',\"%\")</#if>\r\n			<#--属性-->\r\n			<#if search.article_type??> and article_type like CONCAT(\"%\",\'${search.article_type}\',\"%\")</#if>\r\n			<#--图片-->\r\n			<#if search.basic_thumbnails??> and basic_thumbnails like CONCAT(\"%\",\'${search.basic_thumbnails}\',\"%\")</#if>\r\n			<#--描述-->\r\n			<#if search.basic_description??> and basic_description like CONCAT(\"%\",\'${search.basic_description}\',\"%\")</#if>\r\n			<#--关键字-->\r\n			<#if search.article_keyword??> and article_keyword like CONCAT(\"%\",\'${search.article_keyword}\',\"%\")</#if>\r\n			<#--内容-->\r\n			<#if search.article_content??> and article_content like CONCAT(\"%\",\'${search.article_content}\',\"%\")</#if>\r\n			<#--自定义顺序-->\r\n			<#if search.article_freeorder??> and article_freeorder=${search.article_freeorder}</#if>\r\n  <#else><#--查询栏目-->\r\n    <#if _typeid?has_content> and (basic_categoryid=${_typeid} or basic_categoryid in \r\n  (select category_id FROM category where category.del=0 and find_in_set(${_typeid},CATEGORY_PARENT_ID))) </#if>\r\n </#if>\r\n  <#--标题-->\r\n  <#if basic_title??> and basic_title like CONCAT(\"%\",\'${basic_title}\',\"%\")</#if>\r\n  <#--作者-->\r\n  <#if article_author??> and article_author like CONCAT(\"%\",\'${article_author}\',\"%\")</#if>\r\n  <#--来源-->\r\n  <#if article_source??> and article_source like CONCAT(\"%\",\'${article_source}\',\"%\")</#if>\r\n  <#--属性-->\r\n  <#if article_type??> and article_type like CONCAT(\"%\",\'${article_type}\',\"%\")</#if>\r\n  <#--图片-->\r\n  <#if basic_thumbnails??> and basic_thumbnails like CONCAT(\"%\",\'${basic_thumbnails}\',\"%\")</#if>\r\n  <#--描述-->\r\n  <#if basic_description??> and basic_description like CONCAT(\"%\",\'${basic_description}\',\"%\")</#if>\r\n  <#--关键字-->\r\n  <#if article_keyword??> and article_keyword like CONCAT(\"%\",\'${article_keyword}\',\"%\")</#if>\r\n  <#--内容-->\r\n  <#if article_content??> and article_content like CONCAT(\"%\",\'${article_content}\',\"%\")</#if>\r\n  <#--自定义顺序-->\r\n  <#if article_freeorder??> and article_freeorder=${article_freeorder}</#if>\r\n  <#--自定义模型-->\r\n  <#if diyModel??> \r\n    <#list diyModel as dm>\r\n      and ${tableName}.${dm.key} = \"${dm.value}\" \r\n    </#list>\r\n  </#if>\r\n  <#--文章属性-->\r\n  <#if flag?? >\r\n      and cms_article.article_type like CONCAT(\'%\',\'${flag}\',\'%\') \r\n  </#if>\r\n  <#if noflag?? >\r\n      and cms_article.article_type not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n  </#if>\r\n  <#--字段排序-->\r\n  <#if orderby?? >\r\n    ORDER BY \r\n      <#if orderby==\"date\"> basic.basic_datetime\r\n      <#elseif orderby==\"updatedate\"> basic.basic_updatetime\r\n      <#elseif orderby==\"hit\"> basic.basic_hit\r\n      <#elseif orderby==\"sort\"> basic.basic_sort\r\n      <#else>basic.basic_id</#if>\r\n <#else>\r\n    ORDER BY   basic.basic_id\r\n  </#if>\r\n  <#if order?? >\r\n      <#if order==\"desc\"> desc</#if>\r\n      <#if order==\"asc\"> asc</#if>\r\n  </#if>\r\n   LIMIT \r\n    <#--判断是否分页-->\r\n  <#if ispaging?? && (pageTag.pageNo)??>${(pageTag.pageNo-1)*_size?eval},${_size?default(20)}\r\n  <#else>${_size?default(20)}</#if>', 1);
+INSERT INTO `mdiy_tag_sql` VALUES (5, 3, '<#assign _typeid=\"\"/>\r\n<#assign _size=\"20\"/>\r\n<#if column?? && column.categoryId gt 0 >\r\n  <#assign  _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n  <#assign  _typeid=\"${typeid}\">\r\n</#if>\r\n<#if size??>\r\n  <#assign  _size=\"${size}\">\r\n</#if>\r\n<#if orderby?? >\r\n      <#if orderby==\"date\"> \r\n	   <#assign  _orderby=\"basic_datetime\">\r\n      <#elseif orderby==\"updatedate\">\r\n <#assign  _orderby=\"basic_updatetime\">\r\n      <#elseif orderby==\"hit\"> \r\n	  <#assign  _orderby=\"basic_hit\">\r\n      <#elseif orderby==\"sort\">\r\n	   <#assign  _orderby=\"basic_sort\">\r\n      <#else><#assign  _orderby=\"basic_id\"></#if>\r\n   <#else>\r\n   <#assign  _orderby=\"basic_id\">\r\n  </#if>\r\nSELECT\r\n  basic_id AS id,\r\n  @rownum := @rownum + 1 AS `index`,\r\n  LEFT (basic_title, ${titlelen ?default(40)}) AS title,\r\n  basic_title AS fulltitle,\r\n  article_author AS author,\r\n  article_source AS source,\r\n  article_content AS content,\r\n  category.category_title AS typename,\r\n  category.category_id AS typeid,\r\n  category.category_smallimg 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  </#if>\r\n  basic.basic_thumbnails AS litpic,\r\n  <#--内容页动态链接-->\r\n  <#if isDo?? && isDo>\r\n   CONCAT(\"/${modelName}/view.do?id=\", basic_id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\") as link,\r\n  <#else>\r\n\r\n  CONCAT(basic_column.column_path,\"/\",basic_id,\".html\") AS link,\r\n  </#if>\r\n  basic_datetime AS date,<#if tableName??>${tableName}.*,</#if>\r\n  basic_description AS descrip,\r\n  basic_hit AS hit,\r\n  article_type AS flag,\r\n  category_title AS typetitle,\r\n  cms_article.article_keyword AS keyword \r\nFROM\r\n  (SELECT @rownum := 0) r,\r\n  basic\r\n  LEFT JOIN cms_article ON cms_article.article_basicid = basic.basic_id\r\n  LEFT JOIN category ON basic_categoryid = category.category_id\r\n  LEFT JOIN basic_column ON basic_column.column_category_id = basic.basic_categoryid \r\n  <#--判断是否有自定义模型表-->\r\n  <#if tableName??>LEFT JOIN ${tableName} ON ${tableName}.basicId=cms_article.article_basicid </#if>\r\nWHERE  \r\n  basic.basic_display=0 \r\n  <#--根据站点编号查询-->\r\n  <#if appId?? >\r\n    and (basic.basic_appid=${appId} or  cms_article.ARTICLE_WEBID=${appId})\r\n	and cms_article.article_basicid>0\r\n  </#if>\r\n  <#--根据模块编号查询分类-->\r\n  <#if column?? && column.categoryModelId?has_content>\r\n    and category_modelid=${column.categoryModelId}\r\n  </#if>\r\n  <#--判断是否有搜索分类集合-->\r\n  <#if search??>\r\n		<#if search.categoryIds??>and FIND_IN_SET(category_categoryid,\'${search.categoryIds}\')</#if>\r\n			<#--标题-->\r\n			<#if search.basic_title??> and basic_title like CONCAT(\"%\",\'${search.basic_title}\',\"%\")</#if>\r\n			<#--作者-->\r\n			<#if search.article_author??> and article_author like CONCAT(\"%\",\'${search.article_author}\',\"%\")</#if>\r\n			<#--来源-->\r\n			<#if search.article_source??> and article_source like CONCAT(\"%\",\'${search.article_source}\',\"%\")</#if>\r\n			<#--属性-->\r\n			<#if search.article_type??> and article_type like CONCAT(\"%\",\'${search.article_type}\',\"%\")</#if>\r\n			<#--图片-->\r\n			<#if search.basic_thumbnails??> and basic_thumbnails like CONCAT(\"%\",\'${search.basic_thumbnails}\',\"%\")</#if>\r\n			<#--描述-->\r\n			<#if search.basic_description??> and basic_description like CONCAT(\"%\",\'${search.basic_description}\',\"%\")</#if>\r\n			<#--关键字-->\r\n			<#if search.article_keyword??> and article_keyword like CONCAT(\"%\",\'${search.article_keyword}\',\"%\")</#if>\r\n			<#--内容-->\r\n			<#if search.article_content??> and article_content like CONCAT(\"%\",\'${search.article_content}\',\"%\")</#if>\r\n			<#--自定义顺序-->\r\n			<#if search.article_freeorder??> and article_freeorder=${search.article_freeorder}</#if>\r\n  <#else><#--查询栏目-->\r\n    <#if _typeid?has_content> and (basic_categoryid=${_typeid} or basic_categoryid in \r\n  (select category_id FROM category where category.del=0 and find_in_set(${_typeid},CATEGORY_PARENT_ID))) </#if>\r\n </#if>\r\n  <#--标题-->\r\n  <#if basic_title??> and basic_title like CONCAT(\"%\",\'${basic_title}\',\"%\")</#if>\r\n  <#--作者-->\r\n  <#if article_author??> and article_author like CONCAT(\"%\",\'${article_author}\',\"%\")</#if>\r\n  <#--来源-->\r\n  <#if article_source??> and article_source like CONCAT(\"%\",\'${article_source}\',\"%\")</#if>\r\n  <#--属性-->\r\n  <#if article_type??> and article_type like CONCAT(\"%\",\'${article_type}\',\"%\")</#if>\r\n  <#--图片-->\r\n  <#if basic_thumbnails??> and basic_thumbnails like CONCAT(\"%\",\'${basic_thumbnails}\',\"%\")</#if>\r\n  <#--描述-->\r\n  <#if basic_description??> and basic_description like CONCAT(\"%\",\'${basic_description}\',\"%\")</#if>\r\n  <#--关键字-->\r\n  <#if article_keyword??> and article_keyword like CONCAT(\"%\",\'${article_keyword}\',\"%\")</#if>\r\n  <#--内容-->\r\n  <#if article_content??> and article_content like CONCAT(\"%\",\'${article_content}\',\"%\")</#if>\r\n  <#--自定义顺序-->\r\n  <#if article_freeorder??> and article_freeorder=${article_freeorder}</#if>\r\n  <#--自定义模型-->\r\n  <#if diyModel??> \r\n    <#list diyModel as dm>\r\n      and ${tableName}.${dm.key} = \"${dm.value}\" \r\n    </#list>\r\n  </#if>\r\n  <#--文章属性-->\r\n  <#if flag?? >\r\n      and cms_article.article_type like CONCAT(\'%\',\'${flag}\',\'%\') \r\n  </#if>\r\n  <#if noflag?? >\r\n      and cms_article.article_type not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n  </#if>\r\n  <#--字段排序-->\r\n  <#if orderby?? >\r\n    ORDER BY \r\n      <#if orderby==\"date\"> basic.basic_datetime\r\n      <#elseif orderby==\"updatedate\"> basic.basic_updatetime\r\n      <#elseif orderby==\"hit\"> basic.basic_hit\r\n      <#elseif orderby==\"sort\"> basic.basic_sort\r\n      <#else>basic.basic_id</#if>\r\n <#else>\r\n    ORDER BY   basic.basic_id\r\n  </#if>\r\n  <#if order?? >\r\n      <#if order==\"desc\"> desc</#if>\r\n      <#if order==\"asc\"> asc</#if>\r\n  </#if>\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)}</#if>', 1);
 INSERT INTO `mdiy_tag_sql` VALUES (6, 4, '<#assign _typeid=\"\"/>\r\n<#if column?? && column.categoryId gt 0>\r\n	<#assign  _typeid=\"${column.categoryId}\">\r\n</#if>\r\n<#if typeid??>\r\n	<#assign  _typeid=\"${typeid}\">\r\n</#if>\r\nselect \r\n	@rownum := @rownum + 1 AS typeindex,\r\n	category_id as id,\r\n	category_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</#if> = category_id ,\"${class!\'\'}\",\"\") as class,\r\n	<#--动态链接-->\r\n	<#if isDo?? && isDo>\r\n	CONCAT(\"/${modelName}/list.do?typeid=\", category_id) as typelink,\r\n	<#else>\r\n	CONCAT(column_path,\"/index.html\") as typelink,\r\n	</#if>\r\n	column_keyword as typekeyword,\r\n	column_diy_url as typeurl,\r\n	column_flag as flag,\r\n	column_descrip as typedescrip,\r\n	category_smallimg as typelitpic  \r\n	from (SELECT @rownum := 0) r,category  \r\n	LEFT JOIN basic_column bc on bc.column_category_id=category.category_id where \r\n	category.del=0 \r\n	<#--根据站点编号查询-->\r\n	<#if appId?? >\r\n		and category.category_appid=${appId}\r\n	</#if>\r\n	<#--根据模块编号查询分类-->\r\n	<#if column?? && column.categoryModelId?has_content>\r\n		and category_modelid=${column.categoryModelId}\r\n	</#if>\r\n	<#--栏目属性-->\r\n	<#if flag?? >\r\n		and bc.column_flag like CONCAT(\'%\',\'${flag}\',\'%\') \r\n	</#if>\r\n	<#if noflag?? >\r\n		and bc.column_flag not like CONCAT(\'%\',\'${noflag}\',\'%\') \r\n	</#if>\r\n<#if type?has_content>\r\n	<#--顶级栏目（单个）-->\r\n	<#if type==\"top\">\r\n		and category_id=(select left(category_parent_id,LOCATE(\",\",category_parent_id)-1) from category where category_id = ${_typeid})\r\n	<#elseif type==\"nav\">\r\n		and(category_categoryid=0 or category_categoryid is null)\r\n	<#--同级栏目（多个）-->\r\n	<#elseif type==\"level\">\r\n		and\r\n		<#if _typeid?has_content>\r\n		 category_categoryid=(select category_categoryid from category where category_id=${_typeid})\r\n		<#else>\r\n		 1=1\r\n		</#if>\r\n  	<#--当前栏目（单个）-->\r\n	<#elseif type==\"self\">\r\n		 and \r\n		 <#if _typeid?has_content>\r\n		  category_id=${_typeid}\r\n		 <#else>\r\n		 1=1\r\n		 </#if>\r\n	<#--当前栏目的所属栏目（多个）-->\r\n	<#elseif type==\"path\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		   category_id in (<#if column?? && column.categoryParentId??>${column.categoryParentId},</#if>${_typeid})\r\n		 <#else>\r\n		  1=1\r\n		 </#if>\r\n	<#--子栏目（多个）-->\r\n	<#elseif type==\"son\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		  category_categoryid=${_typeid}\r\n		 <#else>\r\n		  1=1\r\n		 </#if>\r\n		 <#--上一级栏目没有则取当前栏目（单个）-->\r\n	<#elseif type==\"parent\">\r\n			and \r\n		 <#if _typeid?has_content>\r\n		   <#if column?? && column.categoryCategoryId?? && column.categoryCategoryId!=0>\r\n				category_id=${column.categoryCategoryId}\r\n			 <#else>\r\n			  category_id=${_typeid}\r\n			 </#if>\r\n		 <#else>\r\n		  1=1\r\n	</#if>\r\n	<#--子栏目或同级栏目（多个）-->\r\n	<#elseif type==\"sonOrLevel\">\r\n		 and \r\n		 <#if _typeid?has_content>\r\n	 	 category_categoryid= if((SELECT count(*) FROM category\r\n		 LEFT JOIN basic_column bc ON bc.column_category_id = category.category_id \r\n		 WHERE category_categoryid=${_typeid})>0,${_typeid},(select category_categoryid from category where category_id=${_typeid}))\r\n		 <#else>\r\n		 1=1\r\n		 </#if>\r\n	</#if>\r\n<#else> <#--默认son-->\r\n	 and\r\n	<#if _typeid?has_content>\r\n	 category_categoryid=${_typeid}\r\n	<#else>\r\n	 (category_categoryid=0 or category_categoryid is null)\r\n	</#if>\r\n</#if>', 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}</#if>\") 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}</#if>\") as url,\r\nREPLACE(REPLACE(TRIM(substring_index(app_url,\"\\n\",1)), CHAR(10),\'\'), CHAR(13),\'\') as host,\r\n</#if>\r\nCONCAT(\"templets/\",app_id,\"/\",<#if m??>CONCAT(app_style,\"/${m}\")<#else>app_style</#if>) as style <#-- 判断是否为手机端 -->\r\nfrom app where app_id = ${appId} limit 1', 1);
 INSERT INTO `mdiy_tag_sql` VALUES (8, 7, 'SELECT \r\nbasic_id as id,\r\nleft(basic_title,${titlelen?default(40)}) as title,\r\nbasic_title as fulltitle,\r\narticle_author as author, \r\narticle_source as source, \r\narticle_content as content,\r\ncategory.category_title as typetitle,\r\ncategory.category_id as typeid,\r\ncategory.category_smallimg AS typelitpic,\r\n<#--动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/${modelName}/list.do?typeid=\", category.category_id) as typelink,\r\n<#else>\r\n(SELECT \"index.html\") as typelink,\r\n</#if>\r\nbasic.basic_thumbnails as litpic,\r\n<#--内容页动态链接-->\r\n<#if isDo?? && isDo>\r\nCONCAT(\"/mcms/view.do?id=\", basic_id) as link,\r\n<#else>\r\ncms_article.article_url AS link,\r\n</#if>\r\nbasic_datetime as date,\r\nbasic_description as descrip,\r\nCONCAT(\"<script type=\'text/javascript\' src=\'${url}/basic/\",basic_id,\"/hit.do\'></script>\") as hit,\r\narticle_type as flag,\r\ncategory_title as typetitle,\r\n<#if tableName??>${tableName}.*,</#if>\r\ncms_article.article_keyword as keyword\r\nFROM basic LEFT JOIN cms_article ON cms_article.article_basicid = basic.basic_id \r\nLEFT JOIN category ON basic_categoryid=category.category_id \r\nLEFT JOIN basic_column ON basic_column.column_category_id=basic.basic_categoryid\r\n<#--判断是否有自定义模型表-->\r\n<#if tableName??>left join ${tableName} on ${tableName}.basicId=cms_article.ARTICLE_BASICID</#if>\r\nWHERE \r\n1=1\r\n<#if id??> and basic_id=${id}</#if>', 1);
@@ -1187,4 +1187,4 @@ INSERT INTO `role_model` VALUES (153, 48);
 INSERT INTO `role_model` VALUES (154, 48);
 COMMIT;
 
-SET FOREIGN_KEY_CHECKS = 1;
+SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file

pom.xml

-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.mingsoft</groupId>
-	<artifactId>wb-mcms</artifactId>
+	<artifactId>mcms</artifactId>
 	<version>4.7.1</version>
-	<packaging>war</packaging>
 	<name>ms-mcms</name>
 	<properties>
 		<java.version>1.8</java.version>
@@ -46,6 +45,16 @@
 			<artifactId>ms-mpeople</artifactId>
 			<version>1.0.8</version>
 		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-msso-client</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>net.mingsoft</groupId>
+			<artifactId>ms-msso-server</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
 		<!-- 此部分是铭飞平台MStroe的客户端（MStore不在铭飞开源产品范围），如果不需要使用MStore可以删除掉 -->
 		<dependency>
 			<groupId>net.mingsoft</groupId>

src/main/java/net/mingsoft/config/WebConfig.java

 package net.mingsoft.config;
 
 import java.io.File;
-import java.util.Arrays;
 
-import net.mingsoft.basic.filter.XSSEscapeFilter;
 import org.springframework.aop.Advisor;
+import net.mingsoft.basic.filter.XSSEscapeFilter;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.aop.support.JdkRegexpMethodPointcut;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -133,9 +132,9 @@ public class WebConfig implements WebMvcConfigurer {
 		return new DefaultPointcutAdvisor(druidStatPointcut(), druidStatInterceptor());
 	}
 
-//	 /**
-//	 * xssFilter注册
-//	 */
+	 /**
+	 * xssFilter注册
+	 */
 //	 @Bean
 //	 public FilterRegistrationBean xssFilterRegistration() {
 //	 XSSEscapeFilter xssFilter = new XSSEscapeFilter();

src/main/resources/application-dev.yml

 spring:
   datasource:
-    url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true
-    username: root
-    password: root
+    url: jdbc:mysql://172.17.0.1:3308/db-ms?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
+    username: pm
+    password: pm!2019
     filters: wall,mergeStat
-    type: com.alibaba.druid.pool.DruidDataSource
+    type: com.alibaba.druid.pool.DruidDataSource
\ No newline at end of file

src/main/resources/application.yml

@@ -2,29 +2,50 @@ server:
   port: 8080
   servlet.context-path: /ms-mcms
   servlet.session.timeout: 60M
-  
+
 logging:
- level:
-  net.mingsoft: trace
+  level:
+    net.mingsoft: trace
 ms:
- manager: 
-  path: /ms
-  view-path: /WEB-INF/manager
-  
- upload: 
-   path: /upload 
-   denied: .exe,.jsp
-   allowed: jpg
-   max-size: 1
-   memory-size: 4096
-      
+  wx:
+    app.id: wx8c96aa3db4611395
+    secret: 6502f1437c583a346f0d71c4be7d99b2
+  sso:
+    url:
+      login: http://ms.mingsoft.net/sso/login.do
+      logout: http://ms.mingsoft.net/sso/logout.do
+      token: http://ms.mingsoft.net/sso/token.do
+    session:
+      prefix: msso
+      time: 2592000
+    cookie: ms.mingsoft.net,pm.mingsoft.net,code.mingsoft.net,bbs.mingsoft.net,localhost
+  manager:
+    path: /m-admin
+    view-path: /WEB-INF/manager
+
+  upload:
+    path: /upload
+    denied: .exe,.jsp
+    allowed: jpg
+    max-size: 1
+    memory-size: 4096
+
 spring:
+  redis:
+    host: 172.17.0.1
+    port: 6380
+    password: mingsoft
+    pool:
+      max-idle: 300
+      min-idle: 0
+      max-active: 600
+      max-wait: 1000
   http.multipart.enabled: false
   profiles:
     active: dev
   mvc:
-    pathmatch: 
-     use-suffix-pattern: true
+    pathmatch:
+      use-suffix-pattern: true
   devtools:
     restart:
       enabled: true
@@ -45,7 +66,7 @@ spring:
     expose-spring-macro-helpers: true
     prefer-file-system-access: false
     template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
-    settings: 
+    settings:
       template_update_delay: 1
       default_encoding: UTF-8
       classic_compatible: true
@@ -53,8 +74,8 @@ spring:
       time_format: HH:mm:ss
       datetime_format: yyyy-MM-dd HH:mm:ss
       auto_import: /include/macro.ftl as ms
-      
+
 mybatis:
   mapper-locations: classpath*:**/dao/*.xml
-  configuration: 
-   database-id: mysql
+  configuration:
+    database-id: mysql
\ No newline at end of file

src/main/webapp/templets/1/default/head-file.htm

 <title>{ms:global.name/}</title>
 <meta charset="utf-8">
-<link rel="icon" href="http://cdn.mingsoft.net/global/images/ms.ico" type="x-icon">
 <link rel="stylesheet" type="text/css" href="{ms:global.host/}/plugins/iconfont/1.0.0/iconfont.css" />
 <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/base.less">
 <link rel="stylesheet/less" type="text/css" href="{ms:global.host/}/{ms:global.style/}/less/index.less">