xierz 4 anni fa
parent
commit
8b1f2993ef
2 ha cambiato i file con 20 aggiunte e 15 eliminazioni
  1. 9 9
      doc/5.2-patch.sql
  2. 11 6
      doc/mcms-5.2.sql

+ 9 - 9
doc/5.2-patch.sql

@@ -227,13 +227,6 @@ ADD COLUMN `update_by` int(10) NULL COMMENT '更新人',
 ADD COLUMN `update_date` datetime(0) NULL COMMENT '更新时间',
 ADD COLUMN `del` int(1) NULL COMMENT '删除标识';
 
-ALTER TABLE `app`
-ADD COLUMN `create_by` int(10) NULL COMMENT '创建人',
-ADD COLUMN `create_date` datetime(0) NULL COMMENT '创建时间',
-ADD COLUMN `update_by` int(10) NULL COMMENT '更新人',
-ADD COLUMN `update_date` datetime(0) NULL COMMENT '更新时间',
-ADD COLUMN `del` int(1) NULL COMMENT '删除标识';
-
 UPDATE app set app_dir = id;
 
 update model as tmp1
@@ -242,9 +235,16 @@ update model as tmp1
 set model_url="basic/log/index.do"
 WHERE tmp1.id = tmp2.id;
 
-
 update model as tmp1
     INNER JOIN
     (select id from model WHERE model_url="basic:systemlog:view" limit 1) as tmp2
 set model_url="basic:log:view"
-WHERE tmp1.id = tmp2.id;
+WHERE tmp1.id = tmp2.id;
+
+UPDATE `mdiy_tag` SET `tag_name` = 'arclist', `tag_type` = 'list', `tag_description` = '文章列表' WHERE `id` = 3;
+UPDATE `mdiy_tag` SET `tag_name` = 'channel', `tag_type` = 'list', `tag_description` = '通用栏目' WHERE `id` = 4;
+UPDATE `mdiy_tag` SET `tag_name` = 'global', `tag_type` = 'single', `tag_description` = '全局' WHERE `id` = 5;
+UPDATE `mdiy_tag` SET `tag_name` = 'field', `tag_type` = 'single', `tag_description` = '文章内容' WHERE `id` = 7;
+UPDATE `mdiy_tag` SET `tag_name` = 'pre', `tag_type` = 'single', `tag_description` = '文章上一篇' WHERE `id` = 8;
+UPDATE `mdiy_tag` SET `tag_name` = 'page', `tag_type` = 'single', `tag_description` = '通用分页' WHERE `id` = 9;
+UPDATE `mdiy_tag` SET `tag_name` = 'next', `tag_type` = 'single', `tag_description` = '文章下一篇' WHERE `id` = 10;

+ 11 - 6
doc/mcms-5.2.sql

@@ -63,7 +63,7 @@ CREATE TABLE `cms_category`  (
   `leaf` bigint(0) NULL DEFAULT NULL COMMENT '是否是叶子节点',
   `top_id` bigint(0) NULL DEFAULT NULL COMMENT '顶级id',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '分类' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 150 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '分类' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of cms_category
@@ -142,7 +142,7 @@ CREATE TABLE `cms_content`  (
   PRIMARY KEY (`id`) USING BTREE,
   INDEX `fk_category_id`(`category_id`) USING BTREE,
   CONSTRAINT `fk_category_id` FOREIGN KEY (`category_id`) REFERENCES `cms_category` (`id`) ON DELETE CASCADE ON UPDATE RESTRICT
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文章' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 223 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '文章' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of cms_content
@@ -292,7 +292,14 @@ CREATE TABLE `logger`  (
   `create_date` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
   `create_by` int(0) NULL DEFAULT NULL COMMENT '创建人',
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统日志' ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '系统日志' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of logger
+-- ----------------------------
+INSERT INTO `logger` VALUES (1, NULL, '{\n	\"result\":true,\n	\"code\":200\n}', '{}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate/0/genernateColumn.do', 'GET', 'net.mingsoft.cms.action.GeneraterAction.genernateColumn()', '127.0.0.1', '生成栏目', 0, NULL, NULL, '2020-12-24 05:46:15', NULL);
+INSERT INTO `logger` VALUES (2, NULL, '{\n	\"result\":true,\n	\"code\":200\n}', '{\n	\"dateTime\":[\"2018-11-01\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate/0/generateArticle.do', 'POST', 'net.mingsoft.cms.action.GeneraterAction.generateArticle()', '127.0.0.1', '生成文章', 0, NULL, NULL, '2020-12-24 05:46:23', NULL);
+INSERT INTO `logger` VALUES (3, NULL, '{\n	\"result\":true,\n	\"code\":200\n}', '{\n	\"url\":[\"index.htm\"],\n	\"position\":[\"index\"]\n}', '内网IP', 'msopen', 'manage', 'update', 'success', '/ms/cms/generate//generateIndex.do', 'POST', 'net.mingsoft.cms.action.GeneraterAction.generateIndex()', '127.0.0.1', '生成主页', 0, NULL, NULL, '2020-12-24 05:46:30', NULL);
 
 -- ----------------------------
 -- Table structure for manager
@@ -459,7 +466,7 @@ CREATE TABLE `mdiy_tag`  (
 -- ----------------------------
 -- Records of mdiy_tag
 -- ----------------------------
-INSERT INTO `mdiy_tag` VALUES (3, 'arclist', 'page', '文章列表');
+INSERT INTO `mdiy_tag` VALUES (3, 'arclist', 'list', '文章列表');
 INSERT INTO `mdiy_tag` VALUES (4, 'channel', 'list', '通用栏目');
 INSERT INTO `mdiy_tag` VALUES (5, 'global', 'single', '全局');
 INSERT INTO `mdiy_tag` VALUES (7, 'field', 'single', '文章内容');
@@ -619,7 +626,6 @@ CREATE TABLE `people`  (
 -- Records of people
 -- ----------------------------
 INSERT INTO `people` VALUES (1, '18179860960', 'msopen', '9d8622060de5f24937b60585c3f4d66b', '2019-12-30 18:28:28', '1027418825@qq.com', 0, NULL, NULL, 0, 0, '127.0.0.1', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `people` VALUES (2, '', 'as', '7c1cadb6887373dacb595c47166bfbd9', '2020-12-24 03:11:06', '', 0, NULL, NULL, 0, 0, NULL, 57, '2020-12-24 03:11:06', 0, NULL, 0);
 
 -- ----------------------------
 -- Table structure for people_address
@@ -676,7 +682,6 @@ CREATE TABLE `people_user`  (
 -- Records of people_user
 -- ----------------------------
 INSERT INTO `people_user` VALUES (1, NULL, NULL, NULL, NULL, '/upload/1577701863298.jpg', '111', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `people_user` VALUES (2, NULL, NULL, NULL, NULL, NULL, 'dasas', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 
 -- ----------------------------
 -- Table structure for role