Skip to content

C
cms_sys
Commit ce3386ed authored by sgjj's avatar sgjj
Browse files
Options

Merge remote-tracking branch 'origin/4.7.2' into 4.7.2

parents b502ca95 7fdede33
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 74 deletions
doc/4.7.1-to-4.7.2-mysql.sql 0 → 100644
View file @ ce3386ed
UPDATE `model` SET `model_icon` = 'icon-neirongguanli' WHERE `model_id` = 1;
UPDATE `model` SET `model_icon` = 'icon-huiyuanzhongxin' WHERE `model_id` = 22;
UPDATE `model` SET `model_icon` = 'icon-quanxianguanli' WHERE `model_id` = 23;
UPDATE `model` SET `model_icon` = 'icon-xitongguanli' WHERE `model_id` = 84;
UPDATE `model` SET `model_icon` = 'icon-zidingyiguanli' WHERE `model_id` = 104;
\ No newline at end of file
doc/db-mcms-mysql-4.7.2.sql 0 → 100644
View file @ ce3386ed
This source diff could not be displayed because it is too large. You can view the blob instead.
doc/4.7.0-to-4.7.1-mysql.sql → doc/历史/4.7.0-to-4.7.1-mysql.sql
View file @ ce3386ed
SET FOREIGN_KEY_CHECKS = 0;
ALTER TABLE `basic_column`
ADD COLUMN `column_flag` varchar(100) NULL DEFAULT NULL COMMENT '栏目属性' AFTER `column_cm_id`,
ADD COLUMN `column_diy_url` varchar(50) NULL DEFAULT NULL COMMENT '自定义链接' AFTER `column_flag`;
-- ----------------------------
-- 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` int(1) DEFAULT NULL COMMENT '标签类型',
`tag_description` varchar(255) DEFAULT NULL COMMENT '描述',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='标签';
-- ----------------------------
-- Records of mdiy_tag
-- ----------------------------
BEGIN;
INSERT INTO `mdiy_tag` VALUES (3, 'arclist', 3, '文章列表');
INSERT INTO `mdiy_tag` VALUES (4, 'channel', 3, '通用栏目');
INSERT INTO `mdiy_tag` VALUES (5, 'global', 2, '全局');
INSERT INTO `mdiy_tag` VALUES (7, 'field', 3, '文章内容');
INSERT INTO `mdiy_tag` VALUES (8, 'pre', 0, '文章上一篇');
INSERT INTO `mdiy_tag` VALUES (9, 'page', 2, '通用分页');
INSERT INTO `mdiy_tag` VALUES (10, 'next', 0, '文章下一篇');
COMMIT;
-- ----------------------------
-- Table structure for `mdiy_tag_sql`
-- ----------------------------
-- ----------------------------
-- Table structure for `mdiy_tag_sql`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_tag_sql`;
CREATE TABLE `mdiy_tag_sql` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`tag_id` int(11) NOT NULL COMMENT '自定义标签编号',
`tag_sql` text COMMENT '自定义sql支持ftl写法',
`sort` int(11) DEFAULT NULL COMMENT '排序升序',
PRIMARY KEY (`id`) USING BTREE,
KEY `fk_mdiy_tag_id` (`tag_id`) USING BTREE,
CONSTRAINT `mdiy_tag_sql_ibfk_1` FOREIGN KEY (`tag_id`) REFERENCES `mdiy_tag` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='标签对应多个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)?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');
INSERT INTO `mdiy_tag_sql` VALUES ('9', '8', '<#assign select=\"(SELECT \'\')\"/>\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\n<#if (pageTag.preId) gt 0>\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\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 CONCAT(basic_column.column_path,\"/\",basic_id,\".html\") 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\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=${pageTag.preId}\r\n<#else><#--没有上一页返回空字符串-->\r\nSELECT \r\n${select} as id,\r\n${select} as title,\r\n${select} as fulltitle,\r\n${select} as author, \r\n${select} as source, \r\n${select} as content,\r\n${select} as typename,\r\n${select} as typeid,\r\n${select} as typelink,\r\n${select} as litpic,\r\n${select} as link,\r\n${select} as date,\r\n${select} as descrip,\r\n${select} as hit,\r\n${select} as flag,\r\n${select} as keyword FROM basic\r\n</#if>', null);
INSERT INTO `mdiy_tag_sql` VALUES ('10', '9', ' select\r\n <#if !(pageTag.indexUrl??)>\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 ${pageTag.total}) as total,\r\n <#--记录总数-->\r\n (SELECT ${pageTag.size}) as rcount,\r\n <#--当前页码-->\r\n (SELECT ${pageTag.pageNo}) as cur,\r\n <#--首页-->\r\n CONCAT(\"${path}\", \"/index.html\") as `index`,\r\n <#--上一页-->\r\n <#if (pageTag.pageNo?eval-1) gt 1>\r\n CONCAT(\"${path}\",\"/list-${pageTag.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 pageTag.total==1>\r\n CONCAT(\"${path}\", \"/index.html\") as `next`,\r\n CONCAT(\"${path}\", \"/index.html\") as `last`\r\n <#else>\r\n <#if pageTag.pageNo?eval gte pageTag.total>\r\n CONCAT(\"${path}\",\"/list-${pageTag.total}.html\") as next,\r\n <#else>\r\n CONCAT(\"${path}\",\"/list-${pageTag.pageNo?eval+1}.html\") as next,\r\n </#if>\r\n <#--最后一页-->\r\n CONCAT(\"${path}\",\"/list-${pageTag.total}.html\") as last\r\n </#if>\r\n<#else><#--判断是否是搜索页面-->\r\n \"${pageTag.indexUrl}\" as `index`,\"${pageTag.lastUrl}\" as `last`,\"${pageTag.preUrl}\" as `pre`,\"${pageTag.nextUrl}\" as `next`,\'${pageTag.total}\' as total,\'${pageTag.size}\' as rcount,\'${pageTag.pageNo}\' as cur\r\n</#if>', null);
INSERT INTO `mdiy_tag_sql` VALUES ('11', '10', '<#assign select=\"(SELECT \'\')\"/>\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\n<#if (pageTag.nextId) gt 10>\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\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 CONCAT(basic_column.column_path,\"/\",basic_id,\".html\") 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\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=${pageTag.nextId}\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 ('13', '12', 'SELECT\r\n basic_id AS id,\r\n product_price as price,\r\n product_cost_price AS costprice,\r\n product_content AS content,\r\n product_code AS code,\r\n <#--详情页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", basic_id) as link,\r\n <#else>\r\n product_linkUrl AS link,\r\n </#if>\r\n basic_title AS title,\r\n product_sale AS sale,\r\n product_good AS specification,\r\n product_inventory AS stock,\r\n basic.basic_categoryid AS typeid,\r\n basic_thumbnails AS litpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/mmall/list.do?typeid=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n </#if>\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>${tableNname}.*,</#if>\r\n category_title AS typetitle\r\nFROM\r\n mall_product \r\n LEFT JOIN basic ON mall_product.product_basicID = basic.basic_id\r\n LEFT JOIN category ON basic_categoryid = category.category_id\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>LEFT JOIN ${tableNname} ON ${tableNname}.basicId=mall_product.product_basicID </#if>\r\nWHERE\r\n 1 = 1 <#--查询栏目-->\r\n <#if (typeid)??> and (basic_categoryid=${typeid} or basic_categoryid in \r\n (select category_id FROM category where find_in_set(${typeid},CATEGORY_PARENT_ID)))\r\n </#if>\r\n <#--模糊查询商品标题-->\r\n <#if basic_title??> and basic_title like CONCAT(\"%\",\'${basic_title}\',\"%\")</#if> \r\n LIMIT <#--判断是否分页-->\r\n <#if ispaging?? && pageNo??>${(pageNo?eval-1)*size?eval},${size?default(20)}\r\n <#else>${size?default(20)}</#if>', null);
INSERT INTO `mdiy_tag_sql` VALUES ('14', '13', 'SELECT\r\n basic_id AS id,\r\n product_price as price,\r\n product_cost_price AS costprice,\r\n product_content AS content,\r\n product_code AS code,\r\n <#--详情页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", basic_id) as link,\r\n <#else>\r\n product_linkUrl AS link,\r\n </#if>\r\n basic_title AS title,\r\n product_sale AS sale,\r\n product_good AS specification,\r\n product_inventory AS stock,\r\n basic.basic_categoryid AS typeid,\r\n basic_thumbnails AS litpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/mmall/list.do?id=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n </#if>\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>${tableNname}.*,</#if>\r\n category_title AS typetitle\r\nFROM\r\n mall_product \r\n LEFT JOIN basic ON mall_product.product_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=mall_product.product_basicID </#if>\r\nWHERE\r\n 1 = 1 <#if id??> and basic_id=${id} </#if>', null);
SET FOREIGN_KEY_CHECKS = 0;
ALTER TABLE `basic_column`
ADD COLUMN `column_flag` varchar(100) NULL DEFAULT NULL COMMENT '栏目属性' AFTER `column_cm_id`,
ADD COLUMN `column_diy_url` varchar(50) NULL DEFAULT NULL COMMENT '自定义链接' AFTER `column_flag`;
-- ----------------------------
-- 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` int(1) DEFAULT NULL COMMENT '标签类型',
`tag_description` varchar(255) DEFAULT NULL COMMENT '描述',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='标签';
-- ----------------------------
-- Records of mdiy_tag
-- ----------------------------
BEGIN;
INSERT INTO `mdiy_tag` VALUES (3, 'arclist', 3, '文章列表');
INSERT INTO `mdiy_tag` VALUES (4, 'channel', 3, '通用栏目');
INSERT INTO `mdiy_tag` VALUES (5, 'global', 2, '全局');
INSERT INTO `mdiy_tag` VALUES (7, 'field', 3, '文章内容');
INSERT INTO `mdiy_tag` VALUES (8, 'pre', 0, '文章上一篇');
INSERT INTO `mdiy_tag` VALUES (9, 'page', 2, '通用分页');
INSERT INTO `mdiy_tag` VALUES (10, 'next', 0, '文章下一篇');
COMMIT;
-- ----------------------------
-- Table structure for `mdiy_tag_sql`
-- ----------------------------
-- ----------------------------
-- Table structure for `mdiy_tag_sql`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_tag_sql`;
CREATE TABLE `mdiy_tag_sql` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`tag_id` int(11) NOT NULL COMMENT '自定义标签编号',
`tag_sql` text COMMENT '自定义sql支持ftl写法',
`sort` int(11) DEFAULT NULL COMMENT '排序升序',
PRIMARY KEY (`id`) USING BTREE,
KEY `fk_mdiy_tag_id` (`tag_id`) USING BTREE,
CONSTRAINT `mdiy_tag_sql_ibfk_1` FOREIGN KEY (`tag_id`) REFERENCES `mdiy_tag` (`id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='标签对应多个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)?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');
INSERT INTO `mdiy_tag_sql` VALUES ('9', '8', '<#assign select=\"(SELECT \'\')\"/>\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\n<#if (pageTag.preId) gt 0>\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\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 CONCAT(basic_column.column_path,\"/\",basic_id,\".html\") 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\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=${pageTag.preId}\r\n<#else><#--没有上一页返回空字符串-->\r\nSELECT \r\n${select} as id,\r\n${select} as title,\r\n${select} as fulltitle,\r\n${select} as author, \r\n${select} as source, \r\n${select} as content,\r\n${select} as typename,\r\n${select} as typeid,\r\n${select} as typelink,\r\n${select} as litpic,\r\n${select} as link,\r\n${select} as date,\r\n${select} as descrip,\r\n${select} as hit,\r\n${select} as flag,\r\n${select} as keyword FROM basic\r\n</#if>', null);
INSERT INTO `mdiy_tag_sql` VALUES ('10', '9', ' select\r\n <#if !(pageTag.indexUrl??)>\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 ${pageTag.total}) as total,\r\n <#--记录总数-->\r\n (SELECT ${pageTag.size}) as rcount,\r\n <#--当前页码-->\r\n (SELECT ${pageTag.pageNo}) as cur,\r\n <#--首页-->\r\n CONCAT(\"${path}\", \"/index.html\") as `index`,\r\n <#--上一页-->\r\n <#if (pageTag.pageNo?eval-1) gt 1>\r\n CONCAT(\"${path}\",\"/list-${pageTag.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 pageTag.total==1>\r\n CONCAT(\"${path}\", \"/index.html\") as `next`,\r\n CONCAT(\"${path}\", \"/index.html\") as `last`\r\n <#else>\r\n <#if pageTag.pageNo?eval gte pageTag.total>\r\n CONCAT(\"${path}\",\"/list-${pageTag.total}.html\") as next,\r\n <#else>\r\n CONCAT(\"${path}\",\"/list-${pageTag.pageNo?eval+1}.html\") as next,\r\n </#if>\r\n <#--最后一页-->\r\n CONCAT(\"${path}\",\"/list-${pageTag.total}.html\") as last\r\n </#if>\r\n<#else><#--判断是否是搜索页面-->\r\n \"${pageTag.indexUrl}\" as `index`,\"${pageTag.lastUrl}\" as `last`,\"${pageTag.preUrl}\" as `pre`,\"${pageTag.nextUrl}\" as `next`,\'${pageTag.total}\' as total,\'${pageTag.size}\' as rcount,\'${pageTag.pageNo}\' as cur\r\n</#if>', null);
INSERT INTO `mdiy_tag_sql` VALUES ('11', '10', '<#assign select=\"(SELECT \'\')\"/>\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\n<#if (pageTag.nextId) gt 10>\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\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 CONCAT(basic_column.column_path,\"/\",basic_id,\".html\") 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\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=${pageTag.nextId}\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 ('13', '12', 'SELECT\r\n basic_id AS id,\r\n product_price as price,\r\n product_cost_price AS costprice,\r\n product_content AS content,\r\n product_code AS code,\r\n <#--详情页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", basic_id) as link,\r\n <#else>\r\n product_linkUrl AS link,\r\n </#if>\r\n basic_title AS title,\r\n product_sale AS sale,\r\n product_good AS specification,\r\n product_inventory AS stock,\r\n basic.basic_categoryid AS typeid,\r\n basic_thumbnails AS litpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/mmall/list.do?typeid=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n </#if>\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>${tableNname}.*,</#if>\r\n category_title AS typetitle\r\nFROM\r\n mall_product \r\n LEFT JOIN basic ON mall_product.product_basicID = basic.basic_id\r\n LEFT JOIN category ON basic_categoryid = category.category_id\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>LEFT JOIN ${tableNname} ON ${tableNname}.basicId=mall_product.product_basicID </#if>\r\nWHERE\r\n 1 = 1 <#--查询栏目-->\r\n <#if (typeid)??> and (basic_categoryid=${typeid} or basic_categoryid in \r\n (select category_id FROM category where find_in_set(${typeid},CATEGORY_PARENT_ID)))\r\n </#if>\r\n <#--模糊查询商品标题-->\r\n <#if basic_title??> and basic_title like CONCAT(\"%\",\'${basic_title}\',\"%\")</#if> \r\n LIMIT <#--判断是否分页-->\r\n <#if ispaging?? && pageNo??>${(pageNo?eval-1)*size?eval},${size?default(20)}\r\n <#else>${size?default(20)}</#if>', null);
INSERT INTO `mdiy_tag_sql` VALUES ('14', '13', 'SELECT\r\n basic_id AS id,\r\n product_price as price,\r\n product_cost_price AS costprice,\r\n product_content AS content,\r\n product_code AS code,\r\n <#--详情页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/${modelName}/view.do?id=\", basic_id) as link,\r\n <#else>\r\n product_linkUrl AS link,\r\n </#if>\r\n basic_title AS title,\r\n product_sale AS sale,\r\n product_good AS specification,\r\n product_inventory AS stock,\r\n basic.basic_categoryid AS typeid,\r\n basic_thumbnails AS litpic,\r\n <#--列表页动态链接-->\r\n <#if isDo?? && isDo>\r\n CONCAT(\"/mmall/list.do?id=\", category.category_id) as typelink,\r\n <#else>\r\n (SELECT \"index.html\") AS typelink,\r\n </#if>\r\n <#--判断是否有自定义模型表-->\r\n <#if tableNname??>${tableNname}.*,</#if>\r\n category_title AS typetitle\r\nFROM\r\n mall_product \r\n LEFT JOIN basic ON mall_product.product_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=mall_product.product_basicID </#if>\r\nWHERE\r\n 1 = 1 <#if id??> and basic_id=${id} </#if>', null);
SET FOREIGN_KEY_CHECKS = 1;
\ No newline at end of file
pom.xml
View file @ ce3386ed
......@@ -52,12 +52,12 @@
<dependencies>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId>
<version>1.0.10</version>
<artifactId>ms-basic</artifactId>
<version>1.0.16</version>
</dependency>
<dependency>
<groupId>net.mingsoft</groupId>
<artifactId>ms-upgrader</artifactId>
<artifactId>ms-mpeople</artifactId>
<version>1.0.11</version>
</dependency>
</dependencies>
......@@ -101,9 +101,6 @@
<exclude>**/Dockerfile</exclude>
<exclude>**/ehcache.xml</exclude>
<exclude>**/upgrade/</exclude>
<!-- exclude>**/config/</exclude>
<exclude>**/MSApplication.*</exclude>
<exclude>**/MSServletInitializer.*</exclude -->
<exclude>**/*.java</exclude>
</excludes>
</configuration>
......
src/main/webapp/static/ms-admin/4.7.2/css/index.css
View file @ ce3386ed
......@@ -244,9 +244,9 @@ textarea::-webkit-input-placeholder {
margin-left: 3px;
}
.ms-admin-logo > div span {
margin-top: -7px;
margin-top: -6px;
position: absolute;
margin-left: 6px;
margin-left: 10px;
font-size: 12px;
}
.ms-admin-logo .iconfont {
......@@ -282,7 +282,6 @@ textarea::-webkit-input-placeholder {
background-color: #0080FF;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}
.ms-admin-mstore .ms-admin-mstore-icon span {
......
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.css
View file @ ce3386ed
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.js
View file @ ce3386ed
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.json
View file @ ce3386ed
......@@ -442,7 +442,7 @@
{
"icon_id": "1605988",
"name": "自定义",
"font_class": "zidingyi1",
"font_class": "zidingyiguanli",
"unicode": "e72d",
"unicode_decimal": 59181
},
......@@ -1314,6 +1314,13 @@
"unicode": "e704",
"unicode_decimal": 59140
},
{
"icon_id": "5891302",
"name": "内容管理",
"font_class": "neirongguanli",
"unicode": "e72f",
"unicode_decimal": 59183
},
{
"icon_id": "5959484",
"name": "更多",
......@@ -1391,6 +1398,13 @@
"unicode": "e670",
"unicode_decimal": 58992
},
{
"icon_id": "6405627",
"name": "系统管理",
"font_class": "xitongguanli",
"unicode": "e730",
"unicode_decimal": 59184
},
{
"icon_id": "6616510",
"name": "步进器",
......@@ -1902,6 +1916,13 @@
"unicode": "e716",
"unicode_decimal": 59158
},
{
"icon_id": "8964972",
"name": "会员中心",
"font_class": "huiyuanzhongxin",
"unicode": "e733",
"unicode_decimal": 59187
},
{
"icon_id": "8987629",
"name": "搜索框",
......@@ -1993,6 +2014,13 @@
"unicode": "e708",
"unicode_decimal": 59144
},
{
"icon_id": "9535007",
"name": "权限管理",
"font_class": "quanxianguanli",
"unicode": "e735",
"unicode_decimal": 59189
},
{
"icon_id": "9539052",
"name": "二维码登录",
......@@ -2021,6 +2049,13 @@
"unicode": "e61d",
"unicode_decimal": 58909
},
{
"icon_id": "9575138",
"name": "移交 转交",
"font_class": "yijiaozhuanjiao",
"unicode": "e72e",
"unicode_decimal": 59182
},
{
"icon_id": "9616083",
"name": "缩小",
......
src/main/webapp/static/ms-admin/4.7.2/iconfont/iconfont.svg
View file @ ce3386ed
......@@ -206,7 +206,7 @@ Created by iconfont
<glyph glyph-name="wode" unicode="&#58912;" d="M785.115 547.02c0 146.803-118.959 265.762-265.707 265.762-146.752 0-265.764-119.018-265.764-265.762 0-98.857 54.596-184.074 134.67-229.889-152.812-49.338-249.407-190.886-254.837-358.898l40.207 0.578c6.643 176.967 147.478 324.655 300.281 324.655l35.146-2.004c3.641-0.119 6.719-0.317 10.416-0.317 146.689 0.11 265.59 119.129 265.59 265.878v0zM519.408 323.75c-123.345 0-223.332 99.924-223.332 223.265 0 123.339 99.986 223.325 223.332 223.325 123.339 0 223.327-99.987 223.327-223.325 0-123.341-100.051-223.265-223.327-223.265v0zM741.34 239.94299999999998c-6.462 5.355-12.258 8.907-20.453 9.301-12.098 0.582-22.477-8.082-21.497-22.956 0.51-7.733 4.9-15.23 18.471-27.536v0c72.796-56.677 121.212-142.876 128.146-240.522h42.137c-6.991 114.109-62.683 214.923-146.803 281.713v0z" horiz-adv-x="1024" />
<glyph glyph-name="zidingyi1" unicode="&#59181;" d="M887.721875-53.90625h-735.046875c-7.93125 0-15.1875 2.75625-21.0375 7.25625-0.61875-0.05625-1.209375-0.253125-1.8-0.253125-6.496875 0-12.88125 2.25-17.94375 6.553125a28.01162109 28.01162109 0 0 0-9.7875 24.3L127.025 224.53125c0.5625 5.56875 2.8125 10.8 6.4125 15.075l351.590625 423a27.59677734 27.59677734 0 0 0 18.984375 9.84375c7.509375 0.759375 14.7375-1.74375 20.390625-6.525L730.953125 490.25625c11.7-9.95625 13.190625-27.534375 3.290625-39.31875L383.4125 28.865625000000023c-3.6-4.275-8.38125-7.396875-13.753125-8.8875l-67.584375-19.153125h584.04375c19.265625 0 36.478125 1.040625 36.478125-18.225s-15.609375-36.478125-34.875-36.478125z m-214.03125 519.553125L509.665625 605.11875 181.615625 210.1875 161.84375 19.134374999999977l184.415625 52.284375L673.71875 465.646875z m120.515625 56.30625l-250.03125 210.76875 40.134375 47.75625c21.9375 26.1 53.775 41.0625 87.440625 41.0625 25.93125 0 51.046875-9.16875 70.7625-25.7625l79.734375-67.190625c46.940625-39.6 52.36875-110.840625 12.09375-158.85l-40.10625-47.8125z m-7.875 163.85625l-79.734375 67.190625c-22.78125 19.209375-59.765625 15.103125-79.621875-8.49375l-4.190625-4.978125 164.615625-138.76875 4.190625 5.00625c20.475 24.4125 18.1125 60.328125-5.2875 80.04375z" horiz-adv-x="1024" />
<glyph glyph-name="zidingyiguanli" unicode="&#59181;" d="M887.721875-53.90625h-735.046875c-7.93125 0-15.1875 2.75625-21.0375 7.25625-0.61875-0.05625-1.209375-0.253125-1.8-0.253125-6.496875 0-12.88125 2.25-17.94375 6.553125a28.01162109 28.01162109 0 0 0-9.7875 24.3L127.025 224.53125c0.5625 5.56875 2.8125 10.8 6.4125 15.075l351.590625 423a27.59677734 27.59677734 0 0 0 18.984375 9.84375c7.509375 0.759375 14.7375-1.74375 20.390625-6.525L730.953125 490.25625c11.7-9.95625 13.190625-27.534375 3.290625-39.31875L383.4125 28.865625000000023c-3.6-4.275-8.38125-7.396875-13.753125-8.8875l-67.584375-19.153125h584.04375c19.265625 0 36.478125 1.040625 36.478125-18.225s-15.609375-36.478125-34.875-36.478125z m-214.03125 519.553125L509.665625 605.11875 181.615625 210.1875 161.84375 19.134374999999977l184.415625 52.284375L673.71875 465.646875z m120.515625 56.30625l-250.03125 210.76875 40.134375 47.75625c21.9375 26.1 53.775 41.0625 87.440625 41.0625 25.93125 0 51.046875-9.16875 70.7625-25.7625l79.734375-67.190625c46.940625-39.6 52.36875-110.840625 12.09375-158.85l-40.10625-47.8125z m-7.875 163.85625l-79.734375 67.190625c-22.78125 19.209375-59.765625 15.103125-79.621875-8.49375l-4.190625-4.978125 164.615625-138.76875 4.190625 5.00625c20.475 24.4125 18.1125 60.328125-5.2875 80.04375z" horiz-adv-x="1024" />
<glyph glyph-name="buju_daohanglan" unicode="&#59156;" d="M946.74578926-66H86.71851143c-13.48991367 0-24.46468594 10.97477227-24.46468594 24.46468594V809.53445537c0 13.48991367 10.97477227 24.46468594 24.46468594 24.46468594H946.74578926c13.48991367 0 24.46468594-10.97477227 24.46468593-24.46468594v-851.07062813c0-13.48905498-10.97477227-24.46382724-24.46468594-24.46382724z m-845.8635129 38.62845176H932.58202432V795.37069043H100.88227637v-822.74223868zM81.56805049 656.74777031H951.89624932v-38.62845088H81.56805049zM81.56805049 567.47741894H951.89624932v-38.62845175H81.56805049zM81.56805049 93.65825713000004h861.37154912v-38.62845088H81.56805049zM244.65565654 548.16319307h38.62845176v-473.82001963h-38.62845176zM744.22797734 548.16319307h38.62845177v-473.82001963h-38.62845177zM81.56633398 637.43354443h870.33163272V557.1756401299999H81.56633398z" horiz-adv-x="1058" />
......@@ -581,6 +581,9 @@ Created by iconfont
<glyph glyph-name="huodong" unicode="&#59140;" d="M870.912 820.224h-177.664l-70.656 41.472c-4.608 2.56-9.728 4.096-15.36 4.096H250.88c-50.688 0-92.16-41.472-92.16-92.16v-811.008H90.624c-16.384 0-30.208-13.312-30.208-30.208s13.312-30.208 30.208-30.208h196.608c16.384 0 30.208 13.312 30.208 30.208s-13.312 30.208-30.208 30.208H219.136v366.592h380.416l70.656-41.472c4.608-2.56 9.728-4.096 15.36-4.096h185.856c50.688 0 92.16 41.472 92.16 92.16V728.064c-0.512 51.2-41.472 92.16-92.672 92.16z m32.256-444.416c0-17.408-14.336-31.744-31.744-31.744h-177.664l-70.656 41.472c-4.608 2.56-9.728 4.096-15.36 4.096H219.136v384c0 17.408 14.336 31.744 31.744 31.744h348.16l70.656-41.472c4.608-2.56 9.728-4.096 15.36-4.096h185.856c17.408 0 31.744-14.336 31.744-31.744v-352.256z" horiz-adv-x="1024" />
<glyph glyph-name="neirongguanli" unicode="&#59183;" d="M512 352.00031249999995c-3.1996875 0-9.6 0-12.7996875 3.1996875L83.1996875 547.2c-12.7996875 6.4003125-19.2 16.0003125-19.2 28.8s6.4003125 22.3996875 19.2 28.8l416.000625 192c9.6 3.1996875 19.2 3.1996875 25.599375 0l416.000625-192c12.7996875-6.4003125 19.2-16.0003125 19.2-28.8s-6.4003125-22.3996875-19.2-28.8l-416.000625-192c-3.1996875-3.1996875-9.6-3.1996875-12.7996875-3.1996875zM172.8003125 576L512 419.2003125 851.1996875 576 512 732.7996875 172.8003125 576zM512 160.00031249999995c-3.1996875 0-9.6 0-12.7996875 3.1996875L83.1996875 355.20000000000005c-15.999375 6.4003125-22.3996875 25.6003125-15.999375 41.5996875 6.399375 16.0003125 25.599375 22.400625 41.5996875 16.0003125L512 227.2003125 915.2 412.8c16.0003125 6.4003125 35.2003125 0 41.5996875-16.0003125 6.4003125-15.999375 0-35.199375-15.999375-41.5996875l-416.000625-192c-3.1996875-3.1996875-9.6-3.1996875-12.7996875-3.1996875zM512-31.99968750000005c-3.1996875 0-9.6 0-12.7996875 3.1996875L83.1996875 163.20000000000005c-15.999375 6.4003125-22.3996875 25.6003125-15.999375 41.5996875 6.399375 16.0003125 25.599375 22.400625 41.5996875 16.0003125L512 35.200312499999995 915.2 220.79999999999995c16.0003125 6.4003125 35.2003125 0 41.5996875-16.0003125 6.4003125-15.999375 0-35.199375-15.999375-41.5996875l-416.000625-192c-3.1996875-3.1996875-9.6-3.1996875-12.7996875-3.1996875z" horiz-adv-x="1024" />
<glyph glyph-name="gengduo3" unicode="&#58947;" d="M820.93554688 468.28710938c-46.49414063 0-84.19921875-37.70507813-84.19921876-84.19921876s37.70507813-84.19921875 84.19921875-84.19921875 84.19921875 37.70507813 84.19921875 84.19921875-37.70507813 84.19921875-84.19921875 84.19921875zM511.38476562 468.28710938c-46.49414063 0-84.19921875-37.70507813-84.19921874-84.19921876s37.70507813-84.19921875 84.19921875-84.19921875 84.19921875 37.70507813 84.19921875 84.19921875c0.08789063 46.49414063-37.6171875 84.19921875-84.19921875 84.19921875zM202.44921875 468.28710938c-46.49414063 0-84.19921875-37.70507813-84.19921875-84.19921876s37.70507813-84.19921875 84.19921875-84.19921875 84.19921875 37.70507813 84.19921875 84.19921875-37.70507813 84.19921875-84.19921875 84.19921875z" horiz-adv-x="1024" />
......@@ -614,6 +617,9 @@ Created by iconfont
<glyph glyph-name="gengduo2" unicode="&#58992;" d="M512 700.40625m-79.1015625 0a79.1015625 79.1015625 0 1 1 158.203125 0 79.1015625 79.1015625 0 1 1-158.203125 0ZM512 384m-79.1015625 0a79.1015625 79.1015625 0 1 1 158.203125 0 79.1015625 79.1015625 0 1 1-158.203125 0ZM512 67.59375m-79.1015625 0a79.1015625 79.1015625 0 1 1 158.203125 0 79.1015625 79.1015625 0 1 1-158.203125 0ZM512 621.3046875c43.50585938 0 79.1015625 35.59570313 79.1015625 79.1015625s-35.59570313 79.1015625-79.1015625 79.1015625-79.1015625-35.59570313-79.1015625-79.1015625 35.59570313-79.1015625 79.1015625-79.1015625z m0-158.203125c-43.50585938 0-79.1015625-35.59570313-79.1015625-79.1015625s35.59570313-79.1015625 79.1015625-79.1015625 79.1015625 35.59570313 79.1015625 79.1015625-35.59570313 79.1015625-79.1015625 79.1015625z m0-316.40625c-43.50585938 0-79.1015625-35.59570313-79.1015625-79.1015625s35.59570313-79.1015625 79.1015625-79.1015625 79.1015625 35.59570313 79.1015625 79.1015625-35.59570313 79.1015625-79.1015625 79.1015625z" horiz-adv-x="1024" />
<glyph glyph-name="xitongguanli" unicode="&#59184;" d="M508.416 576.512c-102.912 0-186.368-83.456-186.368-186.368 0-102.912 83.456-186.368 186.368-186.368s186.368 83.456 186.368 186.368-83.456 186.368-186.368 186.368z m0-315.392c-71.168 0-129.024 57.856-129.024 129.024 0 71.168 57.856 129.024 129.024 129.024s129.024-57.856 129.024-129.024c0-70.656-57.856-129.024-129.024-129.024zM963.584 265.72799999999995l0.512 0.512c0.512 0.512 0.512 1.024 1.024 1.536 0 0.512 0.512 0.512 0.512 1.024s0.512 0.512 0.512 1.024 0.512 1.024 0.512 1.536c0 0.512 0 0.512 0.512 1.024 0 0.512 0.512 1.024 0.512 1.536v1.024c0 0.512 0.512 1.536 0.512 2.048 8.192 34.816 12.288 70.656 12.288 107.52s-4.096 72.704-12.288 107.52c0 0.512-0.512 1.536-0.512 2.048v1.024c0 0.512-0.512 1.024-0.512 1.536 0 0.512 0 0.512-0.512 1.024 0 0.512-0.512 1.024-0.512 1.536 0 0.512-0.512 1.024-0.512 1.024 0 0.512-0.512 0.512-0.512 1.024-0.512 0.512-0.512 1.024-1.024 1.536l-0.512 0.512-1.536 1.536-0.512 0.512-1.536 1.536-0.512 0.512c-0.512 0.512-1.024 1.024-1.536 1.024-0.512 0.512-1.024 0.512-1.536 1.024-0.512 0-0.512 0.512-1.024 0.512-0.512 0.512-1.024 0.512-1.536 1.024 0 0-0.512 0-0.512 0.512-0.512 0.512-1.024 0.512-2.048 1.024 0 0-0.512 0-0.512 0.512-0.512 0-1.024 0.512-1.536 0.512-0.512 0-0.512 0-1.024 0.512-0.512 0-1.024 0-1.024 0.512-0.512 0-1.024 0-1.536 0.512h-10.752c-61.44 0-111.616 50.176-111.616 111.616 0 22.016 6.144 43.008 17.92 60.928 0.512 1.024 1.024 2.048 1.536 3.584 0.512 0.512 0.512 1.024 1.024 1.536 0.512 1.024 0.512 2.048 1.024 3.072 0 1.024 0.512 1.536 0.512 2.56v2.048c0 1.024 0.512 2.048 0 3.072 0 1.024 0 2.048-0.512 2.56 0 1.024 0 2.048-0.512 2.56 0 1.024-0.512 2.048-1.024 3.072 0 0.512-0.512 1.536-0.512 2.048-0.512 0.512-0.512 1.536-1.024 2.048l-1.536 3.072c-0.512 0.512-1.024 1.024-1.024 1.536-1.024 1.024-1.536 2.048-2.56 3.072A469.5296 469.5296 0 0 1 646.656 834.56h-0.512c-0.512 0-1.024 0.512-1.536 0.512h-11.264c-0.512 0-1.024 0-1.536-0.512-0.512 0-1.024 0-1.024-0.512-0.512 0-1.024-0.512-1.536-0.512-0.512 0-1.024-0.512-1.024-0.512-0.512 0-1.024-0.512-1.536-0.512-0.512 0-1.024-0.512-1.024-0.512-0.512 0-1.024-0.512-1.024-0.512-0.512 0-1.024-0.512-1.024-0.512-0.512 0-0.512-0.512-1.024-0.512-0.512-0.512-1.024-0.512-1.024-1.024l-1.024-1.024-1.024-1.024-1.024-1.024-1.024-1.024-1.024-1.024-1.024-1.024c-0.512-0.512-0.512-1.024-1.024-1.536 0-0.512-0.512-0.512-0.512-1.024-0.512-0.512-0.512-1.024-1.024-1.536 0 0 0-0.512-0.512-0.512-18.432-38.912-57.344-64-100.864-64s-82.944 25.088-100.864 64c0 0 0 0.512-0.512 0.512 0 0.512-0.512 1.024-1.024 1.536 0 0.512-0.512 0.512-0.512 1.024-0.512 0.512-0.512 1.024-1.024 1.536 0 0.512-0.512 0.512-1.024 1.024l-1.024 1.024-1.024 1.024-1.024 1.024-1.024 1.024-1.024 1.024c-0.512 0.512-1.024 0.512-1.024 1.024-0.512 0-0.512 0.512-1.024 0.512-0.512 0.512-1.024 0.512-1.024 0.512-0.512 0-0.512 0.512-1.024 0.512s-1.024 0.512-1.024 0.512c-0.512 0-1.024 0.512-1.536 0.512-0.512 0-1.024 0.512-1.024 0.512-0.512 0-1.024 0.512-1.536 0.512-0.512 0-1.024 0-1.024 0.512-0.512 0-1.024 0-1.536 0.512h-11.264c-0.512 0-1.024 0-1.536-0.512h-0.512c-70.656-21.504-135.168-58.88-188.416-110.08v-0.512c-1.024-1.024-1.536-1.536-2.048-2.56-0.512-0.512-1.024-1.024-1.536-2.048-0.512-1.024-1.024-1.536-1.536-2.56-0.512-1.024-1.024-1.536-1.024-2.56-0.512-1.024-0.512-1.536-1.024-2.56s-0.512-2.048-1.024-2.56c0-1.024 0-2.048-0.512-2.56 0-1.024-0.512-2.048-0.512-2.56v-5.632c0-1.024 0.512-1.536 0.512-2.56 0.512-1.024 0.512-2.048 1.024-3.072 0.512-0.512 0.512-1.536 1.024-2.048l1.536-3.072v-0.512c12.288-17.92 18.432-39.424 18.432-61.952 0-61.44-50.176-111.616-111.616-111.616h-6.144-6.144c-0.512 0-1.024 0-1.536-0.512-0.512 0-1.024 0-1.536-0.512-0.512 0-1.024 0-1.024-0.512-0.512 0-1.024-0.512-1.536-0.512-0.512 0-0.512-0.512-1.024-0.512s-1.024-0.512-1.536-0.512c-0.512 0-0.512-0.512-1.024-0.512s-1.024-0.512-1.536-1.024c-0.512 0-0.512-0.512-1.024-0.512-0.512-0.512-1.024-0.512-1.024-1.024l-1.024-1.024-1.024-1.024-1.024-1.024-1.024-1.024c-0.512-0.512-0.512-1.024-1.024-1.024 0-0.512-0.512-0.512-0.512-1.024-0.512-0.512-0.512-1.024-1.024-1.024 0-0.512-0.512-0.512-0.512-1.024s-0.512-1.024-0.512-1.024c0-0.512-0.512-1.024-0.512-1.536 0-0.512-0.512-0.512-0.512-1.024s-0.512-1.024-0.512-1.536c0-0.512 0-0.512-0.512-1.024 0-0.512-0.512-1.024-0.512-1.536v-0.512C46.08 456.192 41.984 419.84 41.984 383.48800000000006s4.096-72.704 12.288-107.52v-0.512c0-0.512 0.512-1.024 0.512-1.536 0-0.512 0-0.512 0.512-1.024 0-0.512 0.512-1.024 0.512-1.536 0-0.512 0.512-0.512 0.512-1.024s0.512-1.024 0.512-1.536c0-0.512 0.512-1.024 0.512-1.024 0-0.512 0.512-0.512 0.512-1.024 0.512-0.512 0.512-1.024 1.024-1.024 0-0.512 0.512-0.512 0.512-1.024 0.512-0.512 0.512-1.024 1.024-1.024l1.024-1.024 1.024-1.024 1.024-1.024 1.024-1.024c0.512-0.512 1.024-0.512 1.024-1.024 0.512 0 0.512-0.512 1.024-0.512 0.512-0.512 1.024-0.512 1.536-1.024 0.512 0 0.512-0.512 1.024-0.512s1.024-0.512 1.536-0.512c0.512 0 0.512-0.512 1.024-0.512s1.024-0.512 1.536-0.512c0.512 0 1.024 0 1.024-0.512 0.512 0 1.024 0 1.536-0.512 0.512 0 1.024 0 1.536-0.512h11.776c61.44 0 111.616-50.176 111.616-111.616 0-22.528-6.656-43.52-18.432-61.952v-0.512l-1.536-3.072c-0.512-0.512-1.024-1.536-1.024-2.048-0.512-1.024-0.512-2.048-1.024-3.072 0-1.024-0.512-1.536-0.512-2.56v-5.632c0-1.024 0-2.048 0.512-2.56 0-1.024 0-2.048 0.512-2.56 0-1.024 0.512-2.048 1.024-2.56 0.512-1.024 0.512-1.536 1.024-2.56s1.024-1.536 1.024-2.56c0.512-1.024 1.024-1.536 1.536-2.56 0.512-0.512 1.024-1.024 1.536-2.048 0.512-1.024 1.536-1.536 2.048-2.56v-0.512c53.248-50.688 117.76-88.576 188.416-110.08h0.512c0.512 0 1.024-0.512 1.536-0.512H389.12c0.512 0 1.024 0 1.536 0.512 0.512 0 1.024 0 1.024 0.512 0.512 0 1.024 0.512 1.536 0.512 0.512 0 1.024 0.512 1.024 0.512 0.512 0 1.024 0.512 1.536 0.512 0.512 0 1.024 0.512 1.024 0.512 0.512 0 1.024 0.512 1.024 0.512 0.512 0 1.024 0.512 1.024 0.512 0.512 0 0.512 0.512 1.024 0.512 0.512 0.512 1.024 0.512 1.024 1.024l1.024 1.024 1.024 1.024 1.024 1.024 1.024 1.024 1.024 1.024 1.024 1.024c0.512 0.512 0.512 1.024 1.024 1.536 0 0.512 0.512 0.512 0.512 1.024 0.512 0.512 0.512 1.024 1.024 1.536 0 0 0 0.512 0.512 0.512 18.432 38.912 57.344 64 100.864 64s82.944-25.088 100.864-64c0 0 0-0.512 0.512-0.512 0-0.512 0.512-1.024 1.024-1.536 0-0.512 0.512-0.512 0.512-1.024 0.512-0.512 0.512-1.024 1.024-1.536 0-0.512 0.512-0.512 1.024-1.024l1.024-1.024 1.024-1.024 1.024-1.024 1.024-1.024 1.024-1.024c0.512-0.512 1.024-0.512 1.024-1.024 0.512 0 0.512-0.512 1.024-0.512 0.512-0.512 1.024-0.512 1.024-0.512 0.512 0 1.024-0.512 1.024-0.512 0.512 0 1.024-0.512 1.024-0.512 0.512 0 1.024-0.512 1.536-0.512 0.512 0 1.024-0.512 1.024-0.512 0.512 0 1.024-0.512 1.536-0.512 0.512 0 1.024 0 1.024-0.512 0.512 0 1.024 0 1.536-0.512h11.264c0.512 0 1.024 0 1.536 0.512h0.512c71.168 21.504 136.192 59.392 189.952 111.104 1.024 1.024 1.536 2.048 2.56 3.072 0.512 0.512 1.024 1.024 1.024 1.536l1.536 3.072c0.512 0.512 1.024 1.536 1.024 2.048 0.512 0.512 0.512 1.536 0.512 2.048 0.512 1.024 0.512 2.048 1.024 3.072 0 1.024 0 2.048 0.512 2.56 0 1.024 0.512 1.536 0.512 2.56v3.072 2.048c0 1.024-0.512 1.536-0.512 2.56-0.512 1.024-0.512 2.048-1.024 3.072 0 0.512-0.512 1.024-1.024 1.536-0.512 1.024-1.024 2.56-2.048 3.584-11.776 17.92-17.92 38.912-17.92 60.928 0 61.44 50.176 111.616 111.616 111.616h10.752c0.512 0 1.024 0 1.536 0.512 0.512 0 1.024 0 1.536 0.512 0.512 0 0.512 0 1.024 0.512 0.512 0 1.024 0.512 1.536 0.512 0 0 0.512 0 0.512 0.512 0.512 0.512 1.024 0.512 2.048 1.024 0 0 0.512 0 0.512 0.512 0.512 0.512 1.024 0.512 2.048 1.024 0.512 0 0.512 0.512 1.024 0.512 0.512 0.512 1.024 0.512 1.536 1.024 0.512 0.512 1.024 0.512 1.536 1.024 0.512 0 0.512 0.512 1.024 0.512l1.536 1.536 0.512 0.512c0 2.56 0.512 3.072 1.024 3.584z m-197.632-122.88c0-24.576 5.12-48.64 15.36-70.656-37.888-32.768-81.92-58.88-129.024-75.776-30.72 46.08-82.944 74.752-140.288 74.752s-109.056-28.672-140.288-74.752c-46.592 16.896-90.112 42.496-127.488 74.752 10.24 22.016 15.872 46.592 15.872 71.68 0 88.064-67.584 160.256-153.6 168.448-4.096 24.064-6.656 48.128-6.656 72.704s2.048 49.152 6.656 72.704c86.016 7.68 153.6 80.384 153.6 168.448 0 25.088-5.632 49.664-15.872 71.68 37.888 32.256 80.896 57.856 127.488 74.752 30.72-46.08 82.944-74.752 140.288-74.752s109.056 28.672 140.288 74.752c47.104-16.896 91.136-43.008 129.024-75.776-10.24-22.016-15.36-45.568-15.36-70.656 0-87.552 66.56-159.232 151.552-167.936 4.096-24.064 6.656-48.128 6.656-73.216 0-24.576-2.048-49.152-6.656-73.216-84.992-8.704-151.552-80.384-151.552-167.936z" horiz-adv-x="1024" />
<glyph glyph-name="bujinqi" unicode="&#59171;" d="M102.4 742.4h819.2c56.6 0 102.4-45.8 102.4-102.4v-512c0-56.6-45.8-102.4-102.4-102.4H102.4C45.8 25.6 0 71.4 0 128V640c0 56.6 45.8 102.4 102.4 102.4z m415.4-204.8c-10.3-10.8-23.2-20.7-38.7-30.1-15.5-8.6-30.1-14.6-43.9-18.1v-49.9c28.4 8.2 51.6 20.7 70.1 37.4v-246.5h50.3V537.6h-37.8zM136.5 401.1H68.3c-9.4 0-17.1-7.6-17.1-17.1 0-9.4 7.6-17.1 17.1-17.1h68.3v-68.3c0-9.4 7.6-17.1 17.1-17.1s17.1 7.6 17.1 17.1v68.3h68.3c9.4 0 17.1 7.6 17.1 17.1 0 9.4-7.6 17.1-17.1 17.1h-68.3v68.3c0 9.4-7.6 17.1-17.1 17.1s-17.1-7.6-17.1-17.1l-0.1-68.3z m648.6-32.5h170.7c9.4 0 17.1 9.2 17.1 20.5s-7.6 20.5-17.1 20.5H785.1c-9.4 0-17.1-9.2-17.1-20.5s7.6-20.5 17.1-20.5z" horiz-adv-x="1024" />
......@@ -833,6 +839,9 @@ Created by iconfont
<glyph glyph-name="changfangxing1" unicode="&#59158;" d="M960.7 661.4v-554.7H64.3V661.4h896.4m64.3 64.3H0v-683.3h1025V725.7z" horiz-adv-x="1025" />
<glyph glyph-name="huiyuanzhongxin" unicode="&#59187;" d="M939.170828 525.8960480000001L763.862718 749.404126c-17.585423 22.780287-46.289145 37.542653-74.897993 37.542653H335.064467c-28.702505 0-55.80921-13.122779-74.946646-37.542653L84.809711 525.8960480000001c-30.298305-37.542653-27.107921-93.029541 4.784968-128.932606l355.446189-385.062144 4.784967-4.92241c17.542852-16.311946 41.415387-26.059461 65.283056-26.059461h3.282823c25.513338 1.639587 49.385872 11.390752 66.877639 30.981871L932.794926 395.322638c33.440036 37.542653 34.987184 93.030757 6.375902 130.57341z m-52.663831-84.830389L539.075081 57.550662999999986c-6.380767-6.467125-14.307465-9.746299-22.326603-9.746299-8.014273 0-15.945836 3.277958-22.321738 8.106712L137.385967 442.611591c-11.166951 11.483191-11.166951 29.434724-1.5958 42.463846l173.763395 223.509295c6.374686 8.200368 15.945836 13.029123 25.510905 13.029123h353.900258c9.472629 0 19.04378-4.828754 25.512121-13.029123l175.309326-223.509295c7.926698-13.029123 7.926698-30.979439-3.279175-44.009778z m0 0M680.94437 458.924753L515.110107 277.87322300000005 344.585749 462.202711c-12.711665 13.122779-31.849101 14.673575-46.200354 1.63837-12.755453-11.390752-12.755453-32.620243-1.589719-45.648148l172.117726-186.060298 3.1916-3.190384c25.510905-24.512314 65.419283-22.869078 90.93262 3.190384l165.65425 184.42071c11.204656 13.030339 11.204656 34.25983-1.550797 45.649366-14.3026 11.483191-33.440036 9.843604-46.196705-3.277958z m0 0" horiz-adv-x="1024" />
<glyph glyph-name="sousuokuang" unicode="&#59172;" d="M204.8 588.8h614.4a204.8 204.8 0 1 0 0-409.6H204.8A204.8 204.8 0 1 0 204.8 588.8z m96.529067-293.2736a18.432 18.432 0 0 1 26.077866 26.077867l-32.529066 32.529066c8.567467 13.380267 13.653333 29.184 13.653333 46.250667a86.016 86.016 0 1 1-85.981867-86.016c17.066667 0 32.8704 5.12 46.250667 13.687467l32.529067-32.529067zM161.109333 400.384a61.44 61.44 0 1 0 122.88 0 61.44 61.44 0 0 0-122.88 0z" horiz-adv-x="1024" />
......@@ -872,6 +881,9 @@ Created by iconfont
<glyph glyph-name="zanwuxiangmuxinxi" unicode="&#59144;" d="M940.377905 12.91737c-22.75018-22.694453-58.143218-22.694453-80.893397 0-10.114287-8.825621-18.960805-18.912045-27.807323-27.737665-12.635893-12.60803-26.539554-25.216059-41.710985-36.55632H223.726352c-13.903661 11.347227-27.800357 23.955256-41.704018 36.55632C60.671789 106.209824 17.706968 282.701343 68.26447 445.330994L24.03188 489.445167C1.274734 512.153552 1.274734 547.442103 24.03188 570.136557c22.75018 22.694453 58.136252 22.694453 80.886431 0l27.807323-28.998469c8.846518-8.825621 21.489377-12.60803 32.864466-8.825621 11.37509 3.782409 21.482411 12.60803 24.010983 23.962223 3.79634 11.340261 0 23.948291-8.846518 32.773911l-53.079109 52.939793c-13.910627 13.875798-13.910627 35.302483 0 47.910513 13.896696 13.868833 35.386072 13.868833 48.021965 0L249.005103 616.779301c8.846518-8.825621 21.489377-13.861867 34.132236-10.086424 12.635893 2.521606 21.482411 12.60803 25.271785 25.216059 2.528572 12.60803-1.260803 25.216059-10.107321 34.04168l-31.596698 31.513109c147.883133 89.510045 334.941712 88.249242 481.557077-3.782409 146.615364-92.031651 228.769564-258.436746 213.598134-431.152821l65.728932-65.547823c8.846518-8.825621 12.635893-21.43365 8.846518-32.780877-3.79634-11.347227-12.642858-21.43365-24.017948-23.955256-11.37509-3.782409-24.010983 0-32.8575 8.825621l-64.461164 64.293985c-13.903661 13.861867-35.386072 13.861867-48.028931 0-13.903661-13.861867-13.903661-35.295517 0-47.903547L940.377905 92.340992c22.75018-21.43365 22.75018-56.729168 0-79.423622zM89.753847 689.898907c-22.75018 0-40.443216 17.651242-40.443216 40.345695 0 22.687488 17.693036 40.338729 40.443216 40.338729s40.443216-17.651242 40.443215-40.338729c0-21.43365-17.693036-40.345695-40.443215-40.345695z m0 69.337198c-15.17143 0-27.807323-12.60803-27.807323-27.7307 0-15.129636 12.635893-27.737665 27.807323-27.737665 15.164464 0 27.807323 12.60803 27.807323 27.737665 0 15.12267-11.37509 27.7307-27.807323 27.7307zM102.584781-44.410853h733.94754c3.79634 0 6.324912-1.546399 6.324912-3.872964 0-0.766234 0-1.546399-1.267768-2.319599-1.260803-0.7732-2.528572-0.7732-3.796341-0.773199H103.845584c-3.79634 0-6.324912 1.546399-6.324912 3.872964 0 0.766234 0 1.546399 1.267768 2.319598 1.260803 0 2.528572 0.7732 3.796341 0.7732zM893.010721-44.410853h34.090441c3.782409 0 6.310981-2.786305 6.310981-6.965762s-2.528572-6.965762-6.310981-6.965762h-34.097406c-1.253837 0-2.521606 0-3.782409 1.393152-1.267769 1.393152-1.267769 2.786305-1.267769 4.179457 0 1.393152 0 2.786305 1.267769 4.179458 1.253837 2.786305 2.521606 4.179457 3.782409 4.179457z m-372.494136-37.615116h34.09044c1.267769 0 2.528572 0 3.789375-1.393153 1.260803-1.393152 1.260803-2.786305 1.260803-4.179457 0-1.393152 0-2.786305-1.253837-4.179457-1.267769-1.393152-2.528572-1.393152-3.796341-1.393153h-34.09044c-1.260803 0-2.521606 0-3.789375 1.393153-1.260803 1.393152-1.260803 2.786305-1.260803 4.179457 0 2.786305 2.528572 5.57261 5.050178 5.57261zM82.906502-121.034238H231.123992c1.253837 0 2.51464 0 3.768477-0.668713 1.253837-0.668713 1.253837-1.337426 1.253837-2.006139 0-2.00614-2.507674-3.343566-6.276151-3.343566H82.906502c-3.768477 0-6.283118 1.337426-6.283117 3.343566 0 1.337426 3.768477 2.674853 6.283117 2.674852z m273.831081 0h557.72072c1.253837 0 2.507674 0 3.761512-0.668713 1.260803-0.668713 1.260803-1.337426 1.260803-2.006139 0-0.668713 0-1.337426-1.253837-2.00614-1.253837-0.668713-2.51464-0.668713-3.768478-0.668713H356.737583c-1.253837 0-2.507674 0-3.761512 0.668713-1.260803 0.668713-1.260803 1.337426-1.260803 2.00614 0 0.668713 0 1.337426 1.253837 2.006139 0 0.668713 1.253837 0.668713 3.768478 0.668713zM618.072085-72.273902h150.042519c1.267769 0 2.542503 0 3.810272-0.87072 1.274734-0.87072 1.274734-1.741441 1.274735-2.612161s0-1.741441-1.274735-2.612161c-1.267769-0.87072-2.542503-0.87072-3.810272-0.87072H618.072085c-1.267769 0-2.542503 0-3.810272 0.87072-1.274734 0.87072-1.274734 1.741441-1.274734 2.612161s0 1.741441 1.274734 2.612161c0 0 2.542503 0.87072 3.810272 0.87072zM221.371925-79.239664h259.864726c3.817238 0 6.366707-1.546399 6.366707-3.872964 0-0.766234 0-1.546399-1.274734-2.319599-1.274734-0.7732-2.549469-0.7732-3.824204-0.773199H221.371925c-1.274734 0-2.549469 0-3.824204 0.773199-1.267769 0.7732-1.267769 1.546399-1.267769 2.319599-1.274734 2.326565 1.267769 3.872964 5.091973 3.872964zM670.029706 837.984047c-16.40437 0-29.026331 12.594098-29.026331 28.963639 0 11.340261 7.571784 22.673556 17.665173 26.449 11.354192 5.043212 23.976154 2.521606 31.554903-6.297049 8.825621-8.811689 11.354192-21.405787 6.304014-31.485246-3.789375-11.333295-15.143567-17.630344-26.497759-17.630344z m0 45.340146c-2.528572 0-3.789375 0-6.310981-1.253837-6.310981-2.521606-10.100355-8.825621-10.100355-15.115704 0-8.818655 7.571784-16.376507 16.411336-16.376507 6.304015 0 12.614995 3.775443 15.136601 10.072492 2.528572 6.297049 1.267769 13.861867-3.782409 17.63731-2.521606 3.775443-7.571784 5.036246-11.354192 5.036246z m171.615485-599.501363c-16.40437 0-29.019366 12.594098-29.019366 28.970606 0 11.333295 7.571784 22.66659 17.665173 26.442033 11.354192 5.043212 23.976154 2.521606 31.547937-6.297049 8.832587-8.811689 11.354192-21.405787 6.310981-31.485245-3.789375-10.072492-15.143567-17.630344-26.504725-17.630345z m0 45.340147c-2.521606 0-3.782409 0-6.304015-1.253837-6.310981-2.521606-10.100355-8.818655-10.100356-15.115704 0-8.818655 7.571784-16.369541 16.404371-16.369542 6.310981 0 12.621961 3.768477 15.143567 10.072493 2.528572 6.297049 1.260803 13.847935-3.782409 17.623378-2.528572 3.782409-6.310981 5.043212-11.354193 5.043212z m-336.933921 308.569337c-16.397404 0-29.019366 12.594098-29.019365 28.963639 0 11.333295 7.571784 22.673556 17.665173 26.448999 11.354192 5.036246 23.976154 2.521606 31.554903-6.297049 8.825621-8.818655 11.354192-21.412753 6.304015-31.485245-5.050178-10.079458-15.143567-17.630344-26.49776-17.630344z m0 45.340146c-2.521606 0-3.782409 0-6.304015-1.260803-6.310981-2.521606-10.100355-8.818655-10.100355-15.115704 0-8.811689 7.578749-16.369541 16.411336-16.369541 6.304015 0 12.614995 3.775443 15.143567 10.072492 2.521606 6.297049 1.253837 13.854901-3.789375 17.630344-3.782409 3.782409-7.571784 5.043212-11.354192 5.043212zM189.238863 94.904392c-16.397404 0-29.019366 12.594098-29.019365 28.970605 0 11.333295 7.571784 22.66659 17.665173 26.442034 11.354192 5.043212 23.976154 2.521606 31.554903-6.297049 7.564818-8.811689 11.354192-21.405787 6.304015-31.485245-3.782409-10.072492-13.882764-17.630344-26.49776-17.630345z m0 46.60095c-2.521606 0-3.782409 0-6.304015-1.260803-6.310981-2.521606-10.100355-8.818655-10.100355-15.115704 0-8.811689 7.578749-16.369541 16.411336-16.369542 6.304015 0 12.614995 3.775443 15.143567 10.072493 2.521606 6.297049 1.253837 13.861867-3.789374 17.63731-2.521606 2.51464-6.310981 5.036246-11.354193 5.036246zM823.980018 752.333034h34.069543c1.267769 0 2.528572 0 3.789374-1.253837 1.260803-1.267769 1.260803-2.521606 1.260803-3.782409 0-1.260803 0-2.521606-1.260803-3.782409-1.260803-1.253837-2.521606-1.253837-3.789374-1.253837h-34.062578c-3.789375 0-6.317946 2.51464-6.317946 6.297049 0 1.253837 0 2.51464 1.260803 3.775443h5.050178zM849.822995 763.81261v-36.570251c0-1.358324 0-2.716647-0.773199-4.068006-1.546399-1.351358-2.319599-1.351358-3.099764-1.351358-0.766234 0-1.546399 0-2.319599 1.351358-0.7732 1.358324-0.7732 2.716647-0.7732 4.068006v36.570251c0 4.061039 1.546399 6.770721 3.872964 6.770721 0.766234 0 1.546399 0 2.319599-1.351358 0-1.358324 0.7732-4.068005 0.773199-5.419363zM381.723772 833.275192h37.615116c1.393152 0 2.786305 0 4.179457-0.870721 1.393152-0.87072 1.393152-1.741441 1.393153-2.612161s0-1.741441-1.393153-2.61216-2.786305-0.87072-4.179457-0.870721h-37.615116c-1.393152 0-2.786305 0-4.179458 0.870721-1.393152 0.87072-1.393152 1.741441-1.393152 2.61216s0 1.741441 1.393152 2.612161 2.786305 0.87072 4.179458 0.870721zM410.979973 855.245206v-37.336486c0-1.379221 0-2.765408-0.773199-4.144628-0.7732-1.386187-1.546399-1.386187-2.319599-1.386187-0.780165 0-1.553365 0-2.326565 1.386187-0.766234 1.379221-1.546399 2.765408-1.546399 4.144628v37.336486c0 1.386187 0 2.765408 0.7732 4.151594 0.7732 1.379221 1.546399 1.379221 2.319598 1.379221 2.326565 1.386187 3.872964-1.379221 3.872964-5.530815zM116.871559 276.014211h36.570252c4.061039 0 6.770721-2.786305 6.770721-6.965762s-2.709682-6.965762-6.770721-6.965763h-36.570252c-1.358324 0-2.716647 0-4.068005 1.393153-1.351358 1.393152-1.351358 2.786305-1.351358 4.179457 0 1.393152 0 2.786305 1.351358 4.179458 0 4.179457 2.716647 4.179457 4.068005 4.179457zM142.456804 287.075841v-33.902364c0-1.253837 0-2.507674-1.260803-3.761512-1.267769-1.260803-2.528572-1.260803-3.789375-1.260803-1.267769 0-2.528572 0-3.79634 1.253837-1.260803 1.253837-1.260803 2.507674-1.260803 3.768478v33.902364c0 3.768477 2.528572 6.283118 6.317946 6.283118 1.260803 0 2.528572 0 3.789375-1.253837-1.260803-1.253837 0-2.51464 0-5.029281zM664.366541 617.336562h34.118304c1.267769 0 2.528572 0 3.79634-1.253838 1.260803-1.253837 1.260803-2.507674 1.260803-3.768477 0-3.761512-2.528572-6.276152-6.317946-6.276152h-34.118304c-3.79634 0-6.317946 2.507674-6.317946 6.269186 0 1.260803 0 2.51464 1.260803 3.775443 2.528572 1.253837 3.789375 1.253837 6.317946 1.253838zM689.610464 624.497365v-36.570252c0-1.358324 0-2.716647-0.7732-4.068005-0.7732-1.351358-1.546399-1.351358-2.319599-1.351358-2.326565 0-3.872964 2.709682-3.872964 6.770721v36.570252c0 1.358324 0 2.716647 0.7732 4.068005 0.7732 1.351358 1.546399 1.351358 2.319599 1.351358 0.780165 0 1.553365 0 2.326564-1.351358 0.766234-1.358324 1.546399-2.716647 1.5464-5.419363zM488.564633 464.089792c7.536955 0 13.820072-3.79634 17.58855-11.395987l23.871667-48.133417a29.277099 29.277099 0 0 1 26.386308-16.460097h179.667906c16.334712 0 30.154785-13.931525 30.154784-30.398586v-253.296013c0-16.467062-13.820072-30.398586-30.154784-30.398587H322.723765c-16.334712 0-30.154785 13.931525-30.154784 30.398587V433.691205C292.562015 450.158267 306.382087 464.089792 322.7168 464.089792h165.847833zM759.748724 87.93863H342.039824C323.002396 87.93863 306.493539 103.11006 306.493539 123.3456V449.580109A35.413935 35.413935 0 0 0 342.039824 484.987079h167.59624c8.881347 0 17.76966-5.057143 21.579932-13.910628l24.122434-46.782059c3.810272-8.853484 12.698585-13.910627 21.586898-13.910627h181.555627c19.044394 0 35.546285-15.178396 35.546285-35.40697v-252.898964c1.267769-18.967771-15.234122-34.139201-34.278516-34.139201zM342.039824 474.872792c-13.959388 0-25.390203-11.382056-25.390203-25.285717V122.070865c0-13.910627 11.42385-25.285717 25.390203-25.285717h417.7089c13.966353 0 25.390203 11.37509 25.390203 25.285717V374.976795c0 13.910627-11.42385 25.285717-25.390203 25.285717H578.193096c-12.698585 0-25.390203 7.592681-30.468244 18.974737l-24.1294 48.049828c-2.535537 5.057143-7.613578 7.585715-12.691619 7.585715H342.039824zM467.667346 429.260981c7.536955 0 13.820072-3.79634 17.58855-11.395987l23.871667-48.133418a29.277099 29.277099 0 0 1 26.386308-16.460096h179.667906c16.334712 0 30.154785-13.931525 30.154785-30.398586v-253.296013c0-16.467062-13.820072-30.398586-30.154785-30.398587H301.826479c-16.334712 0-30.154785 13.931525-30.154785 30.398587V398.862394C271.664728 415.329456 285.4848 429.260981 301.819513 429.260981h165.847833zM717.95415 39.178294H300.245251C281.207822 39.178294 264.698966 54.349724 264.698966 74.585264V400.819773A35.413935 35.413935 0 0 0 300.245251 436.226743h167.59624c8.881347 0 17.76966-5.057143 21.579931-13.910627l24.122435-46.78206c3.810272-8.853484 12.698585-13.910627 21.586897-13.910627h181.555627c19.044394 0 35.546285-15.178396 35.546285-35.406969v-252.898965c1.267769-18.967771-15.234122-34.139201-34.278516-34.139201zM300.245251 426.112456c-13.959388 0-25.390203-11.382056-25.390204-25.285717V73.310529c0-13.910627 11.42385-25.285717 25.390204-25.285717h417.708899c13.966353 0 25.390203 11.37509 25.390204 25.285717V326.21646c0 13.910627-11.42385 25.285717-25.390204 25.285717H536.398523c-12.698585 0-25.390203 7.592681-30.468244 18.974736l-24.129401 46.782059c-2.535537 5.057143-7.613578 7.592681-12.691619 7.592681H300.245251v1.253837zM271.664728 303.87726h466.706071v-11.110391H271.664728V303.87726z m123.280061-87.643221h67.930113c1.253837 0 2.51464 0 3.775443-1.23294 1.253837-1.239906 1.253837-2.472846 1.253837-3.705785 0-1.23294 0-2.472846-1.253837-3.705786-1.253837-1.23294-2.51464-1.23294-3.775443-1.23294h-67.930113c-1.253837 0-2.51464 0-3.775444 1.23294-1.253837 1.23294-1.253837 2.472846-1.253837 3.705786 0 1.23294 0 2.46588 1.253837 3.705785 1.253837 1.23294 2.521606 1.23294 3.775444 1.23294z m152.215836 0h67.930114c2.51464 0 5.02928-2.472846 5.02928-4.945691 0-1.225974 0-2.46588-1.253837-3.691854-1.253837-1.239906-2.521606-1.239906-3.775443-1.239906H547.160625c-1.253837 0-2.51464 0-3.775443 1.23294-1.253837 1.23294-1.253837 2.472846-1.253837 3.705786 0 1.23294 0 2.46588 1.253837 3.705785 1.253837 1.23294 2.51464 1.23294 3.775443 1.23294zM545.433116 115.801679c-1.295632 0-2.591264 0-3.886895 1.107556-31.102128 26.553486-66.091152 1.107556-67.386784 0-2.591264-1.107556-5.182527-1.107556-6.478159 0-1.302598 2.208147-1.302598 4.423259 0 5.530815 0 0 42.76978 32.084301 81.638734 0 1.302598-1.107556 1.302598-4.423259 0-5.530815-1.295632-1.107556-2.591264-1.107556-3.886896-1.107556z" horiz-adv-x="1044" />
<glyph glyph-name="quanxianguanli" unicode="&#59189;" d="M331.392 478.890667c0-92.16 69.674667-167.893333 157.738667-180.266667v-206.933333a31.573333 31.573333 0 0 1 30.762666-30.72 31.573333 31.573333 0 0 1 30.762667 30.72V204.373333h51.242667a31.573333 31.573333 0 0 1 30.805333 30.762667 31.573333 31.573333 0 0 1-30.805333 30.762667h-51.2v34.773333a182.442667 182.442667 0 0 1 145.365333 178.218667 182.741333 182.741333 0 0 1-182.314667 182.314666 182.741333 182.741333 0 0 1-182.357333-182.314666z m182.357333 120.789333a119.722667 119.722667 0 0 0 120.746667-120.746667 119.722667 119.722667 0 0 0-120.746667-120.832 119.68 119.68 0 0 0-120.917333 120.789334 119.765333 119.765333 0 0 0 120.917333 120.789333zM898.730667 743.125333L519.808 866.005333a28.245333 28.245333 0 0 1-18.432 0L122.453333 743.082667a30.848 30.848 0 0 1-20.48-28.714667v-479.274667c2.048-16.341333 24.576-159.786667 397.354667-333.866666a25.898667 25.898667 0 0 1 12.245333-2.048c4.096 0 8.234667 0 12.245334 2.048 370.688 174.08 395.306667 317.44 397.354666 333.866666V714.410667c-1.962667 12.245333-10.197333 24.618667-22.442666 28.714666z m-40.96-503.893333c-2.048-10.24-36.821333-126.933333-348.16-276.437333-313.386667 149.504-346.112 266.282667-348.16 276.48V691.882667l348.16 114.730666 348.16-114.730666v-452.608z" horiz-adv-x="1024" />
<glyph glyph-name="erweimadenglu" unicode="&#59033;" d="M62 834h346.15371094v-346.15371094L62 834z m553.84628906 0H962v-346.15371094H615.84628906V834z m0-553.84628906v69.23144531h-69.23144531l-69.23056641 69.85371094v137.83886719h69.23144532v-69.23144532h69.2305664v-69.23144531h138.46113281v-69.23056641h-69.2305664v-69.2305664h69.23144531v69.23144531h69.23056641v69.23056641H962v-69.23144532h-69.23144531v-69.2305664H962V-66L615.84628906 280.15371094z m69.23144531 484.61572265v-207.69257812H892.76855469V764.7694335900001H685.07685547z m0-553.84628906L892.76855469 3.2305664100000513V210.92314452999995H685.07685547zM131.2296875 764.76855469l207.69257812-207.69257813V764.7694335900001H131.23056641zM737 712.84628906h103.84628906V609H737V712.84628906zM737 159h103.84628906v-103.84628906L737 159zM477.38427734 695.53886719h69.23144532v-69.23144531h-69.23144532v69.23144531z m0 138.46113281h69.23144532v-69.23144531h-69.23144532V834zM287 609L183.15371094 712.84628906H287V609z" horiz-adv-x="1024" />
......@@ -884,6 +896,9 @@ Created by iconfont
<glyph glyph-name="jia" unicode="&#58909;" d="M830.36690615 702.36690615a450 450 0 1 1 0-636.7338123 450.77697862 450.77697862 0 0 1 0 636.7338123z m-36.38848886-600.34532344a398.58992842 398.58992842 0 1 0 0 563.95683458 399.302158 399.302158 0 0 0 0-563.95683458zM728.9064749 409.89928066H537.89928066V600.9064748999999a25.89928066 25.89928066 0 0 1-51.79856133 0v-191.00719423H295.0935251a25.89928066 25.89928066 0 0 1 0-51.79856133h191.00719423V167.09352509999997a25.89928066 25.89928066 0 0 1 51.79856133 0V358.10071933999996H728.9064749a25.89928066 25.89928066 0 0 1 0 51.79856133z" horiz-adv-x="1024" />
<glyph glyph-name="yijiaozhuanjiao" unicode="&#59182;" d="M651.138 291.248c8.722 0 16.805 4.794 21.617 12.818 6.965 11.61 2.841 26.451-9.448 33.824-17.31 10.094-37.272 18.904-60.747 26.79 68.503 40.13 110.54 112.888 110.54 192.812 0 123.521-100.49 224.008-224.008 224.008S265.084 681.012 265.084 557.492c0-81.825 43.372-155.346 114.045-194.847-139.912-48.679-236.543-182.94-236.543-330.949 0-15.873 9.517-26.13 24.244-26.13 14.276 0 24.244 9.968 24.244 24.247 0 166.402 135.381 301.784 301.786 301.784 50.983 0 101.576-12.809 146.103-36.921 3.738-2.242 7.948-3.428 12.175-3.428z m-162.046 439.88c96.782 0 175.52-78.742 175.52-175.524s-78.738-175.52-175.52-175.52-175.522 78.738-175.522 175.52 78.74 175.524 175.522 175.524zM801.169-13.5c-3.814 0-7.593 1.13-10.926 3.272-10.611 6.814-11.058 19.776-5.011 31.672l25.994 33.946H429.15c-13.484 0-24.442 10.953-24.449 24.417-0.01 13.472 10.945 24.44 24.417 24.451h427.851l1.18-0.027c0.479 0.015 0.798 0.023 1.115 0.023 3.903 0 7.694-1.126 10.96-3.256 5.173-3.321 8.866-8.708 10.412-15.175a27.113 27.113 0 0 0-2.144-18.702l-54.874-70.285-0.105-0.198c-5.413-7.501-14.506-10.138-22.344-10.138zM429.125 153.753l-1.17 0.027c-0.515-0.015-0.838-0.027-1.162-0.027a20 20 0 0 0-10.947 3.26 24.464 24.464 0 0 0-10.405 15.137 27.144 27.144 0 0 0 2.136 18.737l54.513 70.792 0.105 0.202c6.076 7.536 14.344 10.134 22.182 10.134 3.816 0 7.593-1.13 10.926-3.272 10.611-6.814 12.89-19.72 5.146-31.673l-25.607-34.449h382.101c13.472 0 24.432-10.96 24.432-24.432s-10.96-24.436-24.432-24.436H429.125z" horiz-adv-x="1024" />
<glyph glyph-name="suoxiao" unicode="&#58980;" d="M467.00878906 91.50527344c-186.3984375 0-337.50175781 151.1015625-337.50175781 337.48769531 0 186.39755859 151.10244141 337.50175781 337.50175781 337.50175781 186.38525391 0 337.48769531-151.10419922 337.48769532-337.50175781-0.00175781-186.38701172-151.10419922-337.48769531-337.48769532-337.48769531z m323.36191406 93.67207031c128.07949219 169.84863281 102.90322266 409.84541016-57.63076171 549.43769531-160.51992187 139.58964844-401.69267578 131.17939453-552.10605469-19.24804687-150.42832031-150.41601563-158.83857422-391.58789063-19.24804688-552.1069336 139.59140625-160.53398438 379.58642578-185.71201172 549.4359375-57.63251953m0 0l155.1506836-155.14892578c21.95947266-21.96210938 57.5859375-21.96210938 79.54804687 0 21.95947266 21.95947266 21.95947266 57.5859375 0 79.54980469L790.36894531 185.17646484M613.25878906 462.75263672H320.75703125c-23.87109375 0-33.74648438-9.89033203-33.74648438-33.75966797 0-23.85527344 9.87539062-33.74560547 33.74648438-33.74560547H613.25878906c23.85703125 0 33.74560547 9.89033203 33.74560547 33.74560547 0 23.86933594-9.88857422 33.75878906-33.74560547 33.75878906z" horiz-adv-x="1024" />
......
Markdown is supported
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