Skip to content
GitLab
"vscode:/vscode.git/clone" did not exist on "f541631393ee31be5f8e61fe9c3d1db3eb3fade7"
Commit d9175124 authored by 他是超人他会飞's avatar 他是超人他会飞 Committed by 铭飞
Browse files

!148 脏数据和请求方式、设置静态化的域名 

Merge pull request !148 from 他是超人他会飞/4.7.0
parents e1835775 900f27b6
Show whitespace changes
Inline Side-by-side
doc/4.6.5-to-4.7.0-mysql.sql
View file @ d9175124
...@@ -3,6 +3,12 @@ ALTER TABLE `mdiy_dict` ADD COLUMN `is_child` varchar(255) COMMENT '扩展业务 ...@@ -3,6 +3,12 @@ ALTER TABLE `mdiy_dict` ADD COLUMN `is_child` varchar(255) COMMENT '扩展业务
ALTER TABLE `role` MODIFY COLUMN `app_id` int(11) COMMENT '应用编号' AFTER `role_managerid`; ALTER TABLE `role` MODIFY COLUMN `app_id` int(11) COMMENT '应用编号' AFTER `role_managerid`;
ALTER TABLE `mdiy_dict` MODIFY COLUMN `dict_value` varchar(100) COMMENT '数据值' AFTER `app_id`; ALTER TABLE `mdiy_dict` MODIFY COLUMN `dict_value` varchar(100) COMMENT '数据值' AFTER `app_id`;
UPDATE `cms_article` SET `article_url` = '/59/69\\70.html' WHERE `article_basicid` = 70;
UPDATE `cms_article` SET `article_url` = '/59/68\\71.html' WHERE `article_basicid` = 71;
UPDATE `cms_article` SET `article_url` = '/59/68\\72.html' WHERE `article_basicid` = 72;
UPDATE `cms_article` SET `article_url` = '/59/68\\73.html' WHERE `article_basicid` = 73;
UPDATE `cms_article` SET `article_url` = '/59/68\\74.html' WHERE `article_basicid` = 74;
DROP TABLE IF EXISTS `file`; DROP TABLE IF EXISTS `file`;
CREATE TABLE `file` ( CREATE TABLE `file` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '文件编号', `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '文件编号',
...@@ -63,7 +69,7 @@ CREATE TABLE `mdiy_tag_sql` ( ...@@ -63,7 +69,7 @@ CREATE TABLE `mdiy_tag_sql` (
-- ---------------------------- -- ----------------------------
INSERT INTO `mdiy_tag_sql` VALUES (5, 3, 'SELECT\r\n basic_id AS id,\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 <#--列表页动态链接-->\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(\"/mcms/view.do?id=\", basic_id) as link,\r\n <#else>\r\n cms_article.article_url AS link,\r\n </#if>\r\n basic_datetime AS date,<#if tableNname??>${tableNname}.*,</#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 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 tableNname??>LEFT JOIN ${tableNname} ON ${tableNname}.basicId=cms_article.article_basicid </#if>\r\nWHERE <#--查询栏目-->\r\n 1 = 1 <#if typeid??> 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 <#--标题-->\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 LIMIT \r\n <#--判断是否分页-->\r\n <#if ispaging?? && pageNo??>${(pageNo?eval-1)*size?eval},${size?default(20)}\r\n <#else>${size?default(20)}</#if>', 1); INSERT INTO `mdiy_tag_sql` VALUES (5, 3, 'SELECT\r\n basic_id AS id,\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 <#--列表页动态链接-->\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(\"/mcms/view.do?id=\", basic_id) as link,\r\n <#else>\r\n cms_article.article_url AS link,\r\n </#if>\r\n basic_datetime AS date,<#if tableNname??>${tableNname}.*,</#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 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 tableNname??>LEFT JOIN ${tableNname} ON ${tableNname}.basicId=cms_article.article_basicid </#if>\r\nWHERE <#--查询栏目-->\r\n 1 = 1 <#if typeid??> 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 <#--标题-->\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 LIMIT \r\n <#--判断是否分页-->\r\n <#if ispaging?? && pageNo??>${(pageNo?eval-1)*size?eval},${size?default(20)}\r\n <#else>${size?default(20)}</#if>', 1);
INSERT INTO `mdiy_tag_sql` VALUES (6, 4, 'select category_id as id,category_id as typeid,category_title as typetitle,\r\n<#--动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", category_id) as typelink,\r\n <#else>\r\nCONCAT(column_path,\"/index.html\") as typelink,\r\n </#if>column_keyword as typekeyword,column_descrip as typedescrip,category_smallimg as typelitpic from category \r\nLEFT JOIN basic_column bc on bc.column_category_id=category.category_id where \r\n<#if type?has_content>\r\n <#--顶级栏目-->\r\n <#if type==\"top\">\r\n <#if typeid??>\r\n category_categoryid=(select category_categoryid from category where category_id=(select category_categoryid from category where category_id=${typeid})) \r\n <#else>\r\n category_categoryid=0\r\n </#if>\r\n <#--同级栏目-->\r\n <#elseif type==\"level\">\r\n <#if typeid??>\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 <#if typeid??>\r\n category_id=${typeid}\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--子栏目-->\r\n <#elseif type==\"son\">\r\n <#if typeid??>\r\n category_categoryid=${typeid}\r\n <#else>\r\n 1=1\r\n </#if>\r\n </#if>\r\n<#else> <#--默认son-->\r\n <#if typeid??>\r\n category_categoryid=${typeid}\r\n <#else>\r\n category_categoryid=0\r\n </#if>\r\n</#if>', 1); INSERT INTO `mdiy_tag_sql` VALUES (6, 4, 'select category_id as id,category_id as typeid,category_title as typetitle,\r\n<#--动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/list.do?typeid=\", category_id) as typelink,\r\n <#else>\r\nCONCAT(column_path,\"/index.html\") as typelink,\r\n </#if>column_keyword as typekeyword,column_descrip as typedescrip,category_smallimg as typelitpic from category \r\nLEFT JOIN basic_column bc on bc.column_category_id=category.category_id where \r\n<#if type?has_content>\r\n <#--顶级栏目-->\r\n <#if type==\"top\">\r\n <#if typeid??>\r\n category_categoryid=(select category_categoryid from category where category_id=(select category_categoryid from category where category_id=${typeid})) \r\n <#else>\r\n category_categoryid=0\r\n </#if>\r\n <#--同级栏目-->\r\n <#elseif type==\"level\">\r\n <#if typeid??>\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 <#if typeid??>\r\n category_id=${typeid}\r\n <#else>\r\n 1=1\r\n </#if>\r\n <#--子栏目-->\r\n <#elseif type==\"son\">\r\n <#if typeid??>\r\n category_categoryid=${typeid}\r\n <#else>\r\n 1=1\r\n </#if>\r\n </#if>\r\n<#else> <#--默认son-->\r\n <#if typeid??>\r\n category_categoryid=${typeid}\r\n <#else>\r\n category_categoryid=0\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<#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\n</#if>\r\nREPLACE(REPLACE(TRIM(substring_index(app_url,\"\\n\",1)), CHAR(10),\'\'), CHAR(13),\'\') as host,\r\nCONCAT(\"templets/\",app_id,\"/\",<#if m??>CONCAT(app_style,\"/m\")<#else>app_style</#if>) as style <#-- 判断是否为手机端 -->\r\nfrom app limit 1', 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 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 typename,\r\ncategory.category_id as typeid,\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\nbasic_hit 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); 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 typename,\r\ncategory.category_id as typeid,\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\nbasic_hit 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);
INSERT INTO `mdiy_tag_sql` VALUES (9, 8, '<#assign select=\"(SELECT \'\')\"/>\r\n<#if preId??>\r\nSELECT \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 typename,\r\ncategory.category_id as typeid,\r\n(SELECT \"index.html\") AS typelink,\r\nbasic.basic_thumbnails as litpic,\r\ncms_article.article_url as link,\r\nbasic_datetime as date,\r\nbasic_description as descrip,\r\nbasic_hit as hit,\r\narticle_type as flag,\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\nWHERE basic_id=${preId}\r\n<#else><#--没有上一页返回空字符串-->\r\nSELECT \r\n${select} as id,\r\n${select} as title,\r\n${select} as fulltitle,\r\n${select} as author, \r\n${select} as source, \r\n${select} as content,\r\n${select} as typename,\r\n${select} as typeid,\r\n${select} as typelink,\r\n${select} as litpic,\r\n${select} as link,\r\n${select} as date,\r\n${select} as descrip,\r\n${select} as hit,\r\n${select} as flag,\r\n${select} as keyword FROM basic\r\n</#if>', NULL); INSERT INTO `mdiy_tag_sql` VALUES (9, 8, '<#assign select=\"(SELECT \'\')\"/>\r\n<#if preId??>\r\nSELECT \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 typename,\r\ncategory.category_id as typeid,\r\n(SELECT \"index.html\") AS typelink,\r\nbasic.basic_thumbnails as litpic,\r\ncms_article.article_url as link,\r\nbasic_datetime as date,\r\nbasic_description as descrip,\r\nbasic_hit as hit,\r\narticle_type as flag,\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\nWHERE basic_id=${preId}\r\n<#else><#--没有上一页返回空字符串-->\r\nSELECT \r\n${select} as id,\r\n${select} as title,\r\n${select} as fulltitle,\r\n${select} as author, \r\n${select} as source, \r\n${select} as content,\r\n${select} as typename,\r\n${select} as typeid,\r\n${select} as typelink,\r\n${select} as litpic,\r\n${select} as link,\r\n${select} as date,\r\n${select} as descrip,\r\n${select} as hit,\r\n${select} as flag,\r\n${select} as keyword FROM basic\r\n</#if>', NULL);
INSERT INTO `mdiy_tag_sql` VALUES (10, 9, ' select\r\n <#--判断是否有栏目对象，用于搜索不传栏目-->\r\n <#if column??>\r\n <#--顶级栏目处理-->\r\n <#if column.categoryCategoryId==0>\r\n <#assign path=column.columnPath/>\r\n <#else>\r\n <#assign path=column.columnPath/>\r\n </#if>\r\n <#else>\r\n <#assign path=\"\"/>\r\n </#if>\r\n <#--总记录数、总页数-->\r\n (SELECT ${total}) as total,\r\n <#--记录总数-->\r\n (SELECT ${rcount}) as rcount,\r\n <#--当前页码-->\r\n (SELECT ${pageNo}) as cur,\r\n <#--首页-->\r\n CONCAT(\"${path}\", \"/index.html\") as `index`,\r\n <#--上一页-->\r\n <#if (pageNo?eval-1) gt 1>\r\n CONCAT(\"${path}\",\"/list-${pageNo?eval-1}.html\") as pre,\r\n <#else>\r\n CONCAT(\"${path}\",\"/index.html\") as pre,\r\n </#if>\r\n <#--下一页-->\r\n <#if total==1>\r\n CONCAT(\"${path}\", \"/index.html\") as `next`,\r\n CONCAT(\"${path}\", \"/index.html\") as `last`\r\n <#else>\r\n <#if pageNo?eval gte total>\r\n CONCAT(\"${path}\",\"/list-${total}.html\") as next,\r\n <#else>\r\n CONCAT(\"${path}\",\"/list-${pageNo?eval+1}.html\") as next,\r\n </#if>\r\n <#--最后一页-->\r\n CONCAT(\"${path}\",\"/list-${total}.html\") as last\r\n </#if>', NULL); INSERT INTO `mdiy_tag_sql` VALUES (10, 9, ' select\r\n <#--判断是否有栏目对象，用于搜索不传栏目-->\r\n <#if column??>\r\n <#--顶级栏目处理-->\r\n <#if column.categoryCategoryId==0>\r\n <#assign path=column.columnPath/>\r\n <#else>\r\n <#assign path=column.columnPath/>\r\n </#if>\r\n <#else>\r\n <#assign path=\"\"/>\r\n </#if>\r\n <#--总记录数、总页数-->\r\n (SELECT ${total}) as total,\r\n <#--记录总数-->\r\n (SELECT ${rcount}) as rcount,\r\n <#--当前页码-->\r\n (SELECT ${pageNo}) as cur,\r\n <#--首页-->\r\n CONCAT(\"${path}\", \"/index.html\") as `index`,\r\n <#--上一页-->\r\n <#if (pageNo?eval-1) gt 1>\r\n CONCAT(\"${path}\",\"/list-${pageNo?eval-1}.html\") as pre,\r\n <#else>\r\n CONCAT(\"${path}\",\"/index.html\") as pre,\r\n </#if>\r\n <#--下一页-->\r\n <#if total==1>\r\n CONCAT(\"${path}\", \"/index.html\") as `next`,\r\n CONCAT(\"${path}\", \"/index.html\") as `last`\r\n <#else>\r\n <#if pageNo?eval gte total>\r\n CONCAT(\"${path}\",\"/list-${total}.html\") as next,\r\n <#else>\r\n CONCAT(\"${path}\",\"/list-${pageNo?eval+1}.html\") as next,\r\n </#if>\r\n <#--最后一页-->\r\n CONCAT(\"${path}\",\"/list-${total}.html\") as last\r\n </#if>', NULL);
......
doc/4.6.5-to-4.7.0-sqlserver.sql
View file @ d9175124
...@@ -452,13 +452,18 @@ app_copyright as copyright, ...@@ -452,13 +452,18 @@ app_copyright as copyright,
<#--动态解析 --> <#--动态解析 -->
<#if isDo?? && isDo> <#if isDo?? && isDo>
''${url}'' as url, ''${url}'' as url,
''${url}'' as host,
<#--使用地址栏的域名 -->
<#elseif url??>
''${url}/${html}/''+app_id+''/<#if m??>${m}</#if>'' as url,
''${url}'' as host,
<#else> <#else>
REPLACE(<#-- 剔除换行符 --> REPLACE(<#-- 剔除换行符 -->
substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/html/''+convert(varchar(50),app_id)+''/<#if m??>m</#if>'' as url, substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/${html}/''+convert(varchar(50),app_id)+''/<#if m??>${m}</#if>'' as url,
</#if>
REPLACE(<#-- 剔除换行符 --> REPLACE(<#-- 剔除换行符 -->
substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''') as host, substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''') as host,
''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/m''<#else>+app_style</#if> as style <#-- 判断是否为手机端 --> </#if>
''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/${m}''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
from app', N'1') from app', N'1')
GO GO
......
doc/SQL文件版本说明.md
View file @ d9175124
...@@ -3,9 +3,14 @@ db-mcms-mysql-4.7.0 最低版本mysql 5.7 ...@@ -3,9 +3,14 @@ db-mcms-mysql-4.7.0 最低版本mysql 5.7
db-mcms-sqlserver-4.7.0 最低版本 SQLServer2012 db-mcms-sqlserver-4.7.0 最低版本 SQLServer2012
如果使用低与要求版本数据库会出现如下错误 如果使用低与要求版本数据库会出现如下错误
1、导入 mysql文件 datetime时间函数报错，请使用4.6. 1、导入 mysql文件 datetime时间函数报错，请使用4.6.5版本以下的SQL文件（不包含4.6.5）
2、SQLServer数据库版本 自定义标签 使用了SQLServer2012最新的分页函数 ， 2、SQLServer数据库版本 自定义标签 使用了SQLServer2012最新的分页函数 ，
请自行修改mdiy_tag_sql表中的分页函数 请自行修改mdiy_tag_sql表中的分页函数
数据库类型切换 ：修改application.yml中 数据库类型切换 ：修改application.yml中
database-id: mysql、sqlServer、oracle database-id: mysql、sqlServer、oracle
数据库连接切换：修改
spring:
http.multipart.enabled: false
profiles:
active: dev、prod、test
\ No newline at end of file
doc/db-mcms-mysql-4.7.0.sql
View file @ d9175124
This source diff could not be displayed because it is too large. You can view the blob instead.
doc/db-mcms-sqlserver-4.7.0.sql
View file @ d9175124
...@@ -2264,13 +2264,18 @@ app_copyright as copyright, ...@@ -2264,13 +2264,18 @@ app_copyright as copyright,
<#--动态解析 --> <#--动态解析 -->
<#if isDo?? && isDo> <#if isDo?? && isDo>
''${url}'' as url, ''${url}'' as url,
''${url}'' as host,
<#--使用地址栏的域名 -->
<#elseif url??>
''${url}/${html}/''+app_id+''/<#if m??>${m}</#if>'' as url,
''${url}'' as host,
<#else> <#else>
REPLACE(<#-- 剔除换行符 --> REPLACE(<#-- 剔除换行符 -->
substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/html/''+convert(varchar(50),app_id)+''/<#if m??>m</#if>'' as url, substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''')+''/${html}/''+convert(varchar(50),app_id)+''/<#if m??>${m}</#if>'' as url,
</#if>
REPLACE(<#-- 剔除换行符 --> REPLACE(<#-- 剔除换行符 -->
substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''') as host, substring( app_url, 0, CHARINDEX ( CHAR ( 10 ), app_url ) ),CHAR ( 13 ),'''') as host,
''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/m''<#else>+app_style</#if> as style <#-- 判断是否为手机端 --> </#if>
''templets/''+convert(varchar(50),app_id)+''/''<#if m??>+app_style+''/${m}''<#else>+app_style</#if> as style <#-- 判断是否为手机端 -->
from app', N'1'), (N'8', N'7', N'SELECT from app', N'1'), (N'8', N'7', N'SELECT
basic_id as id, basic_id as id,
left(basic_title,${titlelen?default(40)}) as title, left(basic_title,${titlelen?default(40)}) as title,
......
src/main/java/net/mingsoft/cms/action/web/MCmsAction.java
View file @ d9175124
...@@ -35,10 +35,12 @@ import org.springframework.web.bind.annotation.GetMapping; ...@@ -35,10 +35,12 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import cn.hutool.core.util.ObjectUtil;
import net.mingsoft.basic.biz.IColumnBiz; import net.mingsoft.basic.biz.IColumnBiz;
import net.mingsoft.basic.entity.ColumnEntity; import net.mingsoft.basic.entity.ColumnEntity;
import net.mingsoft.cms.bean.ColumnArticleIdBean; import net.mingsoft.cms.bean.ColumnArticleIdBean;
import net.mingsoft.cms.biz.IArticleBiz; import net.mingsoft.cms.biz.IArticleBiz;
import net.mingsoft.cms.constant.ModelCode;
import net.mingsoft.cms.entity.ArticleEntity; import net.mingsoft.cms.entity.ArticleEntity;
import net.mingsoft.cms.util.CmsParserUtil; import net.mingsoft.cms.util.CmsParserUtil;
import net.mingsoft.mdiy.biz.IPageBiz; import net.mingsoft.mdiy.biz.IPageBiz;
...@@ -89,6 +91,7 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { ...@@ -89,6 +91,7 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction {
@ExceptionHandler(java.lang.NullPointerException.class) @ExceptionHandler(java.lang.NullPointerException.class)
public void diy(@PathVariable(value = "diy") String diy, HttpServletRequest req, HttpServletResponse resp) { public void diy(@PathVariable(value = "diy") String diy, HttpServletRequest req, HttpServletResponse resp) {
Map map = BasicUtil.assemblyRequestMap(); Map map = BasicUtil.assemblyRequestMap();
map.put(ParserUtil.URL, BasicUtil.getUrl());
//动态解析 //动态解析
map.put(ParserUtil.IS_DO,true); map.put(ParserUtil.IS_DO,true);
//设置动态请求的模块路径 //设置动态请求的模块路径
...@@ -158,7 +161,8 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { ...@@ -158,7 +161,8 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction {
List<ColumnArticleIdBean> columnArticles = articleBiz.queryIdsByCategoryIdForParser(typeId, null, null); List<ColumnArticleIdBean> columnArticles = articleBiz.queryIdsByCategoryIdForParser(typeId, null, null);
//判断栏目下是否有文章 //判断栏目下是否有文章
if(columnArticles.size()==0){ if(columnArticles.size()==0){
this.outJson(resp, false); this.outJson(resp, null,false,getResString("err.empty", this.getResString("typeid")));
return;
} }
map.put(ParserUtil.COLUMN, columnArticles.get(0)); map.put(ParserUtil.COLUMN, columnArticles.get(0));
//获取总数 //获取总数
...@@ -200,6 +204,10 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction { ...@@ -200,6 +204,10 @@ public class MCmsAction extends net.mingsoft.mdiy.action.BaseAction {
public void view(HttpServletRequest req, HttpServletResponse resp) { public void view(HttpServletRequest req, HttpServletResponse resp) {
//参数文章编号 //参数文章编号
ArticleEntity article = (ArticleEntity) articleBiz.getEntity(BasicUtil.getInt(ParserUtil.ID)); ArticleEntity article = (ArticleEntity) articleBiz.getEntity(BasicUtil.getInt(ParserUtil.ID));
if(ObjectUtil.isNull(article)){
this.outJson(resp, null,false,getResString("err.empty", this.getResString("id")));
return;
}
//根据文章编号查询栏目详情模版 //根据文章编号查询栏目详情模版
ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId()); ColumnEntity column = (ColumnEntity) columnBiz.getEntity(article.getBasicCategoryId());
//解析后的内容 //解析后的内容
......
src/main/java/net/mingsoft/cms/dao/IArticleDao.xml
View file @ d9175124
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
<!-- 通过视图查询返回结果集 开始 --> <!-- 通过视图查询返回结果集 开始 -->
<resultMap type="net.mingsoft.cms.bean.ColumnArticleIdBean" id="resultMapBean"> <resultMap type="net.mingsoft.cms.bean.ColumnArticleIdBean" id="resultMapBean">
<result column="ARTICLE_BASICID" property="articleId" /> <result column="ARTICLE_BASICID" property="articleId" />
<result column="column_listurl" property="columnListUrl"/><!-- 最终栏目列表地址 -->
<result column="column_path" property="columnPath"/> <result column="column_path" property="columnPath"/>
<result column="column_url" property="columnUrl" /> <result column="column_url" property="columnUrl" />
<result column="category_title" property="categoryTitle" /> <result column="category_title" property="categoryTitle" />
......
src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
View file @ d9175124
#mcms\u7248\u672c #mcms\u7248\u672c
version=d3a98fefcb242db78da5fc31608ff247 version=d3a98fefcb242db78da5fc31608ff247
templet.file=\u6a21\u677f\u6587\u4ef6\u4e0d\u5b58\u5728 templet.file=\u6a21\u677f\u6587\u4ef6\u4e0d\u5b58\u5728
id=\u6587\u7ae0\u7f16\u53f7
typeid=\u680f\u76ee\u7f16\u53f7
src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
View file @ d9175124
...@@ -46,13 +46,13 @@ public class CmsParserUtil extends ParserUtil { ...@@ -46,13 +46,13 @@ public class CmsParserUtil extends ParserUtil {
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
map.put(IS_DO, false); map.put(IS_DO, false);
boolean mobileStyle = false; boolean mobileStyle = false;
//判断是否有移动端
if (!StringUtil.isBlank(BasicUtil.getApp().getAppMobileStyle())) {
mobileStyle = true;
}
String content = CmsParserUtil.generate(templatePath, map, mobileStyle); String content = CmsParserUtil.generate(templatePath, map, mobileStyle);
FileUtil.writeString(content, ParserUtil.buildHtmlPath(targetPath), Const.UTF8); FileUtil.writeString(content, ParserUtil.buildHtmlPath(targetPath), Const.UTF8);
//判断是否有移动端 不能将这个判断放在上面，会出现PC端一直是移动端的内容
if (!StringUtil.isBlank(BasicUtil.getApp().getAppMobileStyle())) {
mobileStyle = true;
}
// 生成移动页面 // 生成移动页面
if (mobileStyle) { if (mobileStyle) {
// 手机端m // 手机端m
......
src/main/java/net/mingsoft/config/WebConfig.java
View file @ d9175124
...@@ -50,7 +50,7 @@ public class WebConfig implements WebMvcConfigurer { ...@@ -50,7 +50,7 @@ public class WebConfig implements WebMvcConfigurer {
@Override @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/html/**").addResourceLocations("classpath:/html/"); registry.addResourceHandler("/html/**").addResourceLocations("/html/");
registry.addResourceHandler("/app/**").addResourceLocations("classpath:/app/"); registry.addResourceHandler("/app/**").addResourceLocations("classpath:/app/");
registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/"); registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
registry.addResourceHandler("/api/**").addResourceLocations("classpath:/api/"); registry.addResourceHandler("/api/**").addResourceLocations("classpath:/api/");
......
src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl
View file @ d9175124
...@@ -223,7 +223,7 @@ function clickZtreeId(event,treeId,treeNode){ ...@@ -223,7 +223,7 @@ function clickZtreeId(event,treeId,treeNode){
} }
var url="${managerPath}/mdiy/contentModel/contentModelField/"+treeNode.categoryId+"/queryField.do"; var url="${managerPath}/mdiy/contentModel/contentModelField/"+treeNode.categoryId+"/queryField.do";
var basicId="basicId=${article.basicId?c?default(0)}"; var basicId="basicId=${article.basicId?c?default(0)}";
$(this).request({url:url,data:basicId,method:"post",func:function(data) { $(this).request({url:url,data:basicId,method:"get",func:function(data) {
$("#addFieldForm").html(""); $("#addFieldForm").html("");
$("#addFieldForm").html(data); $("#addFieldForm").html(data);
}}); }});
......
src/main/webapp/templets/1/default/head.htm
View file @ d9175124
<div class="ms-head"> <div class="ms-head">
<div class="head-menu"> <div class="head-menu">
<div class="head-men-left head-menu-flex-center"> <div class="head-men-left head-menu-flex-center">
<a href="{ms:global.host/}"> <a href="{ms:global.host/}/html/1/index.html">
<img src="http://cdn.mingsoft.net/images/logo.png" /> <img src="http://cdn.mingsoft.net/images/logo.png" />
</a> </a>
<ul class="head-menu-list"> <ul class="head-menu-list">
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
<div class="head-menu-right-content" id="ms-login-vue"> <div class="head-menu-right-content" id="ms-login-vue">
<span v-show="!isLogin" style="display: none;"> <span v-show="!isLogin" style="display: none;">
<span> <span>
<a href='{ms:global.host/}/login.html'>登录</a> <a href='{ms:global.host/}/mcms/login.do'>登录</a>
</span>|<span><a href='{ms:global.host/}/register.html'>注册</a></span> </span>|<span><a href='{ms:global.host/}/mcms/register.do'>注册</a></span>
</span> </span>
<div class="topbar-info J_userInfo loginSuccess hide-default" v-show="isLogin" style="display: none;"> <div class="topbar-info J_userInfo loginSuccess hide-default" v-show="isLogin" style="display: none;">
<a class="user-name" href="{ms:global.host/}/people/center.do"> <a class="user-name" href="{ms:global.host/}/people/center.do">
......
src/main/webapp/templets/1/default/m/indexa.htm deleted 100644 → 0
View file @ e1835775
<!DOCTYPE html>
<html>
<head>
<#include "head-file.htm">
<link rel="stylesheet" type="text/css" href="http://cdn.mingsoft.net/plugins/bootstrap/3.3.5/css/bootstrap.min.css">
<script type="text/javascript" src="http://cdn.mingsoft.net/plugins/bootstrap/3.3.5/js/bootstrap.min.js"></script>
</head>
<body>
<#include "head.htm">
<!-- <div class="ms-banner">
<img src="./images/banner.jpg">
</div> -->
<div id="indexVue">
<div id="banner_tabs" class="flexslider">
<ul class="slides">
<template v-for="banner in bannerList">
<li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
<p class="banner_tit animated fadeInLeft">铭飞MS平台</p>
<p class="banner_des animated fadeInRight">MCms系统永久完整开源</p>
</li>
<li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
<p class="banner_tit animated fadeInLeft">MStore</p>
<p class="banner_des animated fadeInRight">丰富强大的功能插件、海量精美的行业模板</p>
</li>
<li style="background:url({ms:global.host/}/{ms:global.style/}/images/03.jpg) no-repeat center;">
<p class="banner_tit animated fadeInLeft">优质的服务体验</p>
<p class="banner_des animated fadeInRight">人工远程协助服务、永久享受更新升级</p>
</li>
</template>
</ul>
<ul class="flex-direction-nav">
<li>
<a class="flex-prev" href="javascript:;">Previous</a>
</li>
<li>
<a class="flex-next" href="javascript:;">Next</a>
</li>
</ul>
</div>
<div class="ms-content-index">
<div class="ms-content-template">
<div>
<ul class="nav nav-tabs ms-index-tabs" role="tablist">
<li role="presentation" class="active">
<a href="#model" aria-controls="model" role="tab" data-toggle="tab">模板</a>
</li>
<li role="presentation">
<a href="#plug" aria-controls="plug" role="tab" data-toggle="tab">插件</a>
</li>
</ul>
<div class="ms-content-all">
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="model">
<div style="display: none;" class="ms-loading" v-show="!loading">
<img src="{ms:global.host/}/{ms:global.style/}/images/loading.gif" />
</div>
<div class="ms-model-content" style="display: none;" v-show="loading">
<template v-for="model in modelList">
<div class="ms-model-list">
<a class="ms-model-img" :href="model.upgraderVersionUrl" target="_blank">
<img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://mstore.mingsoft.net/'+model.upgraderVersionImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
</a>
<div class="ms-model-mobile-img" v-if="model.upgraderVersionMobileImg != '' && model.upgraderVersionMobileImg != undefined" style="background: url({ms:global.host/}/{ms:global.style/}/images/mobile.png)">
<div>
<img @mouseout="imgMout()" @mouseover="imgMover()" :src="'http://mstore.mingsoft.net/'+model.upgraderVersionMobileImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
</div>
</div>
<div class="ms-model-info">
<span v-text="model.upgraderVersionName"></span>
<img class="ms-model-info-img" :src="model.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
<img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+model.upgraderVersionStart+'.png'" />
<div class="ms-model-type">模板</div>
</div>
</div>
</template>
<div class="ms-model-list" style="display: none;" v-show="loading">
<div class="ms-model-more">
<div onclick="window.open('http://mstore.mingsoft.net/mstoreShow.do')">查看更多</div>
</div>
</div>
</div>
</div>
<div role="tabpanel" class="tab-pane" id="plug">
<div class="ms-model-content" style="display: none;" v-show="loading">
<template v-for="pulg in pulgList">
<div class="ms-model-list">
<a class="ms-model-img" :href="pulg.upgraderVersionUrl" target="_blank">
<img :src="'http://mstore.mingsoft.net/'+pulg.upgraderVersionImg" onerror="this.src='{ms:global.host/}/{ms:global.style/}/images/no-data.png'" />
</a>
<div class="ms-model-info">
<span v-text="pulg.upgraderVersionName"></span>
<img class="ms-model-info-img" :src="pulg.upgraderVersionPeopleIcon" onerror="this.src='http://cdn.mingsoft.net/global/images/msheader.png'" />
<img :src="'{ms:global.host/}/{ms:global.style/}/images/level-'+pulg.upgraderVersionStart+'.png'" />
<div class="ms-model-type">插件</div>
</div>
</div>
</template>
<div class="ms-model-list" style="display: none;" v-show="loading">
<div class="ms-model-more">
<div onclick="window.open('http://mstore.mingsoft.net/mstoreShow.do')">查看更多</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="ms-content-case">
<div class="ms-content-case-mian">
<div class="ms-content-case-title">
<div class="ms-content-case-title-words">网站案例</div>
<div class="ms-content-case-more">
<a href='{ms:global.url/}/149/index.html'>MORE>></a>
</div>
</div>
<div class="ms-content-case-list">
{ms:arclist typeid=149 size=6}
<div class="ms-content-main-case">
<div class="ms-content-main-case-img">
<img src="{ms:global.host/}[field.litpic/]">
</div>
<div class="ms-content-main-case-explain">
<div class="ms-content-main-case-title">[field.title/]</div>
<div class="ms-content-main-case-content">
<p class="ms-content-main-case-written">
[field.content/]
</p>
</div>
<div class="ms-content-main-case-click">
<a target="_blank" href="[field.source/]">点击查看</a>
</div>
</div>
</div>
{/ms:arclist}
</div>
</div>
</div>
<div class="ms-content-product">
<div class="ms-content-product-main">
<div class="ms-content-product-title">
<div class="ms-content-product-title-words">产品方向</div>
</div>
<div class="ms-content-product-list">
<ul class="ms-content-product-list-ul">
<li>
<div class="ms-content-product-list-img">
<a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">
<img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu1.png"></a>
</div>
<div class="ms-content-product-list-content">
<div class="ms-content-product-list-content-title">
<a target="_blank" href="http://www.mingsoft.net/html/1/5523/index.html">铭飞建站系统MCMS</a></div>
<div class="ms-content-product-list-content-describe">纯Java开发，MCMS支持PC与MOBILE皮肤定制,同时使用MS团队移动JS插件，支持站群。</div></div>
</li>
<li>
<div class="ms-content-product-list-img">
<a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">
<img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu2.jpg"></a>
</div>
<div class="ms-content-product-list-content">
<div class="ms-content-product-list-content-title">
<a target="_blank" href="http://www.mingsoft.net/html/1/5524/index.html">移动互联网</a></div>
<div class="ms-content-product-list-content-describe">重新定义移动开发，快速、开放、高性能，数据无缝对接，超过500个模块api 接口，方便实现各种应用。</div></div>
</li>
<li>
<div class="ms-content-product-list-img">
<a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">
<img src="http://www.mingsoft.net/templets/1/ming-soft//images/hu3.jpg"></a>
</div>
<div class="ms-content-product-list-content">
<div class="ms-content-product-list-content-title">
<a target="_blank" href="http://www.mingsoft.net/html/1/5526/index.html">铭飞物联网</a></div>
<div class="ms-content-product-list-content-describe">MS+物联网，让生产企业真正掌握企业命脉，实现互联网+生产，给企业插上信息化翅膀，共享、共荣大数据时代</div></div>
</li>
</ul>
</div>
</div>
</div>
<div class="ms-content-news">
<div class="ms-content-news-main">
<div class="ms-content-news-main-title">
<div class="ms-content-news-main-title-words">公司动态</div>
<div class="ms-content-news-main-title-more">
<a href='{ms:global.url/}/59/index.html'>MORE>></a>
</div>
</div>
<div class="ms-content-news-main-img-text">
{ms:arclist typeid=59 size=1}
<img src="{ms:global.host/}[field.litpic/]">
{/ms:arclist}
<ul class="ms-content-news-main-ul">
{ms:arclist typeid=59 size=6}
<li>
<a href="{ms:global.url/}[field.link/]">
<div class="ms-content-news-main-li-title">
<!-- <span class="ms-content-news-main-li-span">·</span> -->
<span class="">[field.title/]</span>
</div>
<div class="ms-content-news-main-li-time">[field.date?string("yyyy-mm-dd")/]</div>
</a>
</li>
{/ms:arclist}
</ul>
</div>
</div>
</div>
</div>
</div>
<#include "footer.htm">
</body>
</html>
<script type="text/javascript">
ms.load(["ms", "{ms:global.host/}/{ms:global.style/}/js/demo.js"], function(ms, mmstore) { //../templets/86/cms/js/ms.mstore.js
var index = new Vue({
el: "#indexVue",
data: {
bannerList: ['01', '02', '03', '04', '05'], //幻灯片列表
modelList: [], //模板列表
pulgList: [], //插件列表
loading: false, //加载状态
},
methods: {
query: function(data, type) {
var target = this;
mmstore.mstore.list(data, function(json) {
if(type == 'model') {
target.modelList = json.list;
} else {
target.pulgList = json.list;
target.loading = true;
}
});
},
imgMover: function() {
var _this = event.target;
var ms_top = ($(_this).height()) - 275;
if(ms_top < 0) {
ms_top = 0;
}
$(_this).stop(true);
$(_this).animate({
"top": -(ms_top)
}, 2500);
},
imgMout: function() {
var _this = event.target;
$(_this).stop(true);
$(_this).animate({
"top": 0
}, 2500);
},
},
mounted: function() {
var data = "upgraderVersionType=2&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
this.query(data, 'model');
var data = "upgraderVersionType=1&upgraderVersionIndustry=0&orderBy=uv_id&pageSize=5&pageNo=1";
this.query(data, 'pulg');
/*幻灯*/
setTimeout(function() {
var bannerSlider = new Slider($('#banner_tabs'), {
time: 5000,
delay: 400,
event: 'hover',
auto: true,
mode: 'fade',
controller: $('#bannerCtrl'),
activeControllerCls: 'active'
});
$('#banner_tabs .flex-prev').click(function() {
bannerSlider.prev()
});
$('#banner_tabs .flex-next').click(function() {
bannerSlider.next()
});
}, 300)
},
})
})
</script>
\ No newline at end of file
src/main/webapp/templets/1/default/search.htm
View file @ d9175124
...@@ -45,17 +45,19 @@ new Vue({ ...@@ -45,17 +45,19 @@ new Vue({
list: [], list: [],
}, },
methods: { methods: {
//上下页
search:function(flag){ search:function(flag){
var pageNo = {ms:search.pageNo/}; var pageNo = {ms:search.pageNo/};
var total = {ms:page.total/}; var total = {ms:page.total/};
if(flag){ if(flag){
pageNo = pageNo==total ? total : pageNo +1; pageNo = pageNo==total ? total : pageNo +1;//下一页
}else{ }else{
pageNo = pageNo -1==0 ? 1 : pageNo-1; pageNo = pageNo -1==0 ? 1 : pageNo-1;//上一页
} }
window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo; window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
window.event.returnValue=false; window.event.returnValue=false;
}, },
//首页和尾页
indexAndLast:function(pageNo){ indexAndLast:function(pageNo){
window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo; window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
window.event.returnValue=false; window.event.returnValue=false;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment