From eae5cc7da70da51187e64106236b6d3bd737a6e1 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 5 Dec 2023 15:15:27 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E7=89=88?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6=E5=BA=94=E7=94=A8=E6=9C=89=E6=8A=A5=E9=94=99=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/dataset/server/DatasetDataServer.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java
index c6e41b1e4d..eb87de325b 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java
@@ -6,6 +6,7 @@ import io.dataease.api.dataset.dto.PreviewSqlDTO;
 import io.dataease.api.dataset.union.DatasetGroupInfoDTO;
 import io.dataease.dataset.manage.DatasetDataManage;
 import io.dataease.dto.dataset.DatasetTableFieldDTO;
+import io.dataease.utils.LogUtil;
 import jakarta.annotation.Resource;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -43,8 +44,15 @@ public class DatasetDataServer implements DatasetDataApi {
     }
 
     @Override
-    public List<String> getFieldEnum(List<Long> ids) throws Exception {
-        return datasetDataManage.getFieldEnum(ids);
+    public List<String> getFieldEnum(List<Long> ids) {
+        try{
+           return datasetDataManage.getFieldEnum(ids);
+        }catch (Exception e){
+            e.printStackTrace();
+            LogUtil.error(e);
+            return null;
+        }
+
     }
 
     @Override

From 64f9a4e5fb594f190e767c375eb2acb4e9b8b823 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 5 Dec 2023 16:19:10 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E3=80=90=E7=B3=BB=E7=BB=9F=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E3=80=91-=E5=9F=BA=E7=A1=80=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=E6=95=B0=E6=8D=AE=E6=BA=90=E6=A3=80=E6=B5=8B=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=97=B4=E9=9A=94=E6=B2=A1=E6=9C=89=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E6=95=B0=E5=80=BC=E8=BE=B9=E7=95=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/parameter/basic/BasicEdit.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
index 0f02f7f06e..20368e8580 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicEdit.vue
@@ -44,6 +44,20 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
   await formEl.validate(valid => {
     if (valid) {
+      if (
+        state.form.dsExecuteTime === 'minute' &&
+        (Number(state.form.dsIntervalTime) < 1 || Number(state.form.dsIntervalTime) > 59)
+      ) {
+        ElMessage.error('分钟超出范围【1-59】')
+        return
+      }
+      if (
+        state.form.dsExecuteTime === 'hour' &&
+        (Number(state.form.dsIntervalTime) < 1 || Number(state.form.dsIntervalTime) > 23)
+      ) {
+        ElMessage.error('小时超出范围【1-23】')
+        return
+      }
       const param = buildSettingList()
       if (param.length < 2) {
         return

From b3a687a91450a8b02c17182914b686e2451f0d6b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 5 Dec 2023 16:38:52 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=88=A0=E9=99=A4Tab=E7=BB=84=E4=BB=B6tab?=
 =?UTF-8?q?=E9=A1=B5=E5=90=8E=E6=BF=80=E6=B4=BB=E7=9A=84tab=E9=A1=B5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=AB=8B=E5=8D=B3=E6=B8=B2=E6=9F=93=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/de-tabs/Component.vue     | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue
index d6ea41b272..b277f58b20 100644
--- a/core/core-frontend/src/custom-component/de-tabs/Component.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue
@@ -1,5 +1,10 @@
 <template>
-  <div style="width: 100%; height: 100%" :class="headClass" ref="tabComponentRef">
+  <div
+    v-if="state.tabShow"
+    style="width: 100%; height: 100%"
+    :class="headClass"
+    ref="tabComponentRef"
+  >
     <de-custom-tab
       v-model="editableTabsValue"
       @tab-add="addTab"
@@ -153,7 +158,8 @@ const state = reactive({
   activeTabName: '',
   curItem: {},
   textarea: '',
-  dialogVisible: false
+  dialogVisible: false,
+  tabShow: true
 })
 const tabsAreaScroll = ref(false)
 const editableTabsValue = ref(null)
@@ -214,6 +220,10 @@ function deleteCur(param) {
       const activeIndex =
         (len - 1 + element.value.propValue.length) % element.value.propValue.length
       editableTabsValue.value = element.value.propValue[activeIndex].name
+      state.tabShow = false
+      nextTick(() => {
+        state.tabShow = true
+      })
     }
   }
 }

From daf841b0a45cdb974613bd6e2796d4d168aee7d7 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 5 Dec 2023 17:40:46 +0800
Subject: [PATCH 4/9] =?UTF-8?q?feat:=20=E5=B5=8C=E5=85=A5=E5=BC=8F?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 51a402bb2a..8daa8fe081 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 51a402bb2a1da18dd34a98f0de398f1be0c22682
+Subproject commit 8daa8fe081cd9c30b4c853193942f0ee33e50580

From 93ed208b1f16b20845cb4e61013a942505877348 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 5 Dec 2023 19:11:32 +0800
Subject: [PATCH 5/9] =?UTF-8?q?feat:=20=E9=A3=9E=E4=B9=A6=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=80=A7=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack                                                        | 2 +-
 .../main/java/io/dataease/api/lark/dto/LarkSettingCreator.java  | 2 ++
 .../src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java       | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 8daa8fe081..64ce19a11b 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 8daa8fe081cd9c30b4c853193942f0ee33e50580
+Subproject commit 64ce19a11bbdc3bfed02e36480cc68e8fa0b71e3
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java b/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java
index 94eb9d369d..042f1dcd45 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java
@@ -14,4 +14,6 @@ public class LarkSettingCreator implements Serializable {
     private String callBack;
 
     private Boolean enable;
+
+    private Boolean valid;
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java
index c1a19faa6d..8cfc286ae1 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java
@@ -16,4 +16,6 @@ public class LarkInfoVO implements Serializable {
     private String callBack;
 
     private Boolean enable = false;
+
+    private Boolean valid = false;
 }

From 2313a783984c6c2c7cbb9dd8ad50db801545f3d7 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 5 Dec 2023 19:15:00 +0800
Subject: [PATCH 6/9] =?UTF-8?q?perf:=20apisix=E6=94=AF=E6=8C=81Origin?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B4=E7=A9=BF=E9=80=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/dataease/bin/apisix/init.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/installer/dataease/bin/apisix/init.sh b/installer/dataease/bin/apisix/init.sh
index 9af6f1f45d..80ed032960 100644
--- a/installer/dataease/bin/apisix/init.sh
+++ b/installer/dataease/bin/apisix/init.sh
@@ -67,7 +67,8 @@ curl http://127.0.0.1:9180/apisix/admin/services/10 -X PUT -H "X-API-KEY: $DE_AP
         "X-DE-LINK-TOKEN",
         "X-EMBEDDED-TOKEN",
         "X-DE-ASK-TOKEN",
-        "Content-Type"
+        "Content-Type",
+        "Origin"
       ],
       "request_method": "POST",
       "upstream_headers": [

From 614006f1c41d59f23b2db6fa4a7d791d219c500e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 5 Dec 2023 21:12:15 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8E=E5=85=B6=E5=90=8D=E4=B8=8B=E8=B5=84=E6=BA=90=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 64ce19a11b..e4fa695a7d 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 64ce19a11bbdc3bfed02e36480cc68e8fa0b71e3
+Subproject commit e4fa695a7d3822b1b884dbbfb10c9595626f5ae3

From 6e35a33b7bff60a2753425e74c2b18c077b4a038 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 5 Dec 2023 21:41:08 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E5=85=B3=E4=BA=8E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E4=B8=BA=E7=A9=BA=E6=98=BE=E7=A4=BA=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/about/index.vue | 4 ++--
 de-xpack                                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/about/index.vue b/core/core-frontend/src/views/about/index.vue
index a837d29507..47c3170d76 100644
--- a/core/core-frontend/src/views/about/index.vue
+++ b/core/core-frontend/src/views/about/index.vue
@@ -171,11 +171,11 @@ const update = (licKey: string) => {
       </div>
       <div class="item">
         <div class="label">{{ $t('about.serial_no') }}</div>
-        <div class="value">{{ license.serialNo }}</div>
+        <div class="value">{{ license.serialNo || '-' }}</div>
       </div>
       <div class="item">
         <div class="label">{{ $t('about.remark') }}</div>
-        <div class="value ellipsis">{{ license.remark }}</div>
+        <div class="value ellipsis">{{ license.remark || '-' }}</div>
       </div>
 
       <div v-if="isAdmin" style="margin-top: 24px" class="lic_rooter">
diff --git a/de-xpack b/de-xpack
index e4fa695a7d..0352814e63 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit e4fa695a7d3822b1b884dbbfb10c9595626f5ae3
+Subproject commit 0352814e63af722b8811159704d36d9ca2244c0d

From 570040a82954c95db5ede996fb5e15f4d46e961c Mon Sep 17 00:00:00 2001
From: xuwei-fit2cloud <wei@fit2cloud.com>
Date: Wed, 6 Dec 2023 09:53:45 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E6=8C=81=E4=B9=85=E5=8C=96=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9C=B0=E5=9B=BE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 installer/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/install.sh b/installer/install.sh
index 2a56975ba1..4e38d88a96 100644
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -61,7 +61,7 @@ cd $DE_RUN_BASE
 env | grep DE_ >.env
 
 mkdir -p ${DE_RUN_BASE}/{cache,logs,conf}
-mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data}
+mkdir -p ${DE_RUN_BASE}/data/{mysql,static-resource,map,etcd_data,geo}
 mkdir -p ${DE_RUN_BASE}/apisix/logs
 chmod 777 ${DE_RUN_BASE}/apisix/logs ${DE_RUN_BASE}/data/etcd_data