From c7038a233ddf633bc43bdcf4d3454b2efc7af969 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 16 Jul 2024 13:46:46 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20api=E9=99=90=E6=B5=81=E7=9B=B8=E5=85=B3?= =?UTF-8?q?flyway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V2.9__ddl.sql | 101 +++++++++++------- .../io/dataease/traffic/DeTrafficAop.java | 2 +- 2 files changed, 62 insertions(+), 41 deletions(-) diff --git a/core/core-backend/src/main/resources/db/migration/V2.9__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.9__ddl.sql index 0a32227095..421b9220d5 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.9__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.9__ddl.sql @@ -1,50 +1,71 @@ DROP TABLE IF EXISTS `core_copilot_msg`; -CREATE TABLE `core_copilot_msg` ( - `id` bigint NOT NULL COMMENT 'ID', - `user_id` bigint DEFAULT NULL COMMENT '用户ID', - `dataset_group_id` bigint DEFAULT NULL COMMENT '数据集ID', - `msg_type` varchar(255) DEFAULT NULL COMMENT 'user or api', - `engine_type` varchar(255) DEFAULT NULL COMMENT 'mysql oracle ...', - `schema_sql` longtext COMMENT 'create sql', - `question` longtext COMMENT '用户提问', - `history` longtext COMMENT '历史信息', - `copilot_sql` longtext COMMENT 'copilot 返回 sql', - `api_msg` longtext COMMENT 'copilot 返回信息', - `sql_ok` int DEFAULT NULL COMMENT 'sql 状态', - `chart_ok` int DEFAULT NULL COMMENT 'chart 状态', - `chart` longtext COMMENT 'chart 内容', - `chart_data` longtext COMMENT '视图数据', - `exec_sql` longtext COMMENT '执行请求的SQL', - `msg_status` int DEFAULT NULL COMMENT 'msg状态，0失败 1成功', - `err_msg` longtext COMMENT 'de错误信息', - `create_time` bigint DEFAULT NULL COMMENT '创建时间', - PRIMARY KEY (`id`) +CREATE TABLE `core_copilot_msg` +( + `id` bigint NOT NULL COMMENT 'ID', + `user_id` bigint DEFAULT NULL COMMENT '用户ID', + `dataset_group_id` bigint DEFAULT NULL COMMENT '数据集ID', + `msg_type` varchar(255) DEFAULT NULL COMMENT 'user or api', + `engine_type` varchar(255) DEFAULT NULL COMMENT 'mysql oracle ...', + `schema_sql` longtext COMMENT 'create sql', + `question` longtext COMMENT '用户提问', + `history` longtext COMMENT '历史信息', + `copilot_sql` longtext COMMENT 'copilot 返回 sql', + `api_msg` longtext COMMENT 'copilot 返回信息', + `sql_ok` int DEFAULT NULL COMMENT 'sql 状态', + `chart_ok` int DEFAULT NULL COMMENT 'chart 状态', + `chart` longtext COMMENT 'chart 内容', + `chart_data` longtext COMMENT '视图数据', + `exec_sql` longtext COMMENT '执行请求的SQL', + `msg_status` int DEFAULT NULL COMMENT 'msg状态，0失败 1成功', + `err_msg` longtext COMMENT 'de错误信息', + `create_time` bigint DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) ); DROP TABLE IF EXISTS `core_copilot_token`; -CREATE TABLE `core_copilot_token` ( - `id` bigint NOT NULL COMMENT 'ID', - `type` varchar(255) DEFAULT NULL COMMENT 'free or license', - `token` longtext, - `update_time` bigint DEFAULT NULL, - PRIMARY KEY (`id`) -); - -INSERT INTO `core_copilot_token` VALUES (1, 'free', null, null); -INSERT INTO `core_copilot_token` VALUES (2, 'license', null, null); - - -DROP TABLE IF EXISTS `core_copilot_config`; -CREATE TABLE `core_copilot_config` ( - `id` bigint NOT NULL COMMENT 'ID', - `copilot_url` varchar(255) DEFAULT NULL, - `username` varchar(255) DEFAULT NULL, - `pwd` varchar(255) DEFAULT NULL, +CREATE TABLE `core_copilot_token` +( + `id` bigint NOT NULL COMMENT 'ID', + `type` varchar(255) DEFAULT NULL COMMENT 'free or license', + `token` longtext, + `update_time` bigint DEFAULT NULL, PRIMARY KEY (`id`) ); -INSERT INTO `core_copilot_config` VALUES (1, 'https://copilot-demo.test.fit2cloud.dev:5000', 'xlab', 'Q2Fsb25nQDIwMTU='); +INSERT INTO `core_copilot_token` +VALUES (1, 'free', null, null); +INSERT INTO `core_copilot_token` +VALUES (2, 'license', null, null); -UPDATE `core_sys_setting` SET `pkey` = 'ai.baseUrl', `pval` = 'https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb?mode=embed', `type` = 'text', `sort` = 0 WHERE `id` = 3; + +DROP TABLE IF EXISTS `core_copilot_config`; +CREATE TABLE `core_copilot_config` +( + `id` bigint NOT NULL COMMENT 'ID', + `copilot_url` varchar(255) DEFAULT NULL, + `username` varchar(255) DEFAULT NULL, + `pwd` varchar(255) DEFAULT NULL, + PRIMARY KEY (`id`) +); + +INSERT INTO `core_copilot_config` +VALUES (1, 'https://copilot-demo.test.fit2cloud.dev:5000', 'xlab', 'Q2Fsb25nQDIwMTU='); + +UPDATE `core_sys_setting` +SET `pkey` = 'ai.baseUrl', + `pval` = 'https://maxkb.fit2cloud.com/ui/chat/2ddd8b594ce09dbb?mode=embed', + `type` = 'text', + `sort` = 0 +WHERE `id` = 3; + +DROP TABLE IF EXISTS `core_api_traffic`; +CREATE TABLE `core_api_traffic` +( + `id` bigint NOT NULL COMMENT 'ID', + `api` varchar(255) NOT NULL COMMENT 'api', + `threshold` int NOT NULL DEFAULT '2' COMMENT '阈值', + `alive` int NOT NULL DEFAULT '0' COMMENT '活动并发', + PRIMARY KEY (`id`) +); diff --git a/sdk/common/src/main/java/io/dataease/traffic/DeTrafficAop.java b/sdk/common/src/main/java/io/dataease/traffic/DeTrafficAop.java index 8a41df39ee..0c4550fca2 100644 --- a/sdk/common/src/main/java/io/dataease/traffic/DeTrafficAop.java +++ b/sdk/common/src/main/java/io/dataease/traffic/DeTrafficAop.java @@ -57,7 +57,7 @@ public class DeTrafficAop { coreApiTrafficMapper.releaseAlive(api); } } - DEException.throwException(errorMsg); + DEException.throwException(String.format(errorMsg, api, value)); return null; } }