diff --git a/pom.xml b/pom.xml index 1487de2..e27f015 100644 --- a/pom.xml +++ b/pom.xml @@ -345,8 +345,16 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 6 + 6 + + - + diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml index e536288..404ad51 100644 --- a/src/main/resources/application-druid.yml +++ b/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.73.12:3306/luckyframe2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://localhost:3306/luckyframebak?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root - password: 123456 + password: luckyframe # 从库数据源 slave: # 从数据源开关/默认关闭 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c883c79..a776dce 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,7 +5,7 @@ luckyframe: # 版本 version: 3.5.1 # 版权年份 - copyrightYear: 2021 + copyrightYear: 2023 # 获取ip地址开关 addressEnabled: true # netty配置 diff --git a/src/main/resources/db/migration/V3.5.1__upgradeData.sql b/src/main/resources/db/migration/V3.5.1__upgradeData.sql index 4570581..66a9fa8 100644 --- a/src/main/resources/db/migration/V3.5.1__upgradeData.sql +++ b/src/main/resources/db/migration/V3.5.1__upgradeData.sql @@ -7,43 +7,56 @@ ************ WARNING ************ 此脚本属于应用自动升级数据库表结构以及数据脚本，无需手动执行，请慎重！！！！ */ ---1、PO模式功能 -CREATE TABLE if not exists `project_page_object` ( - `project_id` int NULL DEFAULT NULL COMMENT '关联项目ID', - `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', - `page_id` int NOT NULL AUTO_INCREMENT COMMENT '页面唯一编号', - `page_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '页面名称', - `page_parentmenu` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '页面父菜单', - `page_menu` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '页面菜单', - `project_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, - PRIMARY KEY (`page_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '页面配置管理' ROW_FORMAT = DYNAMIC; +-- 1、PO模式功能 页面管理 +CREATE TABLE if not exists `project_page_object` ( + `project_id` int NULL DEFAULT NULL COMMENT '关联项目ID', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', + `page_id` int NOT NULL AUTO_INCREMENT COMMENT '页面唯一编号', + `page_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '页面名称', + `page_parentmenu` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '页面父菜单', + `page_menu` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '页面菜单', + `project_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + PRIMARY KEY (`page_id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '页面配置管理' ROW_FORMAT = DYNAMIC; +-- 2、PO模式功能 页面元素管理 CREATE TABLE if not exists `project_page_detail` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT '系统主键', - `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', - `page_id` int NOT NULL COMMENT '页面唯一编号', - `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '定位类型，支持Byxpath等等', - `element` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '元素名称', - `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '具体的参数值', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 76 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '页面详情' ROW_FORMAT = DYNAMIC; + `id` int NOT NULL AUTO_INCREMENT COMMENT '系统主键', + `create_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', + `page_id` int NOT NULL COMMENT '页面唯一编号', + `type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '定位类型，支持Byxpath等等', + `element` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '元素名称', + `value` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci 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; -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2001, '页面管理', 4, 3, '/testmanagmt/projectPageObject', 'C', '0', 'testmanagmt:projectPageObject:view', '#', 'admin', '2018-03-01 00:00:00', 'dyl', '2022-03-31 17:48:28', '页面配置管理菜单'); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2002, '页面配置管理查询', 2001, 1, '#', 'F', '0', 'testmanagmt:projectPageObject:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:36', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2003, '页面配置管理新增', 2001, 2, '#', 'F', '0', 'testmanagmt:projectPageObject:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:52', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2004, '页面配置管理修改', 2001, 3, '#', 'F', '0', 'testmanagmt:projectPageObject:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:00', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2005, '页面配置管理删除', 2001, 4, '#', 'F', '0', 'testmanagmt:projectPageObject:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:08', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2006, '页面详情', 4, 1, '/testmanagmt/projectPageDetail', 'C', '1', 'testmanagmt:projectPageDetail:view', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-03-10 17:32:07', '页面详情菜单'); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2007, '页面详情查询', 2006, 1, '#', 'F', '0', 'testmanagmt:projectPageDetail:list', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:28:24', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2008, '页面详情新增', 2006, 2, '#', 'F', '0', 'testmanagmt:projectPageDetail:add', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:47', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2009, '页面详情修改', 2006, 3, '#', 'F', '0', 'testmanagmt:projectPageDetail:edit', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:29:53', ''); -INSERT INTO sys_menu (`menu_id`, menu_name`, parent_id`, order_num`, url`, menu_type`, visible`, perms`, icon`, create_by`, create_time`, update_by`, update_time`, remark`) VALUES (2010, '页面详情删除', 2006, 4, '#', 'F', '0', 'testmanagmt:projectPageDetail:remove', '#', 'admin', '2018-03-01 00:00:00', 'admin', '2022-04-01 11:30:00', ''); \ No newline at end of file +INSERT INTO sys_menu +VALUES (1115, 'Web页面元素管理', 4, 7, '#', 'M', '0', '', '#', 'admin', '2022-05-27 17:48:28', 'dyl', '2022-05-27 17:48:28', '页面配置管理菜单'); +INSERT INTO sys_menu +VALUES (1116, '页面管理', 1115, 1, '/testmanagmt/projectPageObject', 'C', '0', 'testmanagmt:projectPageObject:view', '#', 'admin', '2022-05-27 17:48:28', 'dyl', '2022-05-27 17:48:28', '页面配置管理菜单'); +INSERT INTO sys_menu +VALUES (1117, '页面配置管理查询', 1116, 1, '#', 'F', '0', 'testmanagmt:projectPageObject:list', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', ''); +INSERT INTO sys_menu +VALUES (1118, '页面配置管理新增', 1116, 2, '#', 'F', '0', 'testmanagmt:projectPageObject:add', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', ''); +INSERT INTO sys_menu +VALUES (1119, '页面配置管理修改', 1116, 3, '#', 'F', '0', 'testmanagmt:projectPageObject:edit', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', ''); +INSERT INTO sys_menu +VALUES (1120, '页面配置管理删除', 1116, 4, '#', 'F', '0', 'testmanagmt:projectPageObject:remove', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', ''); +INSERT INTO sys_menu +VALUES (1121, '页面详情', 1115, 2, '/testmanagmt/projectPageDetail', 'C', '1', 'testmanagmt:projectPageDetail:view', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', '页面详情菜单'); +INSERT INTO sys_menu +VALUES (1122, '页面详情查询', 1121, 1, '#', 'F', '0', 'testmanagmt:projectPageDetail:list', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', ''); +INSERT INTO sys_menu +VALUES (1123, '页面详情新增', 1121, 2, '#', 'F', '0', 'testmanagmt:projectPageDetail:add', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', ''); +INSERT INTO sys_menu +VALUES (1124, '页面详情修改', 1121, 3, '#', 'F', '0', 'testmanagmt:projectPageDetail:edit', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', ''); +INSERT INTO sys_menu +VALUES (1125, '页面详情删除', 1121, 4, '#', 'F', '0', 'testmanagmt:projectPageDetail:remove', '#', 'admin', '2022-05-27 17:48:28', 'admin', '2022-05-27 17:48:28', ''); \ No newline at end of file