center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 桌面版flyway

Browse Source
This commit is contained in:
fit2cloud-chenyw 2023-12-06 21:00:35 +08:00
parent 64df2f08a4
commit 9c6ef1ca5c
2 changed files with 53 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
core/core-backend/src/main/resources/db/desktop/V2.1__ddl.sql
View File

@ -1,77 +1,76 @@
DROP TABLE IF EXISTS `visualization_template`; DROP TABLE IF EXISTS `visualization_template`;
CREATE TABLE `visualization_template` ( CREATE TABLE `visualization_template`
`id` varchar(50) NOT NULL COMMENT '主键', (
`name` varchar(255) DEFAULT NULL COMMENT '名称', `id` varchar(50) NOT NULL COMMENT '主键',
`pid` varchar(255) DEFAULT NULL COMMENT '父级id', `name` varchar(255) DEFAULT NULL COMMENT '名称',
`level` int DEFAULT NULL COMMENT '层级', `pid` varchar(255) DEFAULT NULL COMMENT '父级id',
`dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹', `level` int DEFAULT NULL COMMENT '层级',
`node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', `dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹',
`create_by` varchar(255) DEFAULT NULL COMMENT '创建人', `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹',
`create_time` bigint DEFAULT NULL COMMENT '创建时间', `create_by` varchar(255) DEFAULT NULL COMMENT '创建人',
`snapshot` longtext COMMENT '缩略图', `create_time` bigint DEFAULT NULL COMMENT '创建时间',
`template_type` varchar(255) DEFAULT NULL COMMENT '模版类型 system 系统内置 self 用户自建 ', `snapshot` longtext COMMENT '缩略图',
`template_style` longtext COMMENT 'template 样式', `template_type` varchar(255) DEFAULT NULL COMMENT '模版类型 system 系统内置 self 用户自建 ',
`template_data` longtext COMMENT 'template 数据', `template_style` longtext COMMENT 'template 样式',
`dynamic_data` longtext COMMENT '预存数据', `template_data` longtext COMMENT 'template 数据',
PRIMARY KEY (`id`) `dynamic_data` longtext COMMENT '预存数据',
PRIMARY KEY (`id`)
); );
-- ---------------------------- -- ----------------------------
-- Table structure for visualization_template_category -- Table structure for visualization_template_category
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `visualization_template_category`; DROP TABLE IF EXISTS `visualization_template_category`;
CREATE TABLE `visualization_template_category` ( CREATE TABLE `visualization_template_category`
`id` varchar(50) NOT NULL COMMENT '主键', (
`name` varchar(255) DEFAULT NULL COMMENT '名称', `id` varchar(50) NOT NULL COMMENT '主键',
`pid` varchar(255) DEFAULT NULL COMMENT '父级id', `name` varchar(255) DEFAULT NULL COMMENT '名称',
`level` int DEFAULT NULL COMMENT '层级', `pid` varchar(255) DEFAULT NULL COMMENT '父级id',
`dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹', `level` int DEFAULT NULL COMMENT '层级',
`node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹', `dv_type` varchar(255) DEFAULT NULL COMMENT '模版种类 dataV or dashboard 目录或者文件夹',
`create_by` varchar(255) DEFAULT NULL COMMENT '创建人', `node_type` varchar(255) DEFAULT NULL COMMENT '节点类型 folder or panel 目录或者文件夹',
`create_time` bigint DEFAULT NULL COMMENT '创建时间', `create_by` varchar(255) DEFAULT NULL COMMENT '创建人',
`snapshot` longtext COMMENT '缩略图', `create_time` bigint DEFAULT NULL COMMENT '创建时间',
`template_type` varchar(255) DEFAULT NULL, `snapshot` longtext COMMENT '缩略图',
PRIMARY KEY (`id`) `template_type` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
); );
-- ---------------------------- -- ----------------------------
-- Table structure for visualization_template_category_map -- Table structure for visualization_template_category_map
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `visualization_template_category_map`; DROP TABLE IF EXISTS `visualization_template_category_map`;
CREATE TABLE `visualization_template_category_map` ( CREATE TABLE `visualization_template_category_map`
`id` varchar(50) NOT NULL COMMENT '主键', (
`category_id` varchar(255) DEFAULT NULL COMMENT '名称', `id` varchar(50) NOT NULL COMMENT '主键',
`template_id` varchar(255) DEFAULT NULL COMMENT '父级id', `category_id` varchar(255) DEFAULT NULL COMMENT '名称',
PRIMARY KEY (`id`) `template_id` varchar(255) DEFAULT NULL COMMENT '父级id',
PRIMARY KEY (`id`)
); );
-- ---------------------------- -- ----------------------------
-- Table structure for visualization_template_extend_data -- Table structure for visualization_template_extend_data
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `visualization_template_extend_data`; DROP TABLE IF EXISTS `visualization_template_extend_data`;
CREATE TABLE `visualization_template_extend_data` ( CREATE TABLE `visualization_template_extend_data`
`id` bigint NOT NULL, (
`dv_id` bigint DEFAULT NULL, `id` bigint NOT NULL,
`view_id` bigint DEFAULT NULL, `dv_id` bigint DEFAULT NULL,
`view_details` longtext , `view_id` bigint DEFAULT NULL,
`copy_from` varchar(255) DEFAULT NULL, `view_details` longtext,
`copy_id` varchar(255) DEFAULT NULL, `copy_from` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`) `copy_id` varchar(255) DEFAULT NULL,
PRIMARY KEY (`id`)
); );
BEGIN;
INSERT INTO `core_menu` INSERT INTO `core_menu`
VALUES (19, 0, 2, 'template-market', 'template-market', 4, NULL, '/template-market', 1, 1, 0); VALUES (19, 0, 2, 'template-market', 'template-market', 4, NULL, '/template-market', 1, 1, 0);
INSERT INTO `core_menu` INSERT INTO `core_menu`
VALUES (30, 0, 1, 'toolbox', null, 7, 'icon_template', '/toolbox', 1, 1, 0); VALUES (30, 0, 1, 'toolbox', null, 7, 'icon_template', '/toolbox', 1, 1, 0);
INSERT INTO `core_menu` INSERT INTO `core_menu`
VALUES (31, 30, 2, 'template-setting', 'toolbox/template-setting', 1, 'icon_template', '/template-setting', 0, 1, 1); VALUES (31, 30, 2, 'template-setting', 'toolbox/template-setting', 1, 'icon_template', '/template-setting', 0, 1, 1);
COMMIT;
ALTER TABLE core_opt_recent ADD `resource_name` varchar(255) NULL COMMENT '资源名称';
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`;
DROP TABLE IF EXISTS `core_area_custom`; DROP TABLE IF EXISTS `core_area_custom`;
CREATE TABLE `core_area_custom` CREATE TABLE `core_area_custom`
@ -82,11 +81,11 @@ CREATE TABLE `core_area_custom`
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
); );
BEGIN;
INSERT INTO `core_sys_setting` INSERT INTO `core_sys_setting`
VALUES (1, 'basic.dsIntervalTime', '6', 'text', 2); VALUES (1, 'basic.dsIntervalTime', '6', 'text', 2);
INSERT INTO `core_sys_setting` INSERT INTO `core_sys_setting`
VALUES (2, 'basic.dsExecuteTime', 'minute', 'text', 3); 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`)
INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`) VALUES (8, 'template.accessKey', 'dataease', 'text', 1); VALUES (7, 'template.url', 'https://templates.dataease.cn', 'text', 0);
COMMIT; INSERT INTO `core_sys_setting` (`id`, `pkey`, `pval`, `type`, `sort`)
VALUES (8, 'template.accessKey', 'dataease', 'text', 1);

4
core/core-frontend/src/config/axios/refresh.ts
View File

@ -35,6 +35,10 @@ const cacheRequest = cb => {
} }
export const configHandler = config => { export const configHandler = config => {
const desktop = wsCache.get('app.desktop')
if (desktop) {
return config
}
if (wsCache.get('user.token')) { if (wsCache.get('user.token')) {
config.headers['X-DE-TOKEN'] = wsCache.get('user.token') config.headers['X-DE-TOKEN'] = wsCache.get('user.token')
const expired = isExpired() const expired = isExpired()