From 9c6ef1ca5c9ac559c24882d65e9342e083d75541 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 6 Dec 2023 21:00:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A1=8C=E9=9D=A2=E7=89=88flyway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/desktop/V2.1__ddl.sql | 99 +++++++++---------- .../core-frontend/src/config/axios/refresh.ts | 4 + 2 files changed, 53 insertions(+), 50 deletions(-) diff --git a/core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql index b31c9f69e5..d30c931455 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql @@ -1,77 +1,76 @@ DROP TABLE IF EXISTS `visualization_template`; -CREATE TABLE `visualization_template` ( - `id` varchar(50) NOT NULL COMMENT '主键', - `name` varchar(255) DEFAULT NULL COMMENT '名称', - `pid` varchar(255) DEFAULT NULL COMMENT '父级id', - `level` int DEFAULT NULL COMMENT '层级', - `dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹', - `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', - `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `snapshot` longtext COMMENT '缩略图', - `template_type` varchar(255) DEFAULT NULL COMMENT '模版类型 system 系统内置 self 用户自建 ', - `template_style` longtext COMMENT 'template 样式', - `template_data` longtext COMMENT 'template 数据', - `dynamic_data` longtext COMMENT '预存数据', - PRIMARY KEY (`id`) +CREATE TABLE `visualization_template` +( + `id` varchar(50) NOT NULL COMMENT '主键', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `pid` varchar(255) DEFAULT NULL COMMENT '父级id', + `level` int DEFAULT NULL COMMENT '层级', + `dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹', + `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', + `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', + `create_time` bigint DEFAULT NULL COMMENT '创建时间', + `snapshot` longtext COMMENT '缩略图', + `template_type` varchar(255) DEFAULT NULL COMMENT '模版类型 system 系统内置 self 用户自建 ', + `template_style` longtext COMMENT 'template 样式', + `template_data` longtext COMMENT 'template 数据', + `dynamic_data` longtext COMMENT '预存数据', + PRIMARY KEY (`id`) ); -- ---------------------------- -- Table structure for visualization_template_category -- ---------------------------- DROP TABLE IF EXISTS `visualization_template_category`; -CREATE TABLE `visualization_template_category` ( - `id` varchar(50) NOT NULL COMMENT '主键', - `name` varchar(255) DEFAULT NULL COMMENT '名称', - `pid` varchar(255) DEFAULT NULL COMMENT '父级id', - `level` int DEFAULT NULL COMMENT '层级', - `dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹', - `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', - `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - `snapshot` longtext COMMENT '缩略图', - `template_type` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`) +CREATE TABLE `visualization_template_category` +( + `id` varchar(50) NOT NULL COMMENT '主键', + `name` varchar(255) DEFAULT NULL COMMENT '名称', + `pid` varchar(255) DEFAULT NULL COMMENT '父级id', + `level` int DEFAULT NULL COMMENT '层级', + `dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹', + `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', + `create_by` varchar(255) DEFAULT NULL COMMENT '创建人', + `create_time` bigint DEFAULT NULL COMMENT '创建时间', + `snapshot` longtext COMMENT '缩略图', + `template_type` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) ); -- ---------------------------- -- Table structure for visualization_template_category_map -- ---------------------------- DROP TABLE IF EXISTS `visualization_template_category_map`; -CREATE TABLE `visualization_template_category_map` ( - `id` varchar(50) NOT NULL COMMENT '主键', - `category_id` varchar(255) DEFAULT NULL COMMENT '名称', - `template_id` varchar(255) DEFAULT NULL COMMENT '父级id', - PRIMARY KEY (`id`) +CREATE TABLE `visualization_template_category_map` +( + `id` varchar(50) NOT NULL COMMENT '主键', + `category_id` varchar(255) DEFAULT NULL COMMENT '名称', + `template_id` varchar(255) DEFAULT NULL COMMENT '父级id', + PRIMARY KEY (`id`) ); -- ---------------------------- -- Table structure for visualization_template_extend_data -- ---------------------------- DROP TABLE IF EXISTS `visualization_template_extend_data`; -CREATE TABLE `visualization_template_extend_data` ( - `id` bigint NOT NULL, - `dv_id` bigint DEFAULT NULL, - `view_id` bigint DEFAULT NULL, - `view_details` longtext , - `copy_from` varchar(255) DEFAULT NULL, - `copy_id` varchar(255) DEFAULT NULL, - PRIMARY KEY (`id`) +CREATE TABLE `visualization_template_extend_data` +( + `id` bigint NOT NULL, + `dv_id` bigint DEFAULT NULL, + `view_id` bigint DEFAULT NULL, + `view_details` longtext, + `copy_from` varchar(255) DEFAULT NULL, + `copy_id` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) ); -BEGIN; INSERT INTO `core_menu` VALUES (19, 0, 2, 'template-market', 'template-market', 4, NULL, '/template-market', 1, 1, 0); INSERT INTO `core_menu` VALUES (30, 0, 1, 'toolbox', null, 7, 'icon_template', '/toolbox', 1, 1, 0); INSERT INTO `core_menu` VALUES (31, 30, 2, 'template-setting', 'toolbox/template-setting', 1, 'icon_template', '/template-setting', 0, 1, 1); -COMMIT; - -ALTER TABLE `core_opt_recent` - MODIFY COLUMN `resource_id` bigint NULL COMMENT '资源ID' AFTER `id`, - ADD COLUMN `resource_name` varchar(255) NULL COMMENT '资源名称' AFTER `resource_id`; +ALTER TABLE core_opt_recent ADD `resource_name` varchar(255) NULL COMMENT '资源名称'; DROP TABLE IF EXISTS `core_area_custom`; CREATE TABLE `core_area_custom` @@ -82,11 +81,11 @@ CREATE TABLE `core_area_custom` PRIMARY KEY (`id`) ); -BEGIN; INSERT INTO `core_sys_setting` VALUES (1, 'basic.dsIntervalTime', '6', 'text', 2); INSERT INTO `core_sys_setting` VALUES (2, 'basic.dsExecuteTime', 'minute', 'text', 3); -INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (7, 'template.url', 'https://templates.dataease.cn', 'text', 0); -INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (8, 'template.accessKey', 'dataease', 'text', 1); -COMMIT; +INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) +VALUES (7, 'template.url', 'https://templates.dataease.cn', 'text', 0); +INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) +VALUES (8, 'template.accessKey', 'dataease', 'text', 1); diff --git a/core/core-frontend/src/config/axios/refresh.ts b/core/core-frontend/src/config/axios/refresh.ts index 3067ea4f89..9c685e334d 100644 --- a/core/core-frontend/src/config/axios/refresh.ts +++ b/core/core-frontend/src/config/axios/refresh.ts @@ -35,6 +35,10 @@ const cacheRequest = cb => { } export const configHandler = config => { + const desktop = wsCache.get('app.desktop') + if (desktop) { + return config + } if (wsCache.get('user.token')) { config.headers['X-DE-TOKEN'] = wsCache.get('user.token') const expired = isExpired()