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] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=B0=E5=A2=9E=E6=9D=A5=E6=BA=90=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=EF=BC=9B=E4=BC=98=E5=8C=96docker=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?springboot=E7=89=88=E6=9C=AC=E5=AF=BC=E8=87=B4h2=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=8F=98=E5=8A=A8?=
 =?UTF-8?q?=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: