sunjianxi
/
cycgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!140 SQL更新

Browse Source 
Merge pull request !140 from 他是超人他会飞/4.7.0
master
他是超人他会飞 7 years ago committed by 铭飞
parent eaa1c4b3cc f0ef7e537c
commit 07730e63cf
13 changed files with 400 additions and 338 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      doc/4.6.5-to-4.7.0-mysql.sql
  2. 2
      doc/4.6.5-to-4.7.0-sqlserver.sql
  3. 11
      doc/SQL文件版本说明.md
  4. 379
      doc/db-mcms-mysql-4.7.0.sql
  5. 2
      src/main/java/net/mingsoft/cms/action/ColumnAction.java
  6. 266
      src/main/java/net/mingsoft/cms/action/web/SearchAction.java
  7. 12
      src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
  8. 2
      src/main/resources/application-dev.yml
  9. 3
      src/main/resources/application-prod.yml
  10. 12
      src/main/resources/application-test.yml
  11. 11
      src/main/webapp/templets/1/default/m/case-list.htm
  12. 0
      src/main/webapp/templets/1/default/m/indexa.htm
  13. 36
      src/main/webapp/templets/1/default/search.htm

2
doc/4.6.5-to-4.7.0-mysql.sql
Unescape View File

@ -1,7 +1,7 @@
ALTER TABLE `model` ADD COLUMN `is_child` varchar(255) COMMENT '扩展业务标记' AFTER `model_parent_ids`;
ALTER TABLE `mdiy_dict` ADD COLUMN `is_child` varchar(255) COMMENT '扩展业务标记' AFTER `dict_description`;
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`;
DROP TABLE IF EXISTS `file`;
CREATE TABLE `file` (

2
doc/4.6.5-to-4.7.0-sqlserver.sql
Unescape View File

@ -1,6 +1,8 @@
ALTER TABLE [dbo].[model] ADD [is_child] varchar(255) NULL
GO
ALTER TABLE [dbo].[mdiy_dict] ALTER COLUMN [dict_value] nvarchar ( 100 ) COLLATE SQL_Latin1_General_CP1_CI_AS NULL
EXEC sp_addextendedproperty
'MS_Description', N'扩展业务标记',
'SCHEMA', N'dbo',

11
doc/SQL文件版本说明.md
Unescape View File

@ -0,0 +1,11 @@
# 温馨提示，请使用master分支
db-mcms-mysql-4.7.0 最低版本mysql 5.7
db-mcms-sqlserver-4.7.0 最低版本 SQLServer2012
如果使用低与要求版本数据库会出现如下错误
1、导入 mysql文件 datetime时间函数报错，请使用4.6.
2、SQLServer数据库版本 自定义标签 使用了SQLServer2012最新的分页函数 ，
请自行修改mdiy_tag_sql表中的分页函数
数据库类型切换 ：修改application.yml中
database-id: mysql、sqlServer、oracle

379
doc/db-mcms-mysql-4.7.0.sql
Unescape View File

@ -1,7 +1,22 @@
/*
Navicat MySQL Data Transfer
Source Server : localhost_3306
Source Server Version : 50640
Source Host : localhost:3306
Source Database : test
Target Server Type : MYSQL
Target Server Version : 50640
File Encoding : 65001
Date: 2019-02-27 18:18:39
*/
SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
-- Table structure for app
-- Table structure for `app`
-- ----------------------------
DROP TABLE IF EXISTS `app`;
CREATE TABLE `app` (
@ -32,7 +47,7 @@ CREATE TABLE `app` (
INSERT INTO `app` VALUES ('1', 'MCMS-OPEN', 'http://localhost:9090/ms-mcms', '', '', '', 'default', '50', '', null, 'm', null, '', '0', '0', null);
-- ----------------------------
-- Table structure for basic
-- Table structure for `basic`
-- ----------------------------
DROP TABLE IF EXISTS `basic`;
CREATE TABLE `basic` (
@ -174,7 +189,7 @@ INSERT INTO `basic` VALUES ('221', '华赋科创', '', '/upload/1//article/15311
INSERT INTO `basic` VALUES ('222', '洛阳洛龙', '', '/upload/1//article/1531105970322.jpg', '0', '0', '2018-07-09 11:12:00', '2018-07-09 11:19:24', '0', '149', '1', '8', null, null, null, null, '0');
-- ----------------------------
-- Table structure for basic_attention
-- Table structure for `basic_attention`
-- ----------------------------
DROP TABLE IF EXISTS `basic_attention`;
CREATE TABLE `basic_attention` (
@ -196,7 +211,7 @@ CREATE TABLE `basic_attention` (
-- ----------------------------
-- ----------------------------
-- Table structure for basic_column
-- Table structure for `basic_column`
-- ----------------------------
DROP TABLE IF EXISTS `basic_column`;
CREATE TABLE `basic_column` (
@ -264,7 +279,7 @@ INSERT INTO `basic_column` VALUES ('148', '', '', '1', 'index.html', 'index.html
INSERT INTO `basic_column` VALUES ('149', '', '', '1', 'case-list.htm', 'case-list.htm', '/149', null);
-- ----------------------------
-- Table structure for basic_log
-- Table structure for `basic_log`
-- ----------------------------
DROP TABLE IF EXISTS `basic_log`;
CREATE TABLE `basic_log` (
@ -297,7 +312,7 @@ INSERT INTO `basic_log` VALUES ('13', '73', '192.168.1.165', '2016-06-12 11:31:1
INSERT INTO `basic_log` VALUES ('14', '73', '192.168.1.152', '2016-06-13 19:53:50', '0');
-- ----------------------------
-- Table structure for category
-- Table structure for `category`
-- ----------------------------
DROP TABLE IF EXISTS `category`;
CREATE TABLE `category` (
@ -377,7 +392,7 @@ INSERT INTO `category` VALUES ('148', '短图', '0', '2016-06-02 17:24:21', '50'
INSERT INTO `category` VALUES ('149', '网站案例', '0', '2018-07-09 11:07:41', '50', '7', null, '', '1', null, null, '0', '0', null, '0', null, '0');
-- ----------------------------
-- Table structure for cms_article
-- Table structure for `cms_article`
-- ----------------------------
DROP TABLE IF EXISTS `cms_article`;
CREATE TABLE `cms_article` (
@ -493,7 +508,7 @@ INSERT INTO `cms_article` VALUES ('221', '', '<p>深圳市华赋科创电子有
INSERT INTO `cms_article` VALUES ('222', '', '<p>洛龙区人民政府门户网作为洛阳市洛龙区电子政务（网上行政）建设的重要组成部分，是政府信息公开的法定载体，是政府面向社会服务的平台，是公众与政府交流互动的桥梁，是宣传洛龙的主要窗口，对于促进政府信息公开、推进依法行政、接受公众监督、改进行政管理、全面履行政府职能和建设阳光政府具有重要意义。</p>', '', 'http://www.luolong.gov.cn/ ', '/149\\222.html', '', '0', '1');
-- ----------------------------
-- Table structure for cms_class_50
-- Table structure for `cms_class_50`
-- ----------------------------
DROP TABLE IF EXISTS `cms_class_50`;
CREATE TABLE `cms_class_50` (
@ -514,7 +529,7 @@ INSERT INTO `cms_class_50` VALUES ('6', '2', '1');
INSERT INTO `cms_class_50` VALUES ('7', '1', '1');
-- ----------------------------
-- Table structure for comment
-- Table structure for `comment`
-- ----------------------------
DROP TABLE IF EXISTS `comment`;
CREATE TABLE `comment` (
@ -544,7 +559,33 @@ CREATE TABLE `comment` (
-- ----------------------------
-- ----------------------------
-- Table structure for manager
-- Table structure for `file`
-- ----------------------------
DROP TABLE IF EXISTS `file`;
CREATE TABLE `file` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '文件编号',
`category_id` int(11) DEFAULT NULL COMMENT '文件分类编号',
`app_id` int(11) DEFAULT NULL COMMENT 'APP编号',
`file_name` varchar(200) DEFAULT NULL COMMENT '文件名称',
`file_url` varchar(500) DEFAULT NULL COMMENT '文件链接',
`file_size` int(11) DEFAULT NULL COMMENT '文件大小',
`file_json` varchar(500) DEFAULT NULL COMMENT '文件详情Json数据',
`file_type` varchar(50) DEFAULT NULL COMMENT '文件类型：图片、音频、视频等',
`is_child` varchar(50) DEFAULT NULL COMMENT '子业务',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`update_by` int(11) DEFAULT NULL COMMENT '更新者',
`create_by` int(11) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`del` int(1) DEFAULT NULL COMMENT '删除标记',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='基础文件表';
-- ----------------------------
-- Records of file
-- ----------------------------
-- ----------------------------
-- Table structure for `manager`
-- ----------------------------
DROP TABLE IF EXISTS `manager`;
CREATE TABLE `manager` (
@ -567,7 +608,7 @@ CREATE TABLE `manager` (
INSERT INTO `manager` VALUES ('50', 'msopen', 'msopen', '9d8622060de5f24937b60585c3f4d66b', '48', '0', '2015-09-18 11:54:36', '0');
-- ----------------------------
-- Table structure for manager_model_page
-- Table structure for `manager_model_page`
-- ----------------------------
DROP TABLE IF EXISTS `manager_model_page`;
CREATE TABLE `manager_model_page` (
@ -585,7 +626,7 @@ CREATE TABLE `manager_model_page` (
-- ----------------------------
-- ----------------------------
-- Table structure for mdiy_content_model
-- Table structure for `mdiy_content_model`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_content_model`;
CREATE TABLE `mdiy_content_model` (
@ -611,7 +652,7 @@ INSERT INTO `mdiy_content_model` VALUES ('2', '商品品牌', 'mdiy_brand_2', '0
INSERT INTO `mdiy_content_model` VALUES ('3', '自定义', 'mdiy_mooc_50', '0', null, null, null, null, null);
-- ----------------------------
-- Table structure for mdiy_content_mode_field
-- Table structure for `mdiy_content_mode_field`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_content_mode_field`;
CREATE TABLE `mdiy_content_mode_field` (
@ -647,7 +688,7 @@ INSERT INTO `mdiy_content_mode_field` VALUES ('11', '描述4', 'descripFo', '2',
INSERT INTO `mdiy_content_mode_field` VALUES ('12', '描述5', 'descripFi', '2', null, '1', '3', null, '0', '1', null, null, null, null, null);
-- ----------------------------
-- Table structure for mdiy_dict
-- Table structure for `mdiy_dict`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_dict`;
CREATE TABLE `mdiy_dict` (
@ -657,10 +698,10 @@ CREATE TABLE `mdiy_dict` (
`dict_label` varchar(100) COLLATE utf8_bin NOT NULL COMMENT '标签名',
`dict_type` varchar(100) COLLATE utf8_bin NOT NULL COMMENT '类型',
`dict_description` varchar(100) COLLATE utf8_bin DEFAULT NULL COMMENT '描述',
`is_child` varchar(255) COLLATE utf8_bin DEFAULT NULL COMMENT '扩展业务标记',
`dict_sort` int(10) NOT NULL DEFAULT '0' COMMENT '排序（升序）',
`dict_parent_id` varchar(64) COLLATE utf8_bin DEFAULT '0' COMMENT '父级编号',
`dict_remarks` varchar(255) COLLATE utf8_bin DEFAULT NULL COMMENT '备注信息',
`is_child` varchar(255) DEFAULT NULL COMMENT '扩展业务标记',
`create_by` int(64) DEFAULT '0' COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`update_by` int(64) DEFAULT '0' COMMENT '更新者',
@ -676,12 +717,13 @@ CREATE TABLE `mdiy_dict` (
-- ----------------------------
-- Records of mdiy_dict
-- ----------------------------
INSERT INTO `mdiy_dict` VALUES (1, 1, 'f', '幻灯', '文章属性', NULL, 3, NULL, '0', NULL, 0, NULL, 0, NULL, 0);
INSERT INTO `mdiy_dict` VALUES (2, 1, 'p', '图片', '文章属性', NULL, 1, NULL, '0', NULL, 0, NULL, 0, NULL, 0);
INSERT INTO `mdiy_dict` VALUES (3, 1, 'c', '推荐', '文章属性', NULL, 4, NULL, '0', NULL, 0, NULL, 0, NULL, 0);
INSERT INTO `mdiy_dict` VALUES (4, 1, 'h', '头条', '文章属性', NULL, 2, NULL, '0', NULL, 0, NULL, 0, NULL, 0);
INSERT INTO `mdiy_dict` VALUES ('1', '1', 'f', '幻灯', '文章属性', null, null, '3', '0', null, '0', null, '0', null, '0');
INSERT INTO `mdiy_dict` VALUES ('2', '1', 'p', '图片', '文章属性', null, null, '1', '0', null, '0', null, '0', null, '0');
INSERT INTO `mdiy_dict` VALUES ('3', '1', 'c', '推荐', '文章属性', null, null, '4', '0', null, '0', null, '0', null, '0');
INSERT INTO `mdiy_dict` VALUES ('4', '1', 'h', '头条', '文章属性', null, null, '2', '0', null, '0', null, '0', null, '0');
-- ----------------------------
-- Table structure for mdiy_form
-- Table structure for `mdiy_form`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_form`;
CREATE TABLE `mdiy_form` (
@ -704,7 +746,7 @@ CREATE TABLE `mdiy_form` (
INSERT INTO `mdiy_form` VALUES ('1', '留言', 'mdiy_message_50', '1', '0', '2018-06-29 17:37:13', '0', '2018-06-29 17:37:13');
-- ----------------------------
-- Table structure for mdiy_form_field
-- Table structure for `mdiy_form_field`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_form_field`;
CREATE TABLE `mdiy_form_field` (
@ -729,7 +771,7 @@ INSERT INTO `mdiy_form_field` VALUES ('2', '手机号', 'PHONE', '1', '', '1', '
INSERT INTO `mdiy_form_field` VALUES ('3', '留言内容', 'CONTENT', '3', '', '1', '0', '1');
-- ----------------------------
-- Table structure for mdiy_message_50
-- Table structure for `mdiy_message_50`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_message_50`;
CREATE TABLE `mdiy_message_50` (
@ -747,7 +789,7 @@ CREATE TABLE `mdiy_message_50` (
-- ----------------------------
-- ----------------------------
-- Table structure for mdiy_mooc_50
-- Table structure for `mdiy_mooc_50`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_mooc_50`;
CREATE TABLE `mdiy_mooc_50` (
@ -779,7 +821,7 @@ INSERT INTO `mdiy_mooc_50` VALUES ('62', '/upload/article/1638/1464835856964.jpg
INSERT INTO `mdiy_mooc_50` VALUES ('63', '/upload/article/1638/1464835842429.jpg|/upload/article/1638/1464835842841.jpeg|/upload/article/1638/1464835842898.jpg|/upload/article/1638/1464835842964.jpeg', '一幅好照片要把观众的注意力吸引到趣味中心&mdash;&mdash;被摄主体上。无论是拍什么 类型的照片，都会有一个主体你喜欢拍人物，拍生态，这些都不是问题，但是一旦主体被模糊，欣赏照片时就会忽略照片的主体', '这样的照片是不失败不完美的，因 为真正想让观众看的东西并没有一眼看到。例如婚纱照，主体肯定是人物新娘和新郎。如果目光都被新娘后面的景色吸引，而不是新娘，这肯定不会是我们想照的', '网页设计师的重要任务不是根据内容做出网页，而是根据用户需求设计出让用户喜欢并积极使用的网页，能够让用户知道并去使用网站的新产品or关键点 or有价值的信息，那么如何突出这些点？如何让用户看到网页的&ldquo', '有让用户点击或者传播的欲望？突出设计 的重点就如同突出摄影的被摄主体一样，把控视觉的重点，你的设计一定会非常精彩。', '能够让用户知道并去使用网站的新产品or关键点 or有价值的信息，那么如何突出这些点？如何让用户看到网页的&ldquo;G点&rdquo;，有让用户点击或者传播的欲望？');
-- ----------------------------
-- Table structure for mdiy_page
-- Table structure for `mdiy_page`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_page`;
CREATE TABLE `mdiy_page` (
@ -806,7 +848,7 @@ INSERT INTO `mdiy_page` VALUES ('3', '1', '0', 'people/center.htm', '个人中
INSERT INTO `mdiy_page` VALUES ('4', '1', '0', 'people/password-change.htm', '修改密码', 'people/password-change', null);
-- ----------------------------
-- Table structure for mdiy_search
-- Table structure for `mdiy_search`
-- ----------------------------
DROP TABLE IF EXISTS `mdiy_search`;
CREATE TABLE `mdiy_search` (
@ -827,7 +869,59 @@ INSERT INTO `mdiy_search` VALUES ('1', '头部', 'search.htm', '1', 'cms');
INSERT INTO `mdiy_search` VALUES ('9', '列表页面搜索', 'search-list.htm', '1', 'cms');
-- ----------------------------
-- Table structure for model
-- 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
-- ----------------------------
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', '文章下一篇');
INSERT INTO `mdiy_tag` VALUES ('12', 'prclist', '3', '商品列表');
INSERT INTO `mdiy_tag` VALUES ('13', 'goods', '3', '商品详情');
-- ----------------------------
-- 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', '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 ('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 ('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 ('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 ('11', '10', '<#assign select=\"(SELECT \'\')\"/>\r\n<#if nextId??>\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=${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);
-- ----------------------------
-- Table structure for `model`
-- ----------------------------
DROP TABLE IF EXISTS `model`;
CREATE TABLE `model` (
@ -848,96 +942,96 @@ CREATE TABLE `model` (
KEY `model_modelid` (`model_modelid`) USING BTREE,
KEY `model_code` (`model_code`) USING BTREE,
CONSTRAINT `fk_model_model_id` FOREIGN KEY (`model_modelid`) REFERENCES `model` (`model_id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=InnoDB AUTO_INCREMENT=155 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='模块表';
) ENGINE=InnoDB AUTO_INCREMENT=164 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='模块表';
-- ----------------------------
-- Records of model
-- ----------------------------
INSERT INTO `model` VALUES (1, '内容管理', '02000000', NULL, '', '2014-08-01 16:19:50', '&#xe77a;', 0, 5, 1, NULL, NULL);
INSERT INTO `model` VALUES (4, '管理员管理', '01020000', 23, 'basic/manager/index.do', '2014-08-03 09:15:02', '', 0, 0, 1, '23', NULL);
INSERT INTO `model` VALUES (5, '角色管理', '01010000', 23, 'basic/role/index.do', '2014-08-03 09:15:14', '', 0, 0, 1, '23', NULL);
INSERT INTO `model` VALUES (7, '栏目管理', '02990000', 1, 'cms/column/index.do', '2014-08-03 09:16:29', '', 0, 2, 1, '1', NULL);
INSERT INTO `model` VALUES (8, '文章管理', '02980000', 1, 'cms/article/index.do', '2014-08-03 09:17:10', '', 0, 3, 1, '1', NULL);
INSERT INTO `model` VALUES (22, '会员中心', '07000000', NULL, '', '2014-09-08 08:11:28', '&#xe6b6;', 0, 4, 1, NULL, NULL);
INSERT INTO `model` VALUES (23, '权限管理', '01000000', NULL, '', '2014-09-08 08:12:22', '&#xe950;', 0, 2, 1, NULL, NULL);
INSERT INTO `model` VALUES (80, '静态化', '02020000', 1, 'cms/generate/index.do', '2014-12-18 11:37:15', '', 0, 1, 1, '1', NULL);
INSERT INTO `model` VALUES (84, '系统管理', '12000000', NULL, '', '2014-12-18 18:30:24', '&#xe71f;', 0, 1, 1, NULL, NULL);
INSERT INTO `model` VALUES (86, '应用设置', '12010000', 84, 'app/-1/edit.do', '2014-12-18 18:31:59', '', 0, 0, 1, '84', NULL);
INSERT INTO `model` VALUES (88, '用户管理', '07020100', 22, 'people/peopleUser/index.do ', '2015-09-18 11:44:54', '', 0, 0, 1, '22', NULL);
INSERT INTO `model` VALUES (91, '模板管理', '12020000', 84, 'template/queryTemplateSkin.do', NULL, '', 0, 0, 1, '84', NULL);
INSERT INTO `model` VALUES (92, '查看', '02990001', 7, 'cms:column:view', '2017-09-04 11:05:24', '', 0, 0, 0, '1,7', NULL);
INSERT INTO `model` VALUES (93, '查看', '02980001', 8, 'article:view', '2017-09-04 11:05:58', '', 0, 0, 0, '1,8', NULL);
INSERT INTO `model` VALUES (94, '查看', '02020001', 80, 'cms:generate:view', '2017-09-04 11:07:50', '', 0, 0, 0, '1,80', NULL);
INSERT INTO `model` VALUES (95, '查看', '07020101', 88, 'people:view', '2017-09-04 11:08:24', '', 0, 0, 0, '22,88', NULL);
INSERT INTO `model` VALUES (96, '菜单管理', '01030000', 23, 'model/index.do', '2017-09-04 11:09:26', '', 0, 0, 1, '23', NULL);
INSERT INTO `model` VALUES (97, '查看', '01020001', 4, 'manager:view', '2017-09-04 11:09:58', '', 0, 0, 0, '23,4', NULL);
INSERT INTO `model` VALUES (98, '查看', '01010001', 5, 'role:view', '2017-09-04 11:10:20', '', 0, 0, 0, '23,5', NULL);
INSERT INTO `model` VALUES (99, '查看', '01030001', 96, 'model:view', '2017-09-04 11:10:43', '', 0, 0, 0, '23,96', NULL);
INSERT INTO `model` VALUES (100, '查看', '12020001', 91, 'template:view', '2017-09-04 11:12:02', '', 0, 0, 0, '84,91', NULL);
INSERT INTO `model` VALUES (101, '查看', '12010001', 86, 'app:view', '2017-09-04 11:12:46', '', 0, 0, 0, '84,86', NULL);
INSERT INTO `model` VALUES (104, '自定义管理', '20000000', NULL, '', '2017-09-04 11:17:41', '&#xe6dd', 0, 3, 1, NULL, NULL);
INSERT INTO `model` VALUES (105, '自定义页面', '20010000', 104, 'mdiy/page/index.do', '2017-09-04 11:18:51', '', 0, 0, 1, '104', NULL);
INSERT INTO `model` VALUES (106, '自定义表单', '20020000', 104, 'mdiy/form/index.do', '2017-09-04 11:19:15', '', 0, 0, 1, '104', NULL);
INSERT INTO `model` VALUES (107, '自定义模型', '20030000', 104, 'mdiy/contentModel/index.do', '2017-09-04 11:20:15', '', 0, 0, 1, '104', NULL);
INSERT INTO `model` VALUES (108, '自定义搜索', '20040000', 104, 'mdiy/search/index.do', '2017-09-04 11:20:31', '', 0, 0, 1, '104', NULL);
INSERT INTO `model` VALUES (109, '自定义字典', '20050000', 104, 'mdiy/dict/index.do', '2017-09-04 11:21:09', '', 0, 0, 1, '104', NULL);
INSERT INTO `model` VALUES (110, '查看', '20010001', 105, 'mdiy:page:view', '2017-09-04 11:21:47', NULL, 0, 0, 0, '104,105', NULL);
INSERT INTO `model` VALUES (111, '查看', '20020001', 106, 'mdiy:form:view', '2017-09-04 11:22:17', '', 0, 0, 0, '104,106', NULL);
INSERT INTO `model` VALUES (112, '查看', '20030001', 107, 'mdiy:content:view', '2017-09-04 11:22:45', '', 0, 0, 0, '104,107', NULL);
INSERT INTO `model` VALUES (113, '查看', '20040001', 108, 'mdiy:search:view', '2017-09-04 11:23:04', '', 0, 0, 0, '104,108', NULL);
INSERT INTO `model` VALUES (114, '查看', '20050001', 109, 'mdiy:dict:view', '2017-09-04 11:23:23', '', 0, 0, 0, '104,109', NULL);
INSERT INTO `model` VALUES (115, '删除', '02980003', 8, 'article:del', '2017-09-04 13:24:41', '', 0, 0, 0, '1,8', NULL);
INSERT INTO `model` VALUES (116, '修改', '02980004', 8, 'article:update', '2017-09-04 13:24:58', '', 0, 0, 0, '1,8', NULL);
INSERT INTO `model` VALUES (117, '新增', '02980002', 8, 'article:save', '2017-09-04 13:25:37', '', 0, 0, 0, '1,8', NULL);
INSERT INTO `model` VALUES (118, '生成主页', '02020002', 80, 'cms:generate:index', '2017-09-04 13:31:16', '', 0, 0, 0, '1,80', NULL);
INSERT INTO `model` VALUES (119, '生成栏目', '02020003', 80, 'cms:generate:column', '2017-09-04 13:31:47', '', 0, 0, 0, '1,80', NULL);
INSERT INTO `model` VALUES (120, '生成文章', '02020004', 80, 'cms:generate:article', '2017-09-04 13:32:14', '', 0, 0, 0, '1,80', NULL);
INSERT INTO `model` VALUES (121, '删除', '07020103', 88, 'people:del', '2017-09-04 14:06:19', '', 0, 0, 0, '22,88', NULL);
INSERT INTO `model` VALUES (122, '修改', '07020104', 88, 'people:update', '2017-09-04 14:07:40', '', 0, 0, 0, '22,88', NULL);
INSERT INTO `model` VALUES (123, '新增', '07020102', 88, 'people:save', '2017-09-04 14:08:07', '', 0, 0, 0, '22,88', NULL);
INSERT INTO `model` VALUES (124, '删除', '01020003', 4, 'manager:del', '2017-09-04 14:08:52', '', 0, 0, 0, '23,4', NULL);
INSERT INTO `model` VALUES (125, '修改', '01020004', 4, 'manager:update', '2017-09-04 14:09:24', '', 0, 0, 0, '23,4', NULL);
INSERT INTO `model` VALUES (126, '新增', '01020002', 4, 'manager:save', '2017-09-04 14:09:45', '', 0, 0, 0, '23,4', NULL);
INSERT INTO `model` VALUES (127, '删除', '01010003', 5, 'role:del', '2017-09-04 14:10:56', '', 0, 0, 0, '23,5', NULL);
INSERT INTO `model` VALUES (128, '修改', '01010004', 5, 'role:update', '2017-09-04 14:11:36', '', 0, 0, 0, '23,5', NULL);
INSERT INTO `model` VALUES (129, '新增', '01010002', 5, 'role:save', '2017-09-04 14:12:09', '', 0, 0, 0, '23,5', NULL);
INSERT INTO `model` VALUES (130, '删除', '01030003', 96, 'model:del', '2017-09-04 14:13:05', '', 0, 0, 0, '23,96', NULL);
INSERT INTO `model` VALUES (131, '修改', '01030004', 96, 'model:update', '2017-09-04 14:13:34', '', 0, 0, 0, '23,96', NULL);
INSERT INTO `model` VALUES (132, '新增', '01030002', 96, 'model:save', '2017-09-04 14:14:03', '', 0, 0, 0, '23,96', NULL);
INSERT INTO `model` VALUES (133, '修改', '12010004', 86, 'app:update', '2017-09-04 14:14:42', '', 0, 0, 0, '84,86', NULL);
INSERT INTO `model` VALUES (134, '删除', '12020003', 91, 'template:del', '2017-09-04 14:16:25', '', 0, 0, 0, '84,91', NULL);
INSERT INTO `model` VALUES (135, '修改', '12020004', 91, 'template:update', '2017-09-04 14:16:54', '', 0, 0, 0, '84,91', NULL);
INSERT INTO `model` VALUES (136, '上传', '12020002', 91, 'template:upload', '2017-09-04 14:18:20', '', 0, 0, 0, '84,91', NULL);
INSERT INTO `model` VALUES (137, '删除', '20010003', 105, 'mdiy:page:del', '2017-09-04 14:19:05', NULL, 0, 0, 0, '104,105', NULL);
INSERT INTO `model` VALUES (138, '修改', '20010004', 105, 'mdiy:page:update', '2017-09-04 14:19:44', NULL, 0, 0, 0, '104,105', NULL);
INSERT INTO `model` VALUES (139, '新增', '20010002', 105, 'mdiy:page:save', '2017-09-04 14:20:04', NULL, 0, 0, 0, '104,105', NULL);
INSERT INTO `model` VALUES (140, '删除', '20020003', 106, 'mdiy:form:del', '2017-09-04 14:23:53', '', 0, 0, 0, '104,106', NULL);
INSERT INTO `model` VALUES (141, '修改', '20020004', 106, 'mdiy:form:update', '2017-09-04 14:24:20', '', 0, 0, 0, '104,106', NULL);
INSERT INTO `model` VALUES (142, '新增', '20020002', 106, 'mdiy:form:save', '2017-09-04 14:24:39', '', 0, 0, 0, '104,106', NULL);
INSERT INTO `model` VALUES (143, '删除', '20030003', 107, 'mdiy:content:del', '2017-09-04 14:25:21', '', 0, 0, 0, '104,107', NULL);
INSERT INTO `model` VALUES (144, '修改', '20030004', 107, 'mdiy:content:update', '2017-09-04 14:25:48', '', 0, 0, 0, '104,107', NULL);
INSERT INTO `model` VALUES (145, '新增', '20030002', 107, 'mdiy:content:save', '2017-09-04 14:26:12', '', 0, 0, 0, '104,107', NULL);
INSERT INTO `model` VALUES (146, '删除', '20040003', 108, 'mdiy:search:del', '2017-09-04 14:26:55', '', 0, 0, 0, '104,108', NULL);
INSERT INTO `model` VALUES (147, '修改', '20040004', 108, 'mdiy:search:update', '2017-09-04 14:27:13', '', 0, 0, 0, '104,108', NULL);
INSERT INTO `model` VALUES (148, '新增', '20040002', 108, 'mdiy:search:save', '2017-09-04 14:27:33', '', 0, 0, 0, '104,108', NULL);
INSERT INTO `model` VALUES (149, '删除', '20050003', 109, 'mdiy:dict:del', '2017-09-04 14:28:00', '', 0, 0, 0, '104,109', NULL);
INSERT INTO `model` VALUES (150, '修改', '20050004', 109, 'mdiy:dict:update', '2017-09-04 14:28:17', '', 0, 0, 0, '104,109', NULL);
INSERT INTO `model` VALUES (151, '新增', '20050002', 109, 'mdiy:dict:save', '2017-09-04 14:28:41', '', 0, 0, 0, '104,109', NULL);
INSERT INTO `model` VALUES (152, '删除', '02990002', 7, 'cms:column:del', '2018-06-20 17:53:51', '', 0, 0, 0, '1,7', NULL);
INSERT INTO `model` VALUES (153, '修改', '02990003', 7, 'cms:column:update', '2018-06-20 17:54:43', NULL, 0, 0, 0, '1,7', NULL);
INSERT INTO `model` VALUES (154, '新增', '02990004', 7, 'cms:column:save', '2018-06-20 17:55:26', NULL, 0, 0, 0, '1,7', NULL);
INSERT INTO `model` VALUES (155, '自定义标签', '20060000', 104, 'mdiy/tag/index.do', '2017-09-04 11:18:51', '', 0, 0, 1, '104', '');
INSERT INTO `model` VALUES (156, '新增', '20060001', 155, 'mdiy:tag:save', '2017-09-04 14:28:41', '', 0, 0, 0, '104,155', '');
INSERT INTO `model` VALUES (157, '查看', '20060002', 155, 'mdiy:tag:view', '2018-06-20 17:53:51', '', 0, 0, 0, '104,155', '');
INSERT INTO `model` VALUES (158, '修改', '20060003', 155, 'mdiy:tag:update', '2018-06-20 17:54:43', NULL, 0, 0, 0, '104,155', '');
INSERT INTO `model` VALUES (159, '删除', '20060004', 155, 'mdiy:tag:del', '2018-06-20 17:55:26', NULL, 0, 0, 0, '104,155', '');
INSERT INTO `model` VALUES (160, '新增SQL', '20060005', 155, 'mdiy:tagSql:save', '2017-09-04 14:28:41', '', 0, 0, 0, '104,155', '');
INSERT INTO `model` VALUES (161, '查看SQL', '20060006', 155, 'mdiy:tagSql:view', '2018-06-20 17:53:51', '', 0, 0, 0, '104,155', '');
INSERT INTO `model` VALUES (162, '修改SQL', '20060007', 155, 'mdiy:tagSql:update', '2018-06-20 17:54:43', NULL, 0, 0, 0, '104,155', '');
INSERT INTO `model` VALUES (163, '删除SQL', '20060008', 155, 'mdiy:tagSql:del', '2018-06-20 17:55:26', NULL, 0, 0, 0, '104,155', '');
INSERT INTO `model` VALUES ('1', '内容管理', '02000000', null, '', '2014-08-01 16:19:50', '&#xe77a;', '0', '5', '1', null, null);
INSERT INTO `model` VALUES ('4', '管理员管理', '01020000', '23', 'basic/manager/index.do', '2014-08-03 09:15:02', '', '0', '0', '1', '23', null);
INSERT INTO `model` VALUES ('5', '角色管理', '01010000', '23', 'basic/role/index.do', '2014-08-03 09:15:14', '', '0', '0', '1', '23', null);
INSERT INTO `model` VALUES ('7', '栏目管理', '02990000', '1', 'cms/column/index.do', '2014-08-03 09:16:29', '', '0', '2', '1', '1', null);
INSERT INTO `model` VALUES ('8', '文章管理', '02980000', '1', 'cms/article/index.do', '2014-08-03 09:17:10', '', '0', '3', '1', '1', null);
INSERT INTO `model` VALUES ('22', '会员中心', '07000000', null, '', '2014-09-08 08:11:28', '&#xe6b6;', '0', '4', '1', null, null);
INSERT INTO `model` VALUES ('23', '权限管理', '01000000', null, '', '2014-09-08 08:12:22', '&#xe950;', '0', '2', '1', null, null);
INSERT INTO `model` VALUES ('80', '静态化', '02020000', '1', 'cms/generate/index.do', '2014-12-18 11:37:15', '', '0', '1', '1', '1', null);
INSERT INTO `model` VALUES ('84', '系统管理', '12000000', null, '', '2014-12-18 18:30:24', '&#xe71f;', '0', '1', '1', null, null);
INSERT INTO `model` VALUES ('86', '应用设置', '12010000', '84', 'app/-1/edit.do', '2014-12-18 18:31:59', '', '0', '0', '1', '84', null);
INSERT INTO `model` VALUES ('88', '用户管理', '07020100', '22', 'people/peopleUser/index.do ', '2015-09-18 11:44:54', '', '0', '0', '1', '22', null);
INSERT INTO `model` VALUES ('91', '模板管理', '12020000', '84', 'template/queryTemplateSkin.do', null, '', '0', '0', '1', '84', null);
INSERT INTO `model` VALUES ('92', '查看', '02990001', '7', 'cms:column:view', '2017-09-04 11:05:24', '', '0', '0', '0', '1,7', null);
INSERT INTO `model` VALUES ('93', '查看', '02980001', '8', 'article:view', '2017-09-04 11:05:58', '', '0', '0', '0', '1,8', null);
INSERT INTO `model` VALUES ('94', '查看', '02020001', '80', 'cms:generate:view', '2017-09-04 11:07:50', '', '0', '0', '0', '1,80', null);
INSERT INTO `model` VALUES ('95', '查看', '07020101', '88', 'people:view', '2017-09-04 11:08:24', '', '0', '0', '0', '22,88', null);
INSERT INTO `model` VALUES ('96', '菜单管理', '01030000', '23', 'model/index.do', '2017-09-04 11:09:26', '', '0', '0', '1', '23', null);
INSERT INTO `model` VALUES ('97', '查看', '01020001', '4', 'manager:view', '2017-09-04 11:09:58', '', '0', '0', '0', '23,4', null);
INSERT INTO `model` VALUES ('98', '查看', '01010001', '5', 'role:view', '2017-09-04 11:10:20', '', '0', '0', '0', '23,5', null);
INSERT INTO `model` VALUES ('99', '查看', '01030001', '96', 'model:view', '2017-09-04 11:10:43', '', '0', '0', '0', '23,96', null);
INSERT INTO `model` VALUES ('100', '查看', '12020001', '91', 'template:view', '2017-09-04 11:12:02', '', '0', '0', '0', '84,91', null);
INSERT INTO `model` VALUES ('101', '查看', '12010001', '86', 'app:view', '2017-09-04 11:12:46', '', '0', '0', '0', '84,86', null);
INSERT INTO `model` VALUES ('104', '自定义管理', '20000000', null, '', '2017-09-04 11:17:41', '&#xe6dd', '0', '3', '1', null, null);
INSERT INTO `model` VALUES ('105', '自定义页面', '20010000', '104', 'mdiy/page/index.do', '2017-09-04 11:18:51', '', '0', '0', '1', '104', null);
INSERT INTO `model` VALUES ('106', '自定义表单', '20020000', '104', 'mdiy/form/index.do', '2017-09-04 11:19:15', '', '0', '0', '1', '104', null);
INSERT INTO `model` VALUES ('107', '自定义模型', '20030000', '104', 'mdiy/contentModel/index.do', '2017-09-04 11:20:15', '', '0', '0', '1', '104', null);
INSERT INTO `model` VALUES ('108', '自定义搜索', '20040000', '104', 'mdiy/search/index.do', '2017-09-04 11:20:31', '', '0', '0', '1', '104', null);
INSERT INTO `model` VALUES ('109', '自定义字典', '20050000', '104', 'mdiy/dict/index.do', '2017-09-04 11:21:09', '', '0', '0', '1', '104', null);
INSERT INTO `model` VALUES ('110', '查看', '20010001', '105', 'mdiy:page:view', '2017-09-04 11:21:47', null, '0', '0', '0', '104,105', null);
INSERT INTO `model` VALUES ('111', '查看', '20020001', '106', 'mdiy:form:view', '2017-09-04 11:22:17', '', '0', '0', '0', '104,106', null);
INSERT INTO `model` VALUES ('112', '查看', '20030001', '107', 'mdiy:content:view', '2017-09-04 11:22:45', '', '0', '0', '0', '104,107', null);
INSERT INTO `model` VALUES ('113', '查看', '20040001', '108', 'mdiy:search:view', '2017-09-04 11:23:04', '', '0', '0', '0', '104,108', null);
INSERT INTO `model` VALUES ('114', '查看', '20050001', '109', 'mdiy:dict:view', '2017-09-04 11:23:23', '', '0', '0', '0', '104,109', null);
INSERT INTO `model` VALUES ('115', '删除', '02980003', '8', 'article:del', '2017-09-04 13:24:41', '', '0', '0', '0', '1,8', null);
INSERT INTO `model` VALUES ('116', '修改', '02980004', '8', 'article:update', '2017-09-04 13:24:58', '', '0', '0', '0', '1,8', null);
INSERT INTO `model` VALUES ('117', '新增', '02980002', '8', 'article:save', '2017-09-04 13:25:37', '', '0', '0', '0', '1,8', null);
INSERT INTO `model` VALUES ('118', '生成主页', '02020002', '80', 'cms:generate:index', '2017-09-04 13:31:16', '', '0', '0', '0', '1,80', null);
INSERT INTO `model` VALUES ('119', '生成栏目', '02020003', '80', 'cms:generate:column', '2017-09-04 13:31:47', '', '0', '0', '0', '1,80', null);
INSERT INTO `model` VALUES ('120', '生成文章', '02020004', '80', 'cms:generate:article', '2017-09-04 13:32:14', '', '0', '0', '0', '1,80', null);
INSERT INTO `model` VALUES ('121', '删除', '07020103', '88', 'people:del', '2017-09-04 14:06:19', '', '0', '0', '0', '22,88', null);
INSERT INTO `model` VALUES ('122', '修改', '07020104', '88', 'people:update', '2017-09-04 14:07:40', '', '0', '0', '0', '22,88', null);
INSERT INTO `model` VALUES ('123', '新增', '07020102', '88', 'people:save', '2017-09-04 14:08:07', '', '0', '0', '0', '22,88', null);
INSERT INTO `model` VALUES ('124', '删除', '01020003', '4', 'manager:del', '2017-09-04 14:08:52', '', '0', '0', '0', '23,4', null);
INSERT INTO `model` VALUES ('125', '修改', '01020004', '4', 'manager:update', '2017-09-04 14:09:24', '', '0', '0', '0', '23,4', null);
INSERT INTO `model` VALUES ('126', '新增', '01020002', '4', 'manager:save', '2017-09-04 14:09:45', '', '0', '0', '0', '23,4', null);
INSERT INTO `model` VALUES ('127', '删除', '01010003', '5', 'role:del', '2017-09-04 14:10:56', '', '0', '0', '0', '23,5', null);
INSERT INTO `model` VALUES ('128', '修改', '01010004', '5', 'role:update', '2017-09-04 14:11:36', '', '0', '0', '0', '23,5', null);
INSERT INTO `model` VALUES ('129', '新增', '01010002', '5', 'role:save', '2017-09-04 14:12:09', '', '0', '0', '0', '23,5', null);
INSERT INTO `model` VALUES ('130', '删除', '01030003', '96', 'model:del', '2017-09-04 14:13:05', '', '0', '0', '0', '23,96', null);
INSERT INTO `model` VALUES ('131', '修改', '01030004', '96', 'model:update', '2017-09-04 14:13:34', '', '0', '0', '0', '23,96', null);
INSERT INTO `model` VALUES ('132', '新增', '01030002', '96', 'model:save', '2017-09-04 14:14:03', '', '0', '0', '0', '23,96', null);
INSERT INTO `model` VALUES ('133', '修改', '12010004', '86', 'app:update', '2017-09-04 14:14:42', '', '0', '0', '0', '84,86', null);
INSERT INTO `model` VALUES ('134', '删除', '12020003', '91', 'template:del', '2017-09-04 14:16:25', '', '0', '0', '0', '84,91', null);
INSERT INTO `model` VALUES ('135', '修改', '12020004', '91', 'template:update', '2017-09-04 14:16:54', '', '0', '0', '0', '84,91', null);
INSERT INTO `model` VALUES ('136', '上传', '12020002', '91', 'template:upload', '2017-09-04 14:18:20', '', '0', '0', '0', '84,91', null);
INSERT INTO `model` VALUES ('137', '删除', '20010003', '105', 'mdiy:page:del', '2017-09-04 14:19:05', null, '0', '0', '0', '104,105', null);
INSERT INTO `model` VALUES ('138', '修改', '20010004', '105', 'mdiy:page:update', '2017-09-04 14:19:44', null, '0', '0', '0', '104,105', null);
INSERT INTO `model` VALUES ('139', '新增', '20010002', '105', 'mdiy:page:save', '2017-09-04 14:20:04', null, '0', '0', '0', '104,105', null);
INSERT INTO `model` VALUES ('140', '删除', '20020003', '106', 'mdiy:form:del', '2017-09-04 14:23:53', '', '0', '0', '0', '104,106', null);
INSERT INTO `model` VALUES ('141', '修改', '20020004', '106', 'mdiy:form:update', '2017-09-04 14:24:20', '', '0', '0', '0', '104,106', null);
INSERT INTO `model` VALUES ('142', '新增', '20020002', '106', 'mdiy:form:save', '2017-09-04 14:24:39', '', '0', '0', '0', '104,106', null);
INSERT INTO `model` VALUES ('143', '删除', '20030003', '107', 'mdiy:content:del', '2017-09-04 14:25:21', '', '0', '0', '0', '104,107', null);
INSERT INTO `model` VALUES ('144', '修改', '20030004', '107', 'mdiy:content:update', '2017-09-04 14:25:48', '', '0', '0', '0', '104,107', null);
INSERT INTO `model` VALUES ('145', '新增', '20030002', '107', 'mdiy:content:save', '2017-09-04 14:26:12', '', '0', '0', '0', '104,107', null);
INSERT INTO `model` VALUES ('146', '删除', '20040003', '108', 'mdiy:search:del', '2017-09-04 14:26:55', '', '0', '0', '0', '104,108', null);
INSERT INTO `model` VALUES ('147', '修改', '20040004', '108', 'mdiy:search:update', '2017-09-04 14:27:13', '', '0', '0', '0', '104,108', null);
INSERT INTO `model` VALUES ('148', '新增', '20040002', '108', 'mdiy:search:save', '2017-09-04 14:27:33', '', '0', '0', '0', '104,108', null);
INSERT INTO `model` VALUES ('149', '删除', '20050003', '109', 'mdiy:dict:del', '2017-09-04 14:28:00', '', '0', '0', '0', '104,109', null);
INSERT INTO `model` VALUES ('150', '修改', '20050004', '109', 'mdiy:dict:update', '2017-09-04 14:28:17', '', '0', '0', '0', '104,109', null);
INSERT INTO `model` VALUES ('151', '新增', '20050002', '109', 'mdiy:dict:save', '2017-09-04 14:28:41', '', '0', '0', '0', '104,109', null);
INSERT INTO `model` VALUES ('152', '删除', '02990002', '7', 'cms:column:del', '2018-06-20 17:53:51', '', '0', '0', '0', '1,7', null);
INSERT INTO `model` VALUES ('153', '修改', '02990003', '7', 'cms:column:update', '2018-06-20 17:54:43', null, '0', '0', '0', '1,7', null);
INSERT INTO `model` VALUES ('154', '新增', '02990004', '7', 'cms:column:save', '2018-06-20 17:55:26', null, '0', '0', '0', '1,7', null);
INSERT INTO `model` VALUES ('155', '自定义标签', '20060000', '104', 'mdiy/tag/index.do', '2017-09-04 11:18:51', '', '0', '0', '1', '104', '');
INSERT INTO `model` VALUES ('156', '新增', '20060001', '155', 'mdiy:tag:save', '2017-09-04 14:28:41', '', '0', '0', '0', '104,155', '');
INSERT INTO `model` VALUES ('157', '查看', '20060002', '155', 'mdiy:tag:view', '2018-06-20 17:53:51', '', '0', '0', '0', '104,155', '');
INSERT INTO `model` VALUES ('158', '修改', '20060003', '155', 'mdiy:tag:update', '2018-06-20 17:54:43', null, '0', '0', '0', '104,155', '');
INSERT INTO `model` VALUES ('159', '删除', '20060004', '155', 'mdiy:tag:del', '2018-06-20 17:55:26', null, '0', '0', '0', '104,155', '');
INSERT INTO `model` VALUES ('160', '新增SQL', '20060005', '155', 'mdiy:tagSql:save', '2017-09-04 14:28:41', '', '0', '0', '0', '104,155', '');
INSERT INTO `model` VALUES ('161', '查看SQL', '20060006', '155', 'mdiy:tagSql:view', '2018-06-20 17:53:51', '', '0', '0', '0', '104,155', '');
INSERT INTO `model` VALUES ('162', '修改SQL', '20060007', '155', 'mdiy:tagSql:update', '2018-06-20 17:54:43', null, '0', '0', '0', '104,155', '');
INSERT INTO `model` VALUES ('163', '删除SQL', '20060008', '155', 'mdiy:tagSql:del', '2018-06-20 17:55:26', null, '0', '0', '0', '104,155', '');
-- ----------------------------
-- Table structure for people
-- Table structure for `people`
-- ----------------------------
DROP TABLE IF EXISTS `people`;
CREATE TABLE `people` (
@ -963,7 +1057,7 @@ CREATE TABLE `people` (
-- ----------------------------
-- ----------------------------
-- Table structure for people_user
-- Table structure for `people_user`
-- ----------------------------
DROP TABLE IF EXISTS `people_user`;
CREATE TABLE `people_user` (
@ -988,67 +1082,8 @@ CREATE TABLE `people_user` (
-- Records of people_user
-- ----------------------------
DROP TABLE IF EXISTS `file`;
CREATE TABLE `file` (
`id` int(11) NOT NULL AUTO_INCREMENT COMMENT '文件编号',
`category_id` int(11) DEFAULT NULL COMMENT '文件分类编号',
`app_id` int(11) DEFAULT NULL COMMENT 'APP编号',
`file_name` varchar(200) DEFAULT NULL COMMENT '文件名称',
`file_url` varchar(500) DEFAULT NULL COMMENT '文件链接',
`file_size` int(11) DEFAULT NULL COMMENT '文件大小',
`file_json` varchar(500) DEFAULT NULL COMMENT '文件详情Json数据',
`file_type` varchar(50) DEFAULT NULL COMMENT '文件类型：图片、音频、视频等',
`is_child` varchar(50) DEFAULT NULL COMMENT '子业务',
`update_date` datetime DEFAULT NULL COMMENT '更新时间',
`update_by` int(11) DEFAULT NULL COMMENT '更新者',
`create_by` int(11) DEFAULT NULL COMMENT '创建者',
`create_date` datetime DEFAULT NULL COMMENT '创建时间',
`del` int(1) DEFAULT NULL COMMENT '删除标记',
PRIMARY KEY (`id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='基础文件表';
DROP TABLE IF EXISTS `mdiy_tag`;
CREATE TABLE `mdiy_tag` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`tag_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '标签名称',
`tag_type` int(1) DEFAULT NULL COMMENT '标签类型',
`tag_description` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '描述',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 14 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '标签' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of mdiy_tag
-- ----------------------------
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, '文章下一篇');
INSERT INTO `mdiy_tag` VALUES (12, 'prclist', 3, '商品列表');
INSERT INTO `mdiy_tag` VALUES (13, 'goods', 3, '商品详情');
-- ----------------------------
-- 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 CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '自定义sql支持ftl写法',
`sort` int(11) DEFAULT NULL COMMENT '排序升序',
PRIMARY KEY (`id`) USING BTREE,
INDEX `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 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '标签对应多个sql语句' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of mdiy_tag_sql
-- ----------------------------
-- ----------------------------
-- Table structure for role
-- Table structure for `role`
-- ----------------------------
DROP TABLE IF EXISTS `role`;
CREATE TABLE `role` (
@ -1068,7 +1103,7 @@ CREATE TABLE `role` (
INSERT INTO `role` VALUES ('48', 'msopen', '50', '1');
-- ----------------------------
-- Table structure for role_model
-- Table structure for `role_model`
-- ----------------------------
DROP TABLE IF EXISTS `role_model`;
CREATE TABLE `role_model` (

2
src/main/java/net/mingsoft/cms/action/ColumnAction.java
Unescape View File

@ -125,7 +125,7 @@ public class ColumnAction extends BaseAction{
*/
private void columnPath(HttpServletRequest request,ColumnEntity column){
StringBuffer columnPath = new StringBuffer();
String file = BasicUtil.getRealPath("")+ParserUtil.HTML+File.separator+ column.getAppId();
String file = BasicUtil.getRealPath("","")+ParserUtil.HTML+File.separator+ column.getAppId();
String delFile = "";
//修改栏目路径时，删除已存在的文件夹
column = (ColumnEntity) columnBiz.getEntity(column.getCategoryId());

266
src/main/java/net/mingsoft/cms/action/web/SearchAction.java
Unescape View File

@ -19,8 +19,8 @@ The MIT License (MIT) * Copyright (c) 2016 铭飞科技(mingsoft.net)
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package net.mingsoft.cms.action.web;
package net.mingsoft.cms.action.web;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
@ -56,17 +56,17 @@ import freemarker.template.MalformedTemplateNameException;
import freemarker.template.TemplateNotFoundException;
import net.mingsoft.base.constant.Const;
import net.mingsoft.basic.util.BasicUtil;
import net.mingsoft.mdiy.util.ParserUtil;
import net.mingsoft.mdiy.util.ParserUtil;
/**
* 根据搜索结果动态解析模版内容
* @author 铭飞开源团队-Administrator
* @date 2018年12月18日
*/
@Controller(value = "webSearchAction")
@RequestMapping("/cms")
public class SearchAction extends BaseAction {
*/
@Controller(value = "webSearchAction")
@RequestMapping("/cms")
public class SearchAction extends BaseAction {
/**
* 搜索标签;
*/
@ -76,24 +76,24 @@ public class SearchAction extends BaseAction {
* 搜索的标题;
*/
public static final String BASIC_TITLE = "basic_title";
/**
* 注入文章业务层
*/
@Autowired
private IArticleBiz articleBiz;
/**
* 注入搜索业务层
*/
@Autowired
private ISearchBiz searchBiz;
/**
* 注入栏目业务层
*/
@Autowired
private IColumnBiz columnBiz;
/**
* 注入文章业务层
*/
@Autowired
private IArticleBiz articleBiz;
/**
* 注入搜索业务层
*/
@Autowired
private ISearchBiz searchBiz;
/**
* 注入栏目业务层
*/
@Autowired
private IColumnBiz columnBiz;
/**
* 实现前端页面的文章搜索
*
@ -114,7 +114,7 @@ public class SearchAction extends BaseAction {
if (ObjectUtil.isNull(search)) {
this.outJson(response, false);
}
Map map = BasicUtil.assemblyRequestMap();
Map<String, Object> map = BasicUtil.assemblyRequestMap();
// 读取请求字段
Map<String, String[]> field = request.getParameterMap();
Map<String, String> basicField = getMapByProperties(net.mingsoft.mdiy.constant.Const.BASIC_FIELD);
@ -158,15 +158,17 @@ public class SearchAction extends BaseAction {
map.put(ParserUtil.TOTAL, PageUtil.totalPage(count, size));
//设置页面显示数量
map.put(ParserUtil.RCOUNT, size);
map.put(ParserUtil.SIZE, size);
//设置列表当前页
map.put(ParserUtil.PAGE_NO, BasicUtil.getInt(ParserUtil.PAGE_NO,1));
map.put(ParserUtil.URL, BasicUtil.getUrl());
Map searchMap = new HashMap<>();
searchMap.put(BASIC_TITLE, BasicUtil.getString(BASIC_TITLE));
searchMap.put(ParserUtil.PAGE_NO, BasicUtil.getInt(ParserUtil.PAGE_NO,1));
map.put(SEARCH, searchMap);
//动态解析
map.put(ParserUtil.IS_DO,true);
map.put(ParserUtil.IS_DO,false);
//设置动态请求的模块路径
map.put(ParserUtil.MODEL_NAME, "mcms");
//解析后的内容
@ -184,107 +186,107 @@ public class SearchAction extends BaseAction {
e.printStackTrace();
}
this.outString(response, content);
}
/**
* 动态组织查询where条件 获取查询条件的Map key:字段名 value:List 字段的各种判断值 list[0]:是否为自定义字段
* list[1]:是否为整形 list[2]:是否是等值查询 list[3]:字段的值
*
* @param articleField
* 文章字段
* @param diyFieldName
* 动态字段
* @param fields
* 模型对应的字段类型
* @return
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
private Map<String, List> searchMap(Map<String, Object> articleField, Map<String, String> diyFieldName,
List fields) {
Map<String, List> map = new HashMap<String, List>();
// 遍历文章中的字段
for (Iterator iter = articleField.keySet().iterator(); iter.hasNext();) {
String key = iter.next().toString();
String fieldValue = articleField.get(key).toString();
List list = new ArrayList();
List listValue = new ArrayList();
// 是否为自定义字段
list.add(false);
// 是否是数字类型，true:不是
list.add(true);
// 是否是模糊查询3
list.add(true);
// 字段值
listValue.add(articleField.get(key));
list.add(listValue);
map.put(key, list);
}
// 遍历字段自定义字段
// for (Iterator iter = diyFieldName.keySet().iterator(); iter.hasNext();) {
// String key = iter.next().toString();
// String fieldValue = diyFieldName.get(key);
// // 获取字段实体
// ContentModelFieldEntity field = this.get(key, fields);
// if (field != null) {
// List list = new ArrayList();
// // 是否为自定义字段0
// list.add(0, true);
// List listValue = new ArrayList();
// // 字段的值
// if (field.getFieldType() == IContentModelFieldBiz.INT || field.getFieldType() == IContentModelFieldBiz.FLOAT) {
// // 判断是否为区间查询
//
// if (diyFieldName.get(key).toString().indexOf("-") > 0) {
// String[] values = fieldValue.toString().split("-");
// // 是否是数字类型，false:是
// list.add(false);
// // 是否是区间比较 false:是
// list.add(false);
// // 字段值1
// listValue.add(values[0]);
// listValue.add(values[1]);
// } else {
// // 是否是数字类型，false:是2
// list.add(false);
// // 是否是区间比较 true:不是3
// list.add(true);
// // 字段值 1
// listValue.add(fieldValue);
// }
// } else {
// // 是否是数字类型，true:不是2
// list.add(true);
// list.add(false);
// // 字段值 1
// listValue.add(fieldValue);
// }
// list.add(listValue);
// map.put(key, list);
// }
// }
return map;
}
/**
* 根据字段名称获取字段类型
*
* @param columnName
* 字段名称
* @return 字段实体
*/
private ContentModelFieldEntity get(String columnName, List<ContentModelFieldEntity> fields) {
if (fields == null) {
return null;
}
for (ContentModelFieldEntity field : fields) {
if (field.getFieldFieldName().equals(columnName)) {
return field;
}
}
return null;
}
}
/**
* 动态组织查询where条件 获取查询条件的Map key:字段名 value:List 字段的各种判断值 list[0]:是否为自定义字段
* list[1]:是否为整形 list[2]:是否是等值查询 list[3]:字段的值
*
* @param articleField
* 文章字段
* @param diyFieldName
* 动态字段
* @param fields
* 模型对应的字段类型
* @return
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
private Map<String, List> searchMap(Map<String, Object> articleField, Map<String, String> diyFieldName,
List fields) {
Map<String, List> map = new HashMap<String, List>();
// 遍历文章中的字段
for (Iterator iter = articleField.keySet().iterator(); iter.hasNext();) {
String key = iter.next().toString();
String fieldValue = articleField.get(key).toString();
List list = new ArrayList();
List listValue = new ArrayList();
// 是否为自定义字段
list.add(false);
// 是否是数字类型，true:不是
list.add(true);
// 是否是模糊查询3
list.add(true);
// 字段值
listValue.add(articleField.get(key));
list.add(listValue);
map.put(key, list);
}
// 遍历字段自定义字段
// for (Iterator iter = diyFieldName.keySet().iterator(); iter.hasNext();) {
// String key = iter.next().toString();
// String fieldValue = diyFieldName.get(key);
// // 获取字段实体
// ContentModelFieldEntity field = this.get(key, fields);
// if (field != null) {
// List list = new ArrayList();
// // 是否为自定义字段0
// list.add(0, true);
// List listValue = new ArrayList();
// // 字段的值
// if (field.getFieldType() == IContentModelFieldBiz.INT || field.getFieldType() == IContentModelFieldBiz.FLOAT) {
// // 判断是否为区间查询
//
// if (diyFieldName.get(key).toString().indexOf("-") > 0) {
// String[] values = fieldValue.toString().split("-");
// // 是否是数字类型，false:是
// list.add(false);
// // 是否是区间比较 false:是
// list.add(false);
// // 字段值1
// listValue.add(values[0]);
// listValue.add(values[1]);
// } else {
// // 是否是数字类型，false:是2
// list.add(false);
// // 是否是区间比较 true:不是3
// list.add(true);
// // 字段值 1
// listValue.add(fieldValue);
// }
// } else {
// // 是否是数字类型，true:不是2
// list.add(true);
// list.add(false);
// // 字段值 1
// listValue.add(fieldValue);
// }
// list.add(listValue);
// map.put(key, list);
// }
// }
return map;
}
/**
* 根据字段名称获取字段类型
*
* @param columnName
* 字段名称
* @return 字段实体
*/
private ContentModelFieldEntity get(String columnName, List<ContentModelFieldEntity> fields) {
if (fields == null) {
return null;
}
for (ContentModelFieldEntity field : fields) {
if (field.getFieldFieldName().equals(columnName)) {
return field;
}
}
return null;
}
}

12
src/main/java/net/mingsoft/cms/util/CmsParserUtil.java
Unescape View File

@ -23,6 +23,7 @@ import net.mingsoft.base.constant.Const;
import net.mingsoft.basic.entity.ColumnEntity;
import net.mingsoft.basic.util.BasicUtil;
import net.mingsoft.basic.util.SpringUtil;
import net.mingsoft.basic.util.StringUtil;
import net.mingsoft.cms.bean.ColumnArticleIdBean;
import net.mingsoft.cms.constant.e.ColumnTypeEnum;
import net.mingsoft.mdiy.biz.IContentModelBiz;
@ -42,13 +43,18 @@ public class CmsParserUtil extends ParserUtil {
* @throws IOException
*/
public static void generate(String templatePath, String targetPath) throws IOException {
Map map = new HashMap();
Map<String, Object> map = new HashMap<String, Object>();
map.put(IS_DO, false);
String content = CmsParserUtil.generate(templatePath, map, false);
boolean mobileStyle = false;
//判断是否有移动端
if (!StringUtil.isBlank(BasicUtil.getApp().getAppMobileStyle())) {
mobileStyle = true;
}
String content = CmsParserUtil.generate(templatePath, map, mobileStyle);
FileUtil.writeString(content, ParserUtil.buildHtmlPath(targetPath), Const.UTF8);
// 生成移动页面
if (ObjectUtil.isNotNull(BasicUtil.getApp().getAppMobileStyle())) {
if (mobileStyle) {
// 手机端m
map.put(ParserUtil.MOBILE, BasicUtil.getApp().getAppMobileStyle());
content = CmsParserUtil.generate(templatePath, map, true);

2
src/main/resources/application-dev.yml
Unescape View File

@ -1,6 +1,6 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/tag?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
url: jdbc:mysql://localhost:3306/db-mcms?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true
username: root
password: root
filters: wall,mergeStat

3
src/main/resources/application-prod.yml
Unescape View File

@ -1,6 +1,7 @@
spring:
datasource:
url: jdbc:mysql://localhost:3306/mcms?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://localhost:1433;DatabaseName=db-mcms
username: root
password: root
filters: wall,mergeStat

12
src/main/resources/application-test.yml
Unescape View File

@ -1,11 +1 @@
server:
port: 4000
servlet.context-path: /
spring:
datasource:
url: jdbc:mysql://172.17.0.4:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false
username: root
password: root
filters: wall,mergeStat
type: com.alibaba.druid.pool.DruidDataSource
mcms4.7.0 Oracle数据库暂不支持

11
src/main/webapp/templets/1/default/m/case-list.htm
Unescape View File

@ -13,38 +13,29 @@
<div class="am-gallery-item ms-case-div">
<a href='[field.source/]'><img class="ms-case-list-img" src="{ms:global.host/}[field.litpic/]" alt="[field.title/]"/></a>
</div>
<span class="am-hide ms-cur-{ms:page.cur/}-[field.index/]">{ms:page.next/}</span>
</li>
{/ms:arclist}
</ul>
<!-- <div id="ul{ms:page.cur/}"></div> -->
</div>
<#include "m/footer.htm"/>
</body>
</html>
<script>
/*var time = 1;
var time = 1;
$(window).scroll(function() {　　
var scrollTop = $(this).scrollTop();　　
var scrollHeight = $(document).height();　
var windowHeight = $(this).height();　　
if(scrollTop + windowHeight == scrollHeight) {
var time2 = $(".ms-cur-" + time + "-1").text()
if(time == "{ms:page.total/}") {
return;
}
$("#ul" + time).load(time2 + " #ms-ui");
$("#am-active-1").append("<div id=\"ul" + (time + 1) + "\"></div>")
time++;
}else if(scrollTop + 56 + windowHeight == scrollHeight){
var time2 = $(".ms-cur-" + time + "-1").text()
if(time == "{ms:page.total/}") {
return;
}
$("#ul" + time).load(time2 + " #ms-ui");
$("#am-active-1").append("<div id=\"ul" + (time + 1) + "\"></div>")
time++;
}
});
*/
</script>

0
src/main/webapp/templets/1/default/index.htm → src/main/webapp/templets/1/default/m/indexa.htm
Unescape View File

36
src/main/webapp/templets/1/default/search.htm
Unescape View File

@ -8,7 +8,7 @@
<div class="ms-banner">
<img src="{ms:global.host/}/{ms:global.style/}/images/search.jpg">
</div>
<div class="ms-content">
<div class="ms-content" id="body">
<div class="ms-content-main-list" id="ms-content-search">
<div class="ms-content-main-div">
<div class="ms-content-main-div-prompt">您搜索的关键字
@ -20,17 +20,17 @@
<li>
<a href="{ms:global.url/}/[field.link/]">
[field.title/]
<span class="ms-content-main-li-time">[field.date?string("yyyy-mm-dd")/]</span>
<span class="ms-content-main-li-time">[field.date?string("yyyy-MM-dd")/]</span>
</a>
</li>
{/ms:arclist}
</ul>
</div>
<div class="ms-content-main-page">
<a class="ms-content-main-page-first" href="{ms:page.index/}">首页</a>
<a class="ms-content-main-page-upper" href="{ms:page.pre/}">上一页</a>
<a class="ms-content-main-page-next" href="{ms:page.next/}">下一页</a>
<a class="ms-content-main-page-last" href="{ms:page.last/}">末页</a>
<a href="jacascript::void(0)" @click="indexAndLast(1)">首页</a>
<a href="jacascript::void(0)" @click="search(false)">上一页</a>
<a href="jacascript::void(0)" @click="search(true)">下一页</a>
<a href="jacascript::void(0)" @click="indexAndLast({ms:page.total/})">尾页</a>
</div>
</div>
</div>
@ -38,6 +38,30 @@
</body>
</html>
<script>
new Vue({
el: "#body",
data: {
title: '',
list: [],
},
methods: {
search:function(flag){
var pageNo = {ms:search.pageNo/};
var total = {ms:page.total/};
if(flag){
pageNo = pageNo==total ? total : pageNo +1;
}else{
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.event.returnValue=false;
},
indexAndLast:function(pageNo){
window.location.href="{ms:global.host/}/cms/1/search.do?basic_title={ms:search.basic_title/}&pageNo="+pageNo;
window.event.returnValue=false;
},
},
})
if($('.ms-content-main-ul li').length <= 0) {
$('.ms-content-main-page').remove();
$('.ms-content-main-ul').before("<div class='ms-content-main-div-nothing'>没找到相关记录</div>")

Write Preview
Loading…
Cancel
Save