From 3cf30b179436c87a3d3b868a659d8fe104fe51be Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Mon, 27 Nov 2023 10:27:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E8=B7=A8?=
 =?UTF-8?q?=E5=9F=9F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dataease/templates/application.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/installer/dataease/templates/application.yml b/installer/dataease/templates/application.yml
index df7293079e..a9e6a81f78 100644
--- a/installer/dataease/templates/application.yml
+++ b/installer/dataease/templates/application.yml
@@ -11,7 +11,6 @@ spring:
     username: ${DE_MYSQL_USER}
     password: ${DE_MYSQL_PASSWORD}
 dataease:
-  origin-list: localhost:8080,localhost:8100,localhost:9080
   apisix-api:
     domain: http://apisix:9180
     key: DE_APISIX_KEY
\ No newline at end of file

From 99b233167ec133aa3b6d204505b7f07dc700e3a0 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 27 Nov 2023 10:51:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E5=8F=82=E6=95=B0=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AEflyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/db/migration/V2.1__ddl.sql            | 5 +++++
 de-xpack                                                     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/core-backend/src/main/resources/db/migration/V2.1__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.1__ddl.sql
index dd0e6efcd2..304e2f767c 100644
--- a/core/core-backend/src/main/resources/db/migration/V2.1__ddl.sql
+++ b/core/core-backend/src/main/resources/db/migration/V2.1__ddl.sql
@@ -48,3 +48,8 @@ CREATE TABLE `core_area_custom`
     `pid`  varchar(255) NOT NULL,
     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);
+COMMIT;
diff --git a/de-xpack b/de-xpack
index 8240c12452..5674afd3d5 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 8240c12452a97e2ed509a5cd067799de55fa7c30
+Subproject commit 5674afd3d583f63c3e529f423ac9febd8c7c1622