From 9884d538cd77bda4d701a1ad8a129a3c1a6d4040 Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Tue, 17 Oct 2023 11:01:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=85=8D=E7=BD=AE=E6=96=B0=E5=A2=9E=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=EF=BC=9B=E4=BC=98=E5=8C=96docker=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7springboot=E7=89=88=E6=9C=AC=E5=AF=BC=E8=87=B4h2?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=8F=98?=
 =?UTF-8?q?=E5=8A=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/datasource/DataSetDataSource.java       | 5 ++++-
 doc/docker/application-docker.yml                            | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java
index 00636c65..07991db7 100644
--- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java
+++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/datasource/DataSetDataSource.java
@@ -14,10 +14,13 @@ import java.util.List;
 @Data
 public class DataSetDataSource extends BaseChartDataSource {
 
+    @ApiModelProperty(notes = "数据来源，可能为数据集或者表达式")
+    private String source;
+
     @ApiModelProperty(notes = "数据集标识")
     private String businessKey;
 
-    @ApiModelProperty(notes = "数据源标识,仅用于出码时使用")
+    @ApiModelProperty(notes = "数据源标识")
     private String dataSourceKey;
 
     @ApiModelProperty(notes = "数据集类型")
diff --git a/doc/docker/application-docker.yml b/doc/docker/application-docker.yml
index c8de8e54..7d491962 100644
--- a/doc/docker/application-docker.yml
+++ b/doc/docker/application-docker.yml
@@ -22,7 +22,10 @@ spring:
     url: jdbc:h2:file:/db/h2DBData # jdbc:h2:mem:test
     username: root
     password: ${DB_PASSWORD:123456}
-    schema: classpath:init-h2.sql
+  sql:
+    init:
+      schema-locations: classpath:init-h2.sql
+      mode: always
 gc:
   starter:
     file:

From ba185aeab8ef9a0f97294d6a76f8dcd2856cdfef Mon Sep 17 00:00:00 2001
From: "hong.yang" <hong.yang@ustcinfo.com>
Date: Tue, 17 Oct 2023 11:34:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E3=80=81=E6=95=B0=E5=AD=97=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/chart/mock/bigNumber.json   | 18 ------------------
 .../src/main/resources/chart/mock/numbers.json | 18 ++++++++++++++++++
 .../src/main/resources/chart/mock/texts.json   |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)
 delete mode 100644 DataRoom/dataroom-core/src/main/resources/chart/mock/bigNumber.json
 create mode 100644 DataRoom/dataroom-core/src/main/resources/chart/mock/numbers.json

diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/bigNumber.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/bigNumber.json
deleted file mode 100644
index 3eb4b757..00000000
--- a/DataRoom/dataroom-core/src/main/resources/chart/mock/bigNumber.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "success": false,
-    "data": [
-        {
-            "sum(num)": 1456532
-        }
-    ],
-    "columnData": {
-        "num": {
-            "type": "bigint",
-            "tableName": "",
-            "originalColumn": "num",
-            "aggregate": "sum",
-            "alias": "sum(num)",
-            "remark": "访问次数"
-        }
-    }
-}
\ No newline at end of file
diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/numbers.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/numbers.json
new file mode 100644
index 00000000..26cac224
--- /dev/null
+++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/numbers.json
@@ -0,0 +1,18 @@
+{
+    "success": false,
+    "data": [
+        {
+            "title": 1234
+        }
+    ],
+    "columnData": {
+        "title": {
+            "type": "varchar",
+            "tableName": "",
+            "originalColumn": "title",
+            "aggregate": "",
+            "alias": "title",
+            "remark": "标题"
+        }
+    }
+}
\ No newline at end of file
diff --git a/DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json b/DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json
index f0d1fe97..a7283900 100644
--- a/DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json
+++ b/DataRoom/dataroom-core/src/main/resources/chart/mock/texts.json
@@ -6,7 +6,7 @@
         }
     ],
     "columnData": {
-        "num": {
+        "title": {
             "type": "varchar",
             "tableName": "",
             "originalColumn": "title",