"git@git.gitsec.cn:baidan/nomad.git" did not exist on "556adad26a21f2ee40b76f83809c344bda2abcef"
Commit 08e2c58d authored by ms-dev's avatar ms-dev
Browse files

Merge remote-tracking branch 'origin/4.6.5'

Conflicts:
	doc/db-mcms-mysql-4.6.4.sql
	doc/db-mcms-oracle-4.6.4.sql
	doc/db-mcms-sqlserver-4.6.4.sql
parents f7f5b74f d1df0a4b
Showing with 266 additions and 298 deletions
+266 -298
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="mcms">
<wb-resource deploy-path="/WEB-INF/web.xml" source-path="/src/main/webapp/WEB-INF/web.xml"/>
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="ms-upgrader-1.0.4-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ms-upgrader/ms-upgrader">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/net/mingsoft/ms-mpeople/1.0.5/ms-mpeople-1.0.5.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/net/mingsoft/ms-mdiy/1.0.5/ms-mdiy-1.0.5.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/net/mingsoft/ms-basic/1.0.6/ms-basic-1.0.6.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/slf/?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<property name="java-output-path" value="/mcms/target/classes"/>
<property name="context-root" value="ms-mcms"/>
<property name="component.exclusion.patterns"/>
</wb-module>
</project-modules>
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="mcms">
<wb-resource deploy-path="/WEB-INF/web.xml" source-path="/src/main/webapp/WEB-INF/web.xml"/>
<wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
<wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/net/mingsoft/ms-mpeople/1.0.6/ms-mpeople-1.0.6.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/net/mingsoft/ms-mdiy/1.0.6/ms-mdiy-1.0.6.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/net/mingsoft/ms-basic/1.0.7/ms-basic-1.0.7.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/slf/?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<property name="java-output-path" value="/mcms/target/classes"/>
<property name="context-root" value="ms-mcms"/>
<property name="component.exclusion.patterns"/>
</wb-module>
</project-modules>
# 铭飞MCMS内容管理系统完整开源版J2EE代码
当前版本:4.6.4 <br/>
当前版本:4.6.5 <br/>
铭飞MS官网:http://ms.mingsoft.net<br/>
官网同时提供一键运行版本下载,请步移官网....<br/>
QQ交流群号:①231212174 ②221335098 <br/>
......
SET FOREIGN_KEY_CHECKS=0;
ALTER TABLE `basic_attention` DROP INDEX `ba_peopleid`;
ALTER TABLE `basic_attention` ADD INDEX `ba_people_id`(`ba_people_id`) USING BTREE;
#ALTER TABLE `basic_column` DROP INDEX `fk_basic_column_1`;
#ALTER TABLE `basic_column` DROP FOREIGN KEY `fk_basic_column`;
#ALTER TABLE `basic_column` DROP FOREIGN KEY `fk_basic_column_1`;
#ALTER TABLE `basic_column` ADD INDEX `fk_basic_column_cm_id`(`column_cm_id`) USING BTREE;
#ALTER TABLE `basic_column` ADD CONSTRAINT `fk_basic_column_category_id` FOREIGN KEY (`column_category_id`) REFERENCES `category` (`category_id`) ON DELETE RESTRICT ON UPDATE RESTRICT;
#ALTER TABLE `basic_column` ADD CONSTRAINT `fk_basic_column_cm_id` FOREIGN KEY (`column_cm_id`) REFERENCES `mdiy_content_model` (`cm_id`) ON DELETE SET NULL ON UPDATE NO ACTION;
ALTER TABLE `basic_log` ROW_FORMAT = Dynamic;
ALTER TABLE `category` DROP FOREIGN KEY `fk_category`;
ALTER TABLE `category` DROP FOREIGN KEY `fk_category_1`;
ALTER TABLE `category` ADD CONSTRAINT `fk_category_app_id` FOREIGN KEY (`category_appid`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `category` ADD CONSTRAINT `fk_category_category_id` FOREIGN KEY (`category_categoryid`) REFERENCES `category` (`category_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `manager_model_page` ROW_FORMAT = Dynamic;
ALTER TABLE `mdiy_content_mode_field` MODIFY COLUMN `create_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) AFTER `create_by`;
ALTER TABLE `mdiy_content_mode_field` MODIFY COLUMN `update_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) AFTER `update_by`;
ALTER TABLE `mdiy_content_model` MODIFY COLUMN `creaet_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) AFTER `create_by`;
ALTER TABLE `mdiy_content_model` MODIFY COLUMN `update_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) AFTER `update_by`;
ALTER TABLE `mdiy_dict` COLLATE = utf8_bin;
ALTER TABLE `mdiy_dict` MODIFY COLUMN `dict_value` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '数据值' AFTER `app_id`;
ALTER TABLE `mdiy_dict` MODIFY COLUMN `dict_label` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '标签名' AFTER `dict_value`;
ALTER TABLE `mdiy_dict` MODIFY COLUMN `dict_type` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '类型' AFTER `dict_label`;
ALTER TABLE `mdiy_dict` MODIFY COLUMN `dict_description` varchar(100) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '描述' AFTER `dict_type`;
ALTER TABLE `mdiy_dict` MODIFY COLUMN `dict_parent_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '0' COMMENT '父级编号' AFTER `dict_sort`;
ALTER TABLE `mdiy_dict` MODIFY COLUMN `dict_remarks` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '备注信息' AFTER `dict_parent_id`;
ALTER TABLE `mdiy_dict` ADD INDEX `dict_value`(`dict_value`) USING BTREE;
ALTER TABLE `mdiy_dict` ADD INDEX `dict_label`(`dict_label`) USING BTREE;
ALTER TABLE `mdiy_form` MODIFY COLUMN `create_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) AFTER `create_by`;
ALTER TABLE `mdiy_form` MODIFY COLUMN `update_date` datetime(0) NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP(0) AFTER `update_by`;
ALTER TABLE `people` MODIFY COLUMN `people_datetime` timestamp(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '注册时间' AFTER `people_password`;
ALTER TABLE `role` ADD INDEX `role_managerid`(`role_managerid`) USING BTREE;
ALTER TABLE `role` ADD INDEX `fk_role_app_id`(`app_id`) USING BTREE;
ALTER TABLE `role` ADD CONSTRAINT `fk_role_app_id` FOREIGN KEY (`app_id`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE RESTRICT;
ALTER TABLE `model` DROP FOREIGN KEY `model_ibfk_1`;
ALTER TABLE `model` ADD CONSTRAINT `fk_model_model_id` FOREIGN KEY (`model_modelid`) REFERENCES `model` (`model_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `mdiy_page` DROP FOREIGN KEY `fk_model_template_app_1`;
ALTER TABLE `mdiy_page` ADD CONSTRAINT `fk_page_app_id` FOREIGN KEY (`page_app_id`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `system_skin` ROW_FORMAT = Dynamic;
ALTER TABLE `system_skin` ADD INDEX `ss_app_id`(`ss_app_id`) USING BTREE;
ALTER TABLE `system_skin` ADD INDEX `ss_category_id`(`ss_category_id`) USING BTREE;
ALTER TABLE `system_skin` DROP FOREIGN KEY `fk_system_skin_app_1`;
ALTER TABLE `system_skin` ADD CONSTRAINT `fk_system_skin_app_id` FOREIGN KEY (`ss_app_id`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `system_skin` DROP INDEX `fk_system_skin_app_1`;
ALTER TABLE `mdiy_form` MODIFY COLUMN `form_table_name` varchar(30) NOT NULL COMMENT '自定义表单表名' AFTER `form_tips_name`;
ALTER TABLE `mdiy_form_field` MODIFY COLUMN `ff_fieldname` varchar(30) NULL DEFAULT NULL COMMENT '字段名称' AFTER `ff_tipsname`;
ALTER TABLE `basic_column` DROP FOREIGN KEY `fk_basic_column`;
ALTER TABLE `basic_column` ADD CONSTRAINT `fk_column_category_id` FOREIGN KEY (`column_category_id`) REFERENCES `category` (`category_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `basic` DROP FOREIGN KEY `fk_basic_app_1`;
ALTER TABLE `basic` ADD CONSTRAINT `fk_basic_app_id` FOREIGN KEY (`basic_appid`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `basic` DROP FOREIGN KEY `fk_basic_category_1`;
ALTER TABLE `basic` ADD CONSTRAINT `fk_basic_category_id` FOREIGN KEY (`basic_categoryid`) REFERENCES `category` (`category_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `basic_column` ADD CONSTRAINT `fk_basic_column_id` FOREIGN KEY (`column_cm_id`) REFERENCES `mdiy_content_model` (`cm_id`) ON DELETE SET NULL ON UPDATE NO ACTION;
ALTER TABLE `basic` DROP INDEX `basic_title`;
ALTER TABLE `basic` DROP FOREIGN KEY `fk_basic_category_id`;
ALTER TABLE `basic` ADD CONSTRAINT `fk_basic_categoryid` FOREIGN KEY (`basic_categoryid`) REFERENCES `category` (`category_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `basic` ADD INDEX `basic_title`(`basic_title`) USING BTREE;
ALTER TABLE `basic_column` DROP FOREIGN KEY `fk_basic_column_id`;
ALTER TABLE `basic_column` DROP FOREIGN KEY `fk_column_category_id`;
ALTER TABLE `basic_column` ADD CONSTRAINT `fk_basic_column_category_id` FOREIGN KEY (`column_category_id`) REFERENCES `category` (`category_id`) ON DELETE RESTRICT ON UPDATE RESTRICT;
ALTER TABLE `basic_column` ADD CONSTRAINT `fk_basic_column_cm_id` FOREIGN KEY (`column_cm_id`) REFERENCES `mdiy_content_model` (`cm_id`) ON DELETE SET NULL ON UPDATE NO ACTION;
ALTER TABLE `basic_column` ADD INDEX `fk_basic_column_cm_id`(`column_cm_id`) USING BTREE;
ALTER TABLE `role` DROP FOREIGN KEY `fk_role_app_id`;
ALTER TABLE `role` ADD CONSTRAINT `fk_role_app_id` FOREIGN KEY (`app_id`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE RESTRICT;
ALTER TABLE `basic_column` ADD INDEX `fk_basic_column_id`(`column_cm_id`) USING BTREE;
ALTER TABLE `basic_column` DROP INDEX `fk_basic_column_1`;
ALTER TABLE `basic_column` DROP INDEX `fk_basic_column_cm_id`;
ALTER TABLE `basic_column` DROP FOREIGN KEY `fk_basic_column_1`;
ALTER TABLE `basic_column` DROP FOREIGN KEY `fk_basic_column_category_id`;
ALTER TABLE `basic_column` DROP FOREIGN KEY `fk_basic_column_cm_id`;
ALTER TABLE `basic_column` ADD CONSTRAINT `fk_column_category_id` FOREIGN KEY (`column_category_id`) REFERENCES `category` (`category_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
ALTER TABLE `basic_column` ADD CONSTRAINT `fk_basic_column_id` FOREIGN KEY (`column_cm_id`) REFERENCES `mdiy_content_model` (`cm_id`) ON DELETE SET NULL ON UPDATE NO ACTION;
ALTER TABLE `app` ADD COLUMN `app_login_page` varchar(255) NULL COMMENT '自定义登录界面' AFTER `app_mobile_state`;
DROP TABLE `system_skin`;
UPDATE `model` SET `model_code` = '20050004' WHERE `model_id` = 150 and `model_modelid` = 109;
ALTER TABLE `basic` ADD COLUMN `basic_display` int(1) NULL DEFAULT 0 COMMENT '显示属性 0显示1不显示' AFTER `basic_type`;
ALTER TABLE `a`.`model` ADD CONSTRAINT `fk_model_id` FOREIGN KEY (`model_modelid`) REFERENCES `a`.`model` (`model_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
SET FOREIGN_KEY_CHECKS=0;
-- ----------------------------
......@@ -30,7 +29,7 @@ CREATE TABLE `app` (
-- ----------------------------
-- Records of app
-- ----------------------------
INSERT INTO `app` VALUES ('1', 'MCMS-OPEN', 'http://localhost:8080/ms-mcms\r\n', '', '', '', 'default', '50', '', null, 'm', null, '', '0', '0', null);
INSERT INTO `app` VALUES ('1', 'MCMS-OPEN', 'http://localhost:9090/ms-mcms', '', '', '', 'default', '50', '', null, 'm', null, '', '0', '0', null);
-- ----------------------------
-- Table structure for basic
......@@ -657,7 +656,7 @@ CREATE TABLE `mdiy_dict` (
`dict_value` varchar(100) COLLATE utf8_bin NOT NULL COMMENT '数据值',
`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 NOT NULL COMMENT '描述',
`dict_description` varchar(100) 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 '备注信息',
......@@ -671,11 +670,15 @@ CREATE TABLE `mdiy_dict` (
KEY `dict_value` (`dict_value`) USING BTREE,
KEY `dict_label` (`dict_label`) USING BTREE,
CONSTRAINT `fk_mdiy_dict` FOREIGN KEY (`app_id`) REFERENCES `app` (`app_id`) ON DELETE CASCADE ON UPDATE NO ACTION
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC COMMENT='字典表';
) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_bin ROW_FORMAT=DYNAMIC COMMENT='字典表';
-- ----------------------------
-- Records of mdiy_dict
-- ----------------------------
INSERT INTO `mdiy_dict` VALUES ('1', '1', 'f', '幻灯', '文章属性', null, '3', '0', null, '0', null, '0', null, '0');
INSERT INTO `mdiy_dict` VALUES ('2', '1', 'p', '图片', '文章属性', null, '1', '0', null, '0', null, '0', null, '0');
INSERT INTO `mdiy_dict` VALUES ('3', '1', 'c', '推荐', '文章属性', null, '4', '0', null, '0', null, '0', null, '0');
INSERT INTO `mdiy_dict` VALUES ('4', '1', 'h', '头条', '文章属性', null, '2', '0', null, '0', null, '0', null, '0');
-- ----------------------------
-- Table structure for mdiy_form
......@@ -723,7 +726,7 @@ CREATE TABLE `mdiy_form_field` (
-- ----------------------------
INSERT INTO `mdiy_form_field` VALUES ('1', '姓名', 'NAME', '1', '', '1', '0', '1');
INSERT INTO `mdiy_form_field` VALUES ('2', '手机号', 'PHONE', '1', '', '1', '0', '1');
INSERT INTO `mdiy_form_field` VALUES ('3', '留言内容', 'CONTENT', '1', '', '1', '0', '1');
INSERT INTO `mdiy_form_field` VALUES ('3', '留言内容', 'CONTENT', '3', '', '1', '0', '1');
-- ----------------------------
-- Table structure for mdiy_message_50
......@@ -849,15 +852,15 @@ CREATE TABLE `model` (
-- ----------------------------
-- Records of model
-- ----------------------------
INSERT INTO `model` VALUES ('1', '内容管理', '02000000', null, '', '2014-08-01 16:19:50', '&#xe77a;', '0', '0', '1', null);
INSERT INTO `model` VALUES ('1', '内容管理', '02000000', null, '', '2014-08-01 16:19:50', '&#xe77a;', '0', '5', '1', null);
INSERT INTO `model` VALUES ('4', '管理员管理', '01020000', '23', 'basic/manager/index.do', '2014-08-03 09:15:02', '', '0', '0', '1', '23');
INSERT INTO `model` VALUES ('5', '角色管理', '01010000', '23', 'basic/role/index.do', '2014-08-03 09:15:14', '', '0', '0', '1', '23');
INSERT INTO `model` VALUES ('7', '栏目管理', '02990000', '1', 'cms/column/index.do', '2014-08-03 09:16:29', '', '0', '0', '1', '1');
INSERT INTO `model` VALUES ('8', '文章管理', '02980000', '1', 'cms/article/index.do', '2014-08-03 09:17:10', '', '0', '0', '1', '1');
INSERT INTO `model` VALUES ('22', '会员中心', '07000000', null, '', '2014-09-08 08:11:28', '&#xe6b6;', '0', '0', '1', null);
INSERT INTO `model` VALUES ('23', '权限管理', '01000000', null, '', '2014-09-08 08:12:22', '&#xe950;', '0', '0', '1', null);
INSERT INTO `model` VALUES ('80', '静态化', '02020000', '1', 'cms/generate/index.do', '2014-12-18 11:37:15', '', '0', '0', '1', '1');
INSERT INTO `model` VALUES ('84', '系统管理', '12000000', null, '', '2014-12-18 18:30:24', '&#xe71f;', '0', '0', '1', null);
INSERT INTO `model` VALUES ('7', '栏目管理', '02990000', '1', 'cms/column/index.do', '2014-08-03 09:16:29', '', '0', '2', '1', '1');
INSERT INTO `model` VALUES ('8', '文章管理', '02980000', '1', 'cms/article/index.do', '2014-08-03 09:17:10', '', '0', '3', '1', '1');
INSERT INTO `model` VALUES ('22', '会员中心', '07000000', null, '', '2014-09-08 08:11:28', '&#xe6b6;', '0', '4', '1', null);
INSERT INTO `model` VALUES ('23', '权限管理', '01000000', null, '', '2014-09-08 08:12:22', '&#xe950;', '0', '2', '1', null);
INSERT INTO `model` VALUES ('80', '静态化', '02020000', '1', 'cms/generate/index.do', '2014-12-18 11:37:15', '', '0', '1', '1', '1');
INSERT INTO `model` VALUES ('84', '系统管理', '12000000', null, '', '2014-12-18 18:30:24', '&#xe71f;', '0', '1', '1', null);
INSERT INTO `model` VALUES ('86', '应用设置', '12010000', '84', 'app/-1/edit.do', '2014-12-18 18:31:59', '', '0', '0', '1', '84');
INSERT INTO `model` VALUES ('88', '用户管理', '07020100', '22', 'people/peopleUser/index.do ', '2015-09-18 11:44:54', '', '0', '0', '1', '22');
INSERT INTO `model` VALUES ('91', '模板管理', '12020000', '84', 'template/queryTemplateSkin.do', null, '', '0', '0', '1', '84');
......@@ -871,7 +874,7 @@ INSERT INTO `model` VALUES ('98', '查看', '01010001', '5', 'role:view', '2017-
INSERT INTO `model` VALUES ('99', '查看', '01030001', '96', 'model:view', '2017-09-04 11:10:43', '', '0', '0', '0', '23,96');
INSERT INTO `model` VALUES ('100', '查看', '12020001', '91', 'template:view', '2017-09-04 11:12:02', '', '0', '0', '0', '84,91');
INSERT INTO `model` VALUES ('101', '查看', '12010001', '86', 'app:view', '2017-09-04 11:12:46', '', '0', '0', '0', '84,86');
INSERT INTO `model` VALUES ('104', '自定义管理', '20000000', null, '', '2017-09-04 11:17:41', '&#xe6dd', '0', '0', '1', null);
INSERT INTO `model` VALUES ('104', '自定义管理', '20000000', null, '', '2017-09-04 11:17:41', '&#xe6dd', '0', '3', '1', null);
INSERT INTO `model` VALUES ('105', '自定义页面', '20010000', '104', 'mdiy/page/index.do', '2017-09-04 11:18:51', '', '0', '0', '1', '104');
INSERT INTO `model` VALUES ('106', '自定义表单', '20020000', '104', 'mdiy/form/index.do', '2017-09-04 11:19:15', '', '0', '0', '1', '104');
INSERT INTO `model` VALUES ('107', '自定义模型', '20030000', '104', 'mdiy/contentModel/index.do', '2017-09-04 11:20:15', '', '0', '0', '1', '104');
......
......@@ -358,7 +358,7 @@ INSERT INTO "BASIC_COLUMN" VALUES ('66', '精选案例展示', '新颖的设计
INSERT INTO "BASIC_COLUMN" VALUES ('67', '精选案例展示', '新颖的设计方案,大胆的革新思想,灵活的运用最新技术,是品网视觉的特点,我们只做有灵魂的设计', '1', 'case-show.htm', 'case-list.htm', '/61/67', NULL);
INSERT INTO "BASIC_COLUMN" VALUES ('68', NULL, '您可以通过以下新闻与公司动态进一步了解我们。我们所签约的客户,无论他们的项目是大或者是小,我们都将提供100%的服务', '1', 'news-show.htm', 'news-list.htm', '/59/68', NULL);
INSERT INTO "BASIC_COLUMN" VALUES ('69', NULL, NULL, '1', 'news-show.htm', 'news-list.htm', '/59/69', NULL);
INSERT INTO "BASIC_COLUMN" VALUES ('70', NULL, '新闻中心', '1', 'news-show.htm', 'news-list.htm', '/59/70', NULL);
INSERT INTO "BASIC_COLUMN" VALUES ('70', NULL, '新闻中心', '1', 'news-list.htm', 'news-show.htm', '/59/70', NULL);
INSERT INTO "BASIC_COLUMN" VALUES ('83', NULL, '您可以通过以下新闻与公司动态进一步了解我们。我们所签约的客户,无论他们的项目是大或者是小,我们都将提供100%的服务', '1', 'news-show.htm', 'news-list.htm', '/62/83', NULL);
INSERT INTO "BASIC_COLUMN" VALUES ('84', '专业提供网站模板,网页模板,教程培训,程序插件,网站素材等建站资源。我们致力于打造一个优秀的建站资源共享学习平台!', '专业提供网站模板,网页模板,教程培训,程序插件,网站素材等建站资源。设计者:如果您是模板设计师,插件制作者。我们致力于打造一个优秀的建站资源共享学习平台!您可以在这里放心出售您的模板和插件,我们提供版权保护。购买者:购买本站资源,我们提供“三重保障”(担保交易+人工介入+售后服务),保障购买者的合法权益。织梦猫已经上路,我们将为此不懈努', '1', 'news-show.htm', 'news-list.htm', '/62/84', NULL);
INSERT INTO "BASIC_COLUMN" VALUES ('87', NULL, NULL, '2', 'solution.htm', 'about.htm', '/87', NULL);
......@@ -926,14 +926,14 @@ INSERT INTO "MDIY_CONTENT_MODE_FIELD" VALUES ('12', '描述5', 'descripFi', '2',
-- ----------------------------
-- Table structure for MDIY_DICT
-- ----------------------------
DROP TABLE "MDIY_DICT";
DROP TABLE "MDIY_DICT";
CREATE TABLE "MDIY_DICT" (
"DICT_ID" NUMBER(11) NOT NULL ,
"APP_ID" NUMBER(11) ,
"DICT_VALUE" NVARCHAR2(100) NOT NULL ,
"DICT_LABEL" NVARCHAR2(100) NOT NULL ,
"DICT_TYPE" NVARCHAR2(100) NOT NULL ,
"DICT_DESCRIPTION" NVARCHAR2(100) NOT NULL ,
"DICT_DESCRIPTION" NVARCHAR2(100) ,
"DICT_SORT" NUMBER(11) DEFAULT 0 NOT NULL ,
"DICT_PARENT_ID" NVARCHAR2(64) ,
"DICT_REMARKS" NVARCHAR2(255) ,
......@@ -971,6 +971,12 @@ COMMENT ON COLUMN "MDIY_DICT"."UPDATE_DATE" IS '更新时间';
COMMENT ON COLUMN "MDIY_DICT"."DEL" IS '删除标记';
COMMENT ON TABLE "MDIY_DICT" IS '字典表';
INSERT INTO "MDIY_DICT" VALUES ('1', '1', 'p', '图片', '文章属性', '图片', '1', NULL, NULL, '0', NULL, '0', NULL, '0');
INSERT INTO "MDIY_DICT" VALUES ('2', '1', 'h', '头条', '文章属性', '头条', '2', NULL, NULL, '0', NULL, '0', NULL, '0');
INSERT INTO "MDIY_DICT" VALUES ('3', '1', 'f', '幻灯', '文章属性', '幻灯', '3', NULL, NULL, '0', NULL, '0', NULL, '0');
INSERT INTO "MDIY_DICT" VALUES ('4', '1', 'c', '推荐', '文章属性', '推荐', '4', NULL, NULL, '0', NULL, '0', NULL, '0');
-- ----------------------------
-- Table structure for MDIY_FORM
-- ----------------------------
......@@ -1002,6 +1008,8 @@ COMMENT ON COLUMN "MDIY_FORM"."FORM_TIPS_NAME" IS '自定义表单提示文字';
COMMENT ON COLUMN "MDIY_FORM"."FORM_APP_ID" IS '自定义表单关联的应用编号';
COMMENT ON TABLE "MDIY_FORM" IS '自定义表单表';
INSERT INTO MDIY_FORM VALUES ( '1', '留言', 'mdiy_message_50', '1', '0', TO_DATE('2018-06-29 17:37:13', 'SYYYY-MM-DD HH24:MI:SS'), '0', TO_DATE('2018-06-29 17:37:13', 'SYYYY-MM-DD HH24:MI:SS'));
-- ----------------------------
-- Table structure for MDIY_FORM_FIELD
-- ----------------------------
......@@ -1037,6 +1045,10 @@ COMMENT ON COLUMN "MDIY_FORM_FIELD"."FF_SORT" IS '自定义表单的排序';
COMMENT ON COLUMN "MDIY_FORM_FIELD"."FF_FORMID" IS '字段管理的表单id';
COMMENT ON TABLE "MDIY_FORM_FIELD" IS '自定义表单字段表';
INSERT INTO MDIY_FORM_FIELD VALUES ('1', '姓名', 'NAME', '1', '', '1', '0', '1');
INSERT INTO MDIY_FORM_FIELD VALUES ('2', '手机号', 'PHONE', '1', '', '1', '0', '1');
INSERT INTO MDIY_FORM_FIELD VALUES ('3', '留言内容', 'CONTENT', '1', '', '1', '0', '1');
-- ----------------------------
-- Table structure for MDIY_MOOC_50
-- ----------------------------
......@@ -1514,115 +1526,142 @@ INSERT INTO "ROLE_MODEL" VALUES ('149', '48');
INSERT INTO "ROLE_MODEL" VALUES ('150', '48');
INSERT INTO "ROLE_MODEL" VALUES ('151', '48');
-- ----------------------------
-- Table structure for MDIY_MESSAGE_50
-- ----------------------------
CREATE TABLE MDIY_MESSAGE_50 (
"ID" NUMBER(11) NOT NULL,
"DATE" DATE,
"FROMID" NUMBER(11),
"NAME" NVARCHAR2(100),
"PHONE" NVARCHAR2(100),
"CONTENT" NVARCHAR2(100)
)
TABLESPACE "USERS"
LOGGING
NOCOMPRESS
PCTFREE 10
INITRANS 1
STORAGE (
INITIAL 65536
NEXT 1048576
MINEXTENTS 1
MAXEXTENTS 2147483645
BUFFER_POOL DEFAULT
)
PARALLEL 1
NOCACHE
DISABLE ROW MOVEMENT
;
-- ----------------------------
-- Sequence structure for SEQ_APP_ID
-- ----------------------------
DROP SEQUENCE "SEQ_APP_ID";
CREATE SEQUENCE "SEQ_APP_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_APP_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_BASIC_ID
-- ----------------------------
DROP SEQUENCE "SEQ_BASIC_ID";
CREATE SEQUENCE "SEQ_BASIC_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_BASIC_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_BA_ID
-- ----------------------------
DROP SEQUENCE "SEQ_BA_ID";
CREATE SEQUENCE "SEQ_BA_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_BA_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_BL_ID
-- ----------------------------
DROP SEQUENCE "SEQ_BL_ID";
CREATE SEQUENCE "SEQ_BL_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_BL_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_CATEGORY_ID
-- ----------------------------
DROP SEQUENCE "SEQ_CATEGORY_ID";
CREATE SEQUENCE "SEQ_CATEGORY_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_CATEGORY_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_CM_ID
-- ----------------------------
DROP SEQUENCE "SEQ_CM_ID";
CREATE SEQUENCE "SEQ_CM_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_CM_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_COMMENT_ID
-- ----------------------------
DROP SEQUENCE "SEQ_COMMENT_ID";
CREATE SEQUENCE "SEQ_COMMENT_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_COMMENT_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_DICT_ID
-- ----------------------------
DROP SEQUENCE "SEQ_DICT_ID";
CREATE SEQUENCE "SEQ_DICT_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_DICT_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_FF_ID
-- ----------------------------
DROP SEQUENCE "SEQ_FF_ID";
CREATE SEQUENCE "SEQ_FF_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_FF_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_FIELD_ID
-- ----------------------------
DROP SEQUENCE "SEQ_FIELD_ID";
CREATE SEQUENCE "SEQ_FIELD_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_FIELD_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_FORM_ID
-- ----------------------------
DROP SEQUENCE "SEQ_FORM_ID";
CREATE SEQUENCE "SEQ_FORM_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_FORM_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_MANAGER_ID
-- ----------------------------
DROP SEQUENCE "SEQ_MANAGER_ID";
CREATE SEQUENCE "SEQ_MANAGER_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_MANAGER_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_MODEL_ID
-- ----------------------------
DROP SEQUENCE "SEQ_MODEL_ID";
CREATE SEQUENCE "SEQ_MODEL_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_MODEL_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_PAGE_ID
-- ----------------------------
DROP SEQUENCE "SEQ_PAGE_ID";
CREATE SEQUENCE "SEQ_PAGE_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_PAGE_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_PEOPLE_ID
-- ----------------------------
DROP SEQUENCE "SEQ_PEOPLE_ID";
CREATE SEQUENCE "SEQ_PEOPLE_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_PEOPLE_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_ROLE_ID
-- ----------------------------
DROP SEQUENCE "SEQ_ROLE_ID";
CREATE SEQUENCE "SEQ_ROLE_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_ROLE_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_SEARCH_ID
-- ----------------------------
DROP SEQUENCE "SEQ_SEARCH_ID";
CREATE SEQUENCE "SEQ_SEARCH_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_SEARCH_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Sequence structure for SEQ_SS_ID
-- ----------------------------
DROP SEQUENCE "SEQ_SS_ID";
CREATE SEQUENCE "SEQ_SS_ID" MINVALUE 1 MAXVALUE 99999999 INCREMENT BY 300 CACHE 20;
CREATE SEQUENCE "SEQ_SS_ID" MINVALUE 1 MAXVALUE 99999999 START WITH 300 INCREMENT BY 1 CACHE 20;
-- ----------------------------
-- Primary Key structure for table APP
......
......@@ -2225,7 +2225,7 @@ CREATE TABLE [mdiy_dict] (
[dict_value] nvarchar(100) COLLATE Chinese_PRC_CI_AS NOT NULL,
[dict_label] nvarchar(100) COLLATE Chinese_PRC_CI_AS NOT NULL,
[dict_type] nvarchar(100) COLLATE Chinese_PRC_CI_AS NOT NULL,
[dict_description] nvarchar(100) COLLATE Chinese_PRC_CI_AS NOT NULL,
[dict_description] nvarchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[dict_sort] int DEFAULT ((0)) NOT NULL,
[dict_parent_id] nvarchar(64) COLLATE Chinese_PRC_CI_AS NULL,
[dict_remarks] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL,
......@@ -2344,6 +2344,26 @@ EXEC sp_addextendedproperty
'TABLE', N'mdiy_dict'
GO
-- ----------------------------
-- Records of [mdiy_dict]
-- ----------------------------
SET IDENTITY_INSERT [dbo].[mdiy_dict] ON
GO
INSERT INTO [dbo].[mdiy_dict] VALUES (N'2', N'1', N'c', N'推荐', N'文章属性', NULL, N'4', NULL, NULL, N'0', NULL, N'0', NULL, N'0')
GO
INSERT INTO [dbo].[mdiy_dict] VALUES (N'3', N'1', N'p', N'图片', N'文章属性', NULL, N'4', NULL, NULL, N'0', NULL, N'0', NULL, N'0')
GO
INSERT INTO [dbo].[mdiy_dict] VALUES (N'4', N'1', N'h', N'头条', N'文章属性', NULL, N'2', NULL, NULL, N'0', NULL, N'0', NULL, N'0')
GO
INSERT INTO [dbo].[mdiy_dict] VALUES (N'5', N'1', N'f', N'幻灯', N'文章属性', NULL, N'2', NULL, NULL, N'0', NULL, N'0', NULL, N'0')
GO
SET IDENTITY_INSERT [dbo].[mdiy_dict] OFF
GO
-- ----------------------------
-- Table structure for mdiy_form
......@@ -2394,6 +2414,17 @@ EXEC sp_addextendedproperty
'TABLE', N'mdiy_form'
GO
-- ----------------------------
-- Records of [mdiy_form]
-- ----------------------------
SET IDENTITY_INSERT [dbo].[mdiy_form] ON
GO
INSERT INTO [dbo].[mdiy_form] VALUES (N'1', N'留言', N'mdiy_message_50', N'1', N'0', NULL, NULL, NULL)
GO
SET IDENTITY_INSERT [dbo].[mdiy_form] OFF
GO
-- ----------------------------
-- Table structure for mdiy_form_field
......@@ -2472,6 +2503,23 @@ EXEC sp_addextendedproperty
'TABLE', N'mdiy_form_field'
GO
-- ----------------------------
-- Records of [mdiy_form_field]
-- ----------------------------
SET IDENTITY_INSERT [dbo].[mdiy_form_field] ON
GO
INSERT INTO [dbo].[mdiy_form_field] VALUES (N'1', N'姓名', N'NAME', N'1', N'', N'0', N'0', N'1')
GO
INSERT INTO [dbo].[mdiy_form_field] VALUES (N'2', N'手机', N'PHONE', N'1', N'', N'0', N'0', N'1')
GO
INSERT INTO [dbo].[mdiy_form_field] VALUES (N'3', N'留言内容', N'CONTENT', N'3', N'', N'1', N'0', N'1')
GO
SET IDENTITY_INSERT [dbo].[mdiy_form_field] OFF
GO
-- ----------------------------
-- Table structure for mdiy_mooc_50
......@@ -2687,6 +2735,35 @@ EXEC sp_addextendedproperty
'TABLE', N'mdiy_search'
GO
-- ----------------------------
-- Table structure for mdiy_message_50
-- ----------------------------
IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[mdiy_message_50]') AND type IN ('U'))
DROP TABLE [dbo].[mdiy_message_50]
GO
CREATE TABLE [dbo].[mdiy_message_50] (
[Id] int IDENTITY(5,1) NOT NULL,
[date] datetime DEFAULT NULL NULL,
[fromID] int DEFAULT NULL NULL,
[NAME] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[PHONE] varchar(100) COLLATE Chinese_PRC_CI_AS NULL,
[CONTENT] text COLLATE Chinese_PRC_CI_AS NULL
)
GO
ALTER TABLE [dbo].[mdiy_message_50] SET (LOCK_ESCALATION = TABLE)
GO
-- ----------------------------
-- Primary Key structure for table mdiy_message_50
-- ----------------------------
ALTER TABLE [dbo].[mdiy_message_50] ADD CONSTRAINT [PK__mdiy_mes__3214EC07F6D81267] PRIMARY KEY CLUSTERED ([Id])
WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
ON [PRIMARY]
GO
-- ----------------------------
-- Records of [mdiy_search]
......
......@@ -4,7 +4,7 @@
<groupId>net.mingsoft</groupId>
<artifactId>ms-mcms</artifactId>
<packaging>war</packaging>
<version>4.6.4-SNAPSHOT</version>
<version>4.6.5</version>
<name>铭飞MCMS开源系统</name>
<url>http://ms.mingsoft.net</url>
<repositories>
......@@ -32,10 +32,10 @@
</repository>
</repositories>
<properties>
<ms.base.version>1.0.6</ms.base.version>
<ms.basic.version>1.0.6</ms.basic.version>
<ms.mdiy.version>1.0.5</ms.mdiy.version>
<ms.mpeople.version>1.0.5</ms.mpeople.version>
<ms.base.version>1.0.7</ms.base.version>
<ms.basic.version>1.0.7</ms.basic.version>
<ms.mdiy.version>1.0.6</ms.mdiy.version>
<ms.mpeople.version>1.0.6</ms.mpeople.version>
</properties>
<dependencies>
<dependency>
......
......@@ -24,7 +24,6 @@ package com.mingsoft.cms.action;
import java.io.File;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
......@@ -45,24 +44,17 @@ import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.mingsoft.basic.action.BaseAction;
import com.mingsoft.base.entity.BaseEntity;
import com.mingsoft.base.entity.ListJson;
import com.mingsoft.base.filter.DateValueFilter;
import com.mingsoft.base.filter.DoubleValueFilter;
import com.mingsoft.cms.biz.IArticleBiz;
import com.mingsoft.basic.biz.IColumnBiz;
import com.mingsoft.basic.biz.impl.CategoryBizImpl;
import com.mingsoft.basic.constant.Const;
import com.mingsoft.cms.constant.e.ColumnTypeEnum;
import com.mingsoft.mdiy.biz.IContentModelBiz;
import com.mingsoft.mdiy.biz.IContentModelFieldBiz;
import com.mingsoft.basic.constant.e.CookieConstEnum;
import com.mingsoft.cms.constant.ModelCode;
import com.mingsoft.cms.entity.ArticleEntity;
import com.mingsoft.cms.util.ArrysUtil;
......@@ -70,13 +62,12 @@ import com.mingsoft.basic.entity.ColumnEntity;
import com.mingsoft.mdiy.entity.ContentModelEntity;
import com.mingsoft.mdiy.entity.ContentModelFieldEntity;
import com.mingsoft.parser.IParserRegexConstant;
import com.mingsoft.util.PageUtil;
import com.mingsoft.util.StringUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ArrayUtil;
import net.mingsoft.basic.bean.EUListBean;
import net.mingsoft.basic.util.BasicUtil;
import net.mingsoft.basic.util.FileUtil;
import net.mingsoft.mdiy.util.DictUtil;
/**
* @ClassName: ArticleAction
......@@ -144,7 +135,7 @@ public class ArticleAction extends BaseAction {
@RequestMapping("/index")
public String index(HttpServletRequest request, ModelMap mode, HttpServletResponse response) {
// 获取站点id
int appId = this.getAppId(request);
int appId = BasicUtil.getAppId();
List<ColumnEntity> list = columnBiz.queryAll(appId, this.getModelCodeId(request, ModelCode.CMS_COLUMN));
request.setAttribute("listColumn", JSONArray.toJSONString(list));
// 返回路径
......@@ -165,14 +156,9 @@ public class ArticleAction extends BaseAction {
HttpServletResponse response, @PathVariable int categoryId) {
String articleType = request.getParameter("articleType");
String isParent = BasicUtil.getString("isParent", "false");
List types = articleType();
Map map = new HashMap<>();
//映射一个文章的全部属性
map.put("a","全部");
types.add((Map.Entry<String, String>)map.entrySet().iterator().next());
mode.addAttribute("isParent", isParent);
//使用糊涂工具排序使全部属性排在第一个
mode.addAttribute("articleTypeList", CollUtil.sortEntryToList(types));
mode.addAttribute("articleTypeList", DictUtil.list("文章属性"));
mode.addAttribute("articleType", articleType);
mode.addAttribute("categoryId", categoryId);
//返回文章页面显示地址
......@@ -221,11 +207,10 @@ public class ArticleAction extends BaseAction {
public String add(ModelMap mode, HttpServletRequest request) {
int categoryId = this.getInt(request, "categoryId", 0);
String categoryTitle = request.getParameter("categoryTitle");
String booleanParent = request.getParameter("booleanParent");
// 文章属性
mode.addAttribute("articleType", articleType());
mode.addAttribute("articleType", DictUtil.list("文章属性"));
// 站点ID
int appId = this.getAppId(request);
int appId = BasicUtil.getAppId();
List<ColumnEntity> list = columnBiz.queryAll(appId, this.getModelCodeId(request, ModelCode.CMS_COLUMN));
mode.addAttribute("appId", appId);
mode.addAttribute("listColumn", JSONArray.toJSONString(list));
......@@ -268,7 +253,7 @@ public class ArticleAction extends BaseAction {
@RequiresPermissions("article:save")
public void save(@ModelAttribute ArticleEntity article, HttpServletRequest request, HttpServletResponse response) {
// 获取站点id
int appId = this.getAppId(request);
int appId = BasicUtil.getAppId();
// 验证文章,文章自由排序,栏目id
if (!validateForm(article, response)) {
this.outJson(response, ModelCode.CMS_ARTICLE, false);
......@@ -411,7 +396,7 @@ public class ArticleAction extends BaseAction {
public void update(@PathVariable int basicId, @ModelAttribute ArticleEntity article, HttpServletRequest request,
HttpServletResponse response) {
// 获取站点id
int appId = this.getAppId(request);
int appId = BasicUtil.getAppId();
article.setBasicUpdateTime(new Timestamp(System.currentTimeMillis()));
// 文章类型
String checkboxType = BasicUtil.getString("checkboxType");
......@@ -524,7 +509,7 @@ public class ArticleAction extends BaseAction {
// 板块id
int categoryId = this.getInt(request, "categoryId", 0);
ArticleEntity articleEntity = null;
int appId = this.getAppId(request);
int appId = BasicUtil.getAppId();
model.addAttribute("appId", appId);
model.addAttribute("articleImagesUrl", "/upload/"+BasicUtil.getAppId()+"/");
if (categoryId > 0) { // 分类获取文章
......@@ -533,7 +518,7 @@ public class ArticleAction extends BaseAction {
int columnType = column.getColumnType();
model.addAttribute("article", articleEntity);
// 文章属性
model.addAttribute("articleType", articleType());
model.addAttribute("articleType", DictUtil.list("文章属性"));
model.addAttribute("categoryTitle", categoryTitle);
model.addAttribute("categoryId", categoryId);// 编辑封面
model.addAttribute("isEditCategory", true);// 编辑封面
......@@ -546,7 +531,7 @@ public class ArticleAction extends BaseAction {
String listJsonString = JSONArray.toJSONString(list);
request.setAttribute("listColumn", listJsonString);
// 文章属性
model.addAttribute("articleType", articleType());
model.addAttribute("articleType", DictUtil.list("文章属性"));
articleEntity = (ArticleEntity) articleBiz.getEntity(id);
model.addAttribute("article", articleEntity);
......@@ -579,12 +564,12 @@ public class ArticleAction extends BaseAction {
*/
@RequestMapping("/delete")
@RequiresPermissions("article:del")
public void delete(@RequestBody List<ArticleEntity> article, HttpServletRequest request, HttpServletResponse response) {
int appId = this.getAppId(request);
int[] ids = new int[article.size()];
public void delete(@RequestBody List<ArticleEntity> articles, HttpServletRequest request, HttpServletResponse response) {
int appId = BasicUtil.getAppId();
int[] ids = new int[articles.size()];
//循环获取id数据
for(int i=0;i<article.size();i++){
ids[i] = article.get(i).getArticleID();
for(int i=0;i<articles.size();i++){
ids[i] = articles.get(i).getArticleID();
}
if (ids.length == 0 || ids == null) {
......@@ -593,6 +578,7 @@ public class ArticleAction extends BaseAction {
}
// 删除多个帖子
articleBiz.deleteBasic(ids);
FileUtil.del(articles);
this.outJson(response, ModelCode.CMS_ARTICLE, true, "", this.redirectBack(request, false));
}
......
......@@ -36,6 +36,7 @@ import com.mingsoft.util.StringUtil;
import net.mingsoft.basic.bean.EUListBean;
import net.mingsoft.basic.util.BasicUtil;
import net.mingsoft.basic.util.FileUtil;
......@@ -181,9 +182,12 @@ public class ColumnAction extends BaseAction{
@ResponseBody
public void delete(HttpServletResponse response, HttpServletRequest request) {
int[] ids = BasicUtil.getInts("ids", ",");
ColumnEntity column =new ColumnEntity();
for(int i=0;i<ids.length;i++){
column = (ColumnEntity) columnBiz.getEntity(ids[i]);
columnBiz.deleteCategory(ids[i]);
}
FileUtil.del(column);
};
this.outJson(response, true);
}
......
......@@ -240,7 +240,7 @@
<where>
a.ARTICLE_WEBID = #{webId}
<if test="article != null ">
<if test="article.basicTitle != null">
<if test="article.basicTitle != null and article.basicTitle != ''">
and b.BASIC_TITLE like
<include refid="queryWhereBasicTitle"></include>
</if>
......@@ -273,7 +273,7 @@
JOIN category c ON c.CATEGORY_ID = cl.COLUMN_CATEGORY_ID
where a.ARTICLE_WEBID = #{webId}
<if test="article != null ">
<if test="article.basicTitle != null">
<if test="article.basicTitle != null and article.basicTitle != ''">
and b.BASIC_TITLE like
<include refid="queryWhereBasicTitle"></include>
</if>
......
......@@ -11,7 +11,7 @@ log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.Threshold=INFO
log4j.appender.CONSOLE.Target=System.out
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
log4j.appender.CONSOLE.layout.ConversionPattern=[\u94ed\u98deMS-V4.6.4 %d{yyy-MM-dd HH:mm:ss,SSS}](%p) - %c - (%F:%L) %m %n
log4j.appender.CONSOLE.layout.ConversionPattern=[\u94ed\u98deMS-V4.6.5 %d{yyy-MM-dd HH:mm:ss,SSS}](%p) - %c - (%F:%L) %m %n
#####################
# File Appender #
......
......@@ -27,6 +27,8 @@
<context:component-scan base-package="**.service" />
<!-- 业务调度 -->
<context:component-scan base-package="**.job" />
<!-- 异常处理 -->
<context:component-scan base-package="**.exception" />
<!-- 打开aop 注解 -->
<aop:aspectj-autoproxy proxy-target-class="true" />
<mvc:annotation-driven />
......
......@@ -86,7 +86,4 @@
</property>
<property name="excludeUrls" value="upload"/>
</bean>
<!-- 系统错误转发配置[并记录错误日志] -->
<bean class="net.mingsoft.basic.exception.SimpleMappingExceptionResolver"/>
</beans>
\ No newline at end of file
......@@ -11,7 +11,7 @@
<@ms.text name="basicTitle" colSm="2" width="400" label="文章标题" title="文章标题" size="5" placeholder="请输入文章标题" value="${article.basicTitle?default('')}" validation={"maxlength":"300","required":"true", "data-bv-notempty-message":"文章标题不能为空","data-bv-stringlength-message":"标题在300个字符以内!", "data-bv-notempty-message":"必填项目"}/>
<@ms.text name="basicSort" colSm="2" width="200" label="自定义顺序" title="自定义顺序" size="5" placeholder="请输入文章顺序" value="${article.basicSort?c?default(0)}" validation={"data-bv-between":"true","required":"true", "data-bv-between-message":"自定义顺序必须大于0","data-bv-between-min":"0", "data-bv-between-max":"99999999","data-bv-notempty-message":"自定义顺序不能为空"}/>
<#if articleType?has_content>
<@ms.checkboxlist colSm="2" name="checkbox" label="文章属性" list=articleType listKey="key" listValue="value" />
<@ms.checkboxlist colSm="2" name="checkbox" label="文章属性" list=articleType listKey="dictValue" listValue="dictLabel" />
</#if>
<@ms.formRow colSm="2" label="文章缩略图" width="400" >
<@ms.uploadImg path="article" uploadFloderPath="${articleImagesUrl?default('')}" inputName="basicThumbnails" size="1" msg="提示:文章缩略图,支持jpg格式" imgs="${article.basicThumbnails?default('')}" />
......
......@@ -2,7 +2,7 @@
<@ms.nav title="文章列表"></@ms.nav>
<@ms.searchForm name="searchForm" action="">
<#if articleTypeList?has_content>
<@ms.select label="文章属性" name="articleType" id="forumSelect" list=articleTypeList listValue="value" listKey="key" value="${articleType?default('')}"/>
<@ms.select label="文章属性" default="全部" value="a" name="articleType" id="forumSelect" list=articleTypeList listValue="dictLabel" listKey="dictValue" value="${articleType?default('')}"/>
<#else>
<@ms.select label="文章属性" name="articleType" id="forumSelect" value="" list=["默认属性"] />
</#if>
......@@ -50,13 +50,15 @@
contentType : "application/x-www-form-urlencoded",
queryParamsType : "undefined",
toolbar: "#toolbar",
columns: [{ checkbox: true},{
field: 'articleID',
title: '编号',
align: 'center'
}, {
columns: [{ checkbox: true}, {
field: 'column.categoryTitle',
title: '栏目名',
width: 90,
align: 'left'
},{
field: 'basicTitle',
title: '文章标题',
formatter: function (value, row, index){
<@shiro.hasPermission name="article:update">
var url='${managerPath}/cms/article/'+row.articleID+"/edit.do";
......@@ -67,21 +69,25 @@
</@shiro.lacksPermission>
}
}, {
field: 'column.categoryTitle',
title: '栏目名',
align: 'center'
}, {
field: 'articleAuthor',
title: '作者'
}, {
field: 'basicHit',
title: '点击量',
align: 'center'
title: '作者',
width: 100
}, {
field: 'basicSort',
title: '排序',
align: 'center'
align: 'center',
width: 50
}, {
field: 'basicHit',
title: '点击',
align: 'center',
width: 50
}, {
field: 'basicDateTime',
title: '发布时间',
align: 'center',
width: 90
}]
});
//查询文章标题
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment