فهرست منبع

feat: 组件数据配置新增来源属性;优化docker打包配置,解决升级springboot版本导致h2初始化配置项变动的问题

hong.yang 1 سال پیش
والد
کامیت
9884d538cd

+ 4 - 1
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 = "数据集类型")

+ 4 - 1
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: