From 994151e70ade75abffb138564e214fd4d5478d68 Mon Sep 17 00:00:00 2001 From: lbw Date: Sat, 27 Aug 2022 17:31:07 +0800 Subject: [PATCH] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=20=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/2pigxx.sql | 5 +- db/8pigxx_codegen.sql | 83 ++++++++++++------- db/99pigxx_bi.sql | 1 + .../controller/MachineRegistryController.java | 4 - 4 files changed, 59 insertions(+), 34 deletions(-) diff --git a/db/2pigxx.sql b/db/2pigxx.sql index 3daa4da46..ea2ab6cce 100644 --- a/db/2pigxx.sql +++ b/db/2pigxx.sql @@ -490,7 +490,8 @@ INSERT INTO `sys_menu` VALUES (9003, '表单修改', 'gen_form_edit', NULL, 9001 INSERT INTO `sys_menu` VALUES (9004, '表单删除', 'gen_form_del', NULL, 9001, '1', 2, '0', '1', ' ', '2018-05-15 21:35:18', ' ', '2020-03-24 08:58:47', '0', 1); INSERT INTO `sys_menu` VALUES (9005, '数据源管理', NULL, '/gen/datasource', 9000, 'icon-mysql', 0, '0', '0', ' ', '2019-08-12 09:42:11', ' ', '2020-03-24 08:58:49', '0', 1); INSERT INTO `sys_menu` VALUES (9006, '表单设计', NULL, '/gen/design', 9000, 'icon-biaodanbiaoqian', 2, '0', '0', ' ', '2019-08-16 10:08:56', ' ', '2020-03-24 08:58:53', '0', 1); -INSERT INTO `sys_menu` VALUES (10000, '大屏设计', NULL, 'http://127.0.0.1:9095/', -1, 'icon-shuju', 10, '0', '0', ' ', '2019-08-16 10:08:56', ' ', '2020-03-24 08:58:53', '0', 1); +INSERT INTO `sys_menu` VALUES (9007, '低代码', 'gen_api_designer', NULL , 9001, '1', 3, '0', '1', ' ', '2019-08-16 10:08:56', ' ', '2020-03-24 08:58:53', '0', 1); +INSERT INTO `sys_menu` VALUES (10000, '大屏设计', NULL, '/report/screen/index', -1, 'icon-shuju', 10, '0', '0', ' ', '2019-08-16 10:08:56', ' ', '2020-03-24 08:58:53', '0', 1); COMMIT; -- ---------------------------- @@ -755,6 +756,7 @@ INSERT INTO `sys_role_menu` VALUES (1, 9003); INSERT INTO `sys_role_menu` VALUES (1, 9004); INSERT INTO `sys_role_menu` VALUES (1, 9005); INSERT INTO `sys_role_menu` VALUES (1, 9006); +INSERT INTO `sys_role_menu` VALUES (1, 9007); INSERT INTO `sys_role_menu` VALUES (1, 10000); COMMIT; @@ -795,6 +797,7 @@ INSERT INTO `sys_route_conf` VALUES (9, '微信公众号管理', 'pigx-mp-platfo INSERT INTO `sys_route_conf` VALUES (10, '支付管理', 'pigx-pay-platform', '[{\"args\": {\"_genkey_0\": \"/pay/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-pay-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:13', '0'); INSERT INTO `sys_route_conf` VALUES (11, '监控管理', 'pigx-monitor', '[{\"args\": {\"_genkey_0\": \"/monitor/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-monitor', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:17', '0'); INSERT INTO `sys_route_conf` VALUES (12, '积木报表', 'pigx-jimu-platform\n', '[{\"args\": {\"_genkey_0\": \"/jimu/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-jimu-platform', 0, NULL, ' ', ' ', '2019-10-16 16:44:41', '2019-11-05 22:37:17', '0'); +INSERT INTO `sys_route_conf` VALUES (13, '大屏设计', 'pigx-report-platform', '[{\"args\": {\"_genkey_0\": \"/aj/**\"}, \"name\": \"Path\"}]', '[]', 'lb://pigx-report-platform', 0, '{}', ' ', ' ', '2022-08-27 02:38:43', NULL, '0'); COMMIT; -- ---------------------------- diff --git a/db/8pigxx_codegen.sql b/db/8pigxx_codegen.sql index f254c36d3..8a259da5c 100644 --- a/db/8pigxx_codegen.sql +++ b/db/8pigxx_codegen.sql @@ -3,28 +3,50 @@ USE pigxx_codegen; SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; +-- ---------------------------- +-- Table structure for gen_api_file +-- ---------------------------- +DROP TABLE IF EXISTS `gen_api_file`; +CREATE TABLE `gen_api_file` +( + `file_path` varchar(255) NOT NULL, + `file_content` longtext, + PRIMARY KEY (`file_path`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci; + +-- ---------------------------- +-- Records of gen_api_file +-- ---------------------------- +BEGIN; +COMMIT; + -- ---------------------------- -- Table structure for gen_datasource_conf -- ---------------------------- DROP TABLE IF EXISTS `gen_datasource_conf`; -CREATE TABLE `gen_datasource_conf` ( - `id` bigint NOT NULL COMMENT '主键', - `name` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '别名', - `url` varchar(255) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT 'jdbcurl', - `username` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '用户名', - `password` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '密码', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新', - `del_flag` char(1) CHARACTER SET utf8mb4 DEFAULT '0' COMMENT '删除标记', - `tenant_id` bigint DEFAULT NULL COMMENT '租户ID', - `ds_type` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '数据库类型', - `conf_type` char(1) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '配置类型', - `ds_name` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '数据库名称', - `instance` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '实例', - `port` int DEFAULT NULL COMMENT '端口', - `host` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '主机', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='数据源表'; +CREATE TABLE `gen_datasource_conf` +( + `id` bigint(20) NOT NULL COMMENT '主键', + `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '别名', + `url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'jdbcurl', + `username` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '用户名', + `password` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '密码', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '删除标记', + `tenant_id` bigint(20) DEFAULT NULL COMMENT '租户ID', + `ds_type` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '数据库类型', + `conf_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '配置类型', + `ds_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '数据库名称', + `instance` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '实例', + `port` int(11) DEFAULT NULL COMMENT '端口', + `host` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '主机', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT ='数据源表'; -- ---------------------------- -- Records of gen_datasource_conf @@ -36,17 +58,20 @@ COMMIT; -- Table structure for gen_form_conf -- ---------------------------- DROP TABLE IF EXISTS `gen_form_conf`; -CREATE TABLE `gen_form_conf` ( - `id` bigint NOT NULL COMMENT 'ID', - `table_name` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL, - `form_info` json NOT NULL COMMENT '表单信息', - `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', - `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', - `del_flag` char(1) CHARACTER SET utf8mb4 DEFAULT '0', - `tenant_id` bigint DEFAULT NULL COMMENT '所属租户', - PRIMARY KEY (`id`) USING BTREE, - KEY `table_name` (`table_name`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='表单配置'; +CREATE TABLE `gen_form_conf` +( + `id` bigint(20) NOT NULL COMMENT 'ID', + `table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, + `form_info` json NOT NULL COMMENT '表单信息', + `create_time` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `update_time` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0', + `tenant_id` bigint(20) DEFAULT NULL COMMENT '所属租户', + PRIMARY KEY (`id`) USING BTREE, + KEY `table_name` (`table_name`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT ='表单配置'; -- ---------------------------- -- Records of gen_form_conf diff --git a/db/99pigxx_bi.sql b/db/99pigxx_bi.sql index 7f0d86ba8..803898fd9 100644 --- a/db/99pigxx_bi.sql +++ b/db/99pigxx_bi.sql @@ -1328,6 +1328,7 @@ CREATE TABLE `jimu_report_share` ( `last_update_time` datetime NULL DEFAULT NULL COMMENT '最后更新时间', `term_of_validity` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '有效期(0:永久有效，1:1天，2:7天)', `status` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否过期(0未过期，1已过期)', + `preview_lock_status` varchar(1) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '密码锁状态', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '积木报表预览权限表' ROW_FORMAT = Dynamic; diff --git a/pigx-visual/pigx-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java b/pigx-visual/pigx-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java index c23ecf709..f2e10e337 100644 --- a/pigx-visual/pigx-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java +++ b/pigx-visual/pigx-sentinel-dashboard/src/main/java/com/alibaba/csp/sentinel/dashboard/controller/MachineRegistryController.java @@ -27,7 +27,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import sun.net.util.IPAddressUtil; @Controller @RequestMapping(value = "/registry", produces = MediaType.APPLICATION_JSON_VALUE) @@ -49,9 +48,6 @@ public class MachineRegistryController { if (StringUtil.isBlank(ip) || ip.length() > 128) { return Result.ofFail(-1, "invalid ip: " + ip); } - if (!IPAddressUtil.isIPv4LiteralAddress(ip) && !IPAddressUtil.isIPv6LiteralAddress(ip)) { - return Result.ofFail(-1, "invalid ip: " + ip); - } if (port == null || port < -1) { return Result.ofFail(-1, "invalid port"); }