From 17ab99f6f5bd524076124601d5ad5a99cea0ea58 Mon Sep 17 00:00:00 2001 From: wangkang4 <2950778279@qq.com> Date: Mon, 28 Aug 2023 10:00:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DObjectMapperConfigura?= =?UTF-8?q?tion=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=B0=E5=A2=9ESqlServer=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/config/ObjectMapperConfiguration.java | 4 +++- .../src/StoredProcedureEditForm.vue | 15 ++++++++++++++- .../DataSourceManagement/src/setDatasource.vue | 5 +++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java index 0b463f54..e11965c4 100644 --- a/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java +++ b/DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/config/ObjectMapperConfiguration.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; import com.gccloud.dataroom.core.constant.DataRoomConst; import lombok.extern.slf4j.Slf4j; import org.json.JSONArray; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Configuration; @@ -15,7 +16,8 @@ import javax.annotation.Resource; @Slf4j @Configuration -@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "ObjectMapperConfiguration", havingValue = "ObjectMapperConfiguration", matchIfMissing = true) +@ConditionalOnMissingClass(value = "com.gccloud.dashboard.core.config.ObjectMapperConfiguration") +//@ConditionalOnProperty(prefix = "gc.starter.dataroom.component", name = "ObjectMapperConfiguration", havingValue = "ObjectMapperConfiguration", matchIfMissing = true) public class ObjectMapperConfiguration { @Resource diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue index 517359a2..2a568de4 100644 --- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue @@ -143,6 +143,7 @@ filterable placeholder="请选择数据源" :disabled="!isEdit" + @change="setSqlProcess($event)" >
示例： - call 存储过程名称(${参数名称},?) + call 存储过程名称(${参数名称},?)，SqlServer数据源使用：exec 存储过程名称 @参数名称=?
@@ -793,6 +794,18 @@ export default { this.sourceList = data }) }, + setSqlProcess (v, e) { + console.log('value:' + v) + for (let i = 0; i < this.sourceList.length; i++) { + if (this.sourceList[i].id === v) { + if (this.sourceList[i].sourceType === 'sqlserver') { + this.dataForm.sqlProcess = 'exec ' + } else { + this.dataForm.sqlProcess = 'call ' + } + } + } + }, /** * 打开参数配置弹窗 */ diff --git a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue index 2b32e41b..8dcd7d19 100644 --- a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue +++ b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue @@ -227,7 +227,8 @@ export default { { name: 'Mysql', code: 'mysql' }, { name: 'ClickHouse', code: 'clickhouse' }, { name: 'PostgreSQL', code: 'postgresql' }, - { name: 'Oracle', code: 'oracle' } + { name: 'Oracle', code: 'oracle' }, + { name: 'Sqlserver', code: 'sqlserver' } ], driverCLassList: [ { code: 'mysqlDriver', name: 'com.mysql.jdbc.Driver' }, @@ -338,7 +339,7 @@ export default { case 'com.ibm.db2.jcc.DB2Driver': return 'jdbc:db2://localhost:5000/db_name' case 'com.microsoft.sqlserver.jdbc.SQLServerDriver': - return 'jdbc:microsoft:sqlserver://localhost:1433DatabaseName=db_name' + return 'jdbc:sqlserver://localhost:1433;databaseName=mydatabase' case 'org.postgresql.Driver': return 'jdbc:postgresql://localhost:13308/db_name' case 'org.apache.hive.jdbc.HiveDriver': From ed94053138e08c42874f86349b0c2a9e65aeb24c Mon Sep 17 00:00:00 2001 From: "hong.yang" Date: Mon, 28 Aug 2023 10:22:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?docs:=20=E6=96=B0=E5=A2=9EIssue=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增Issue提交模板 --- .gitee/ISSUE_TEMPLATE/bug.yml | 71 +++++++++++++++++++++++++++++++ .gitee/ISSUE_TEMPLATE/config.yml | 1 + .gitee/ISSUE_TEMPLATE/feature.yml | 43 +++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 .gitee/ISSUE_TEMPLATE/bug.yml create mode 100644 .gitee/ISSUE_TEMPLATE/config.yml create mode 100644 .gitee/ISSUE_TEMPLATE/feature.yml diff --git a/.gitee/ISSUE_TEMPLATE/bug.yml b/.gitee/ISSUE_TEMPLATE/bug.yml new file mode 100644 index 00000000..2590260e --- /dev/null +++ b/.gitee/ISSUE_TEMPLATE/bug.yml @@ -0,0 +1,71 @@ +name: Bug 反馈 +description: 当你在代码中发现了一个 Bug，导致应用崩溃或抛出异常，或者有一个组件存在问题，或者某些地方看起来不对劲。 +title: "[Bug]: " +labels: ["bug"] +body: + - type: markdown + attributes: + value: | + 感谢对项目的支持与关注。在提出问题之前，请确保你已查看相关开发或使用文档： + - [https://www.yuque.com/chuinixiongkou/bigscreen/index](https://www.yuque.com/chuinixiongkou/bigscreen/index) + - type: checkboxes + attributes: + label: 这个问题是否已经存在？ + options: + - label: 我已经搜索过现有的[问题](https://gitee.com/gcpaas/DataRoom/issues) + required: true + - type: textarea + attributes: + label: 如何复现 + description: 请详细告诉我们如何复现你遇到的问题，如涉及代码，可提供一个最小代码示例，并使用反引号```附上它 + placeholder: | + 1. ... + 2. ... + 3. ... + validations: + required: true + - type: textarea + attributes: + label: 预期结果 + description: 请告诉我们你预期会发生什么。 + validations: + required: true + - type: textarea + attributes: + label: 实际结果 + description: 请告诉我们实际发生了什么。 + validations: + required: true + - type: textarea + attributes: + label: bug截图 + description: 如果可以的话，上传任何关于 bug 的截图。 + placeholder: [在这里上传图片] + - type: input + id: jdkVersion + attributes: + label: JDK版本 + description: 你当前正在使用的JDK版本号是多少？ + validations: + required: false + - type: input + id: nodeVersion + attributes: + label: Node版本 + description: 你当前正在使用的Node版本号是多少？ + validations: + required: false + - type: input + id: 前端软件版本 + attributes: + label: 前端软件版本 + description: 你当前正在使用的前端软件版本号是多少？[即您的package.json中的版本号] + validations: + required: false + - type: input + id: 后端软件版本 + attributes: + label: 后端软件版本 + description: 你当前正在使用的后端软件版本号是多少？[即您的pom.xml中的版本号] + validations: + required: false \ No newline at end of file diff --git a/.gitee/ISSUE_TEMPLATE/config.yml b/.gitee/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..ec4bb386 --- /dev/null +++ b/.gitee/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false \ No newline at end of file diff --git a/.gitee/ISSUE_TEMPLATE/feature.yml b/.gitee/ISSUE_TEMPLATE/feature.yml new file mode 100644 index 00000000..4d7f037e --- /dev/null +++ b/.gitee/ISSUE_TEMPLATE/feature.yml @@ -0,0 +1,43 @@ +name: 功能建议 +description: 对本项目提出一个功能建议 +title: "[功能建议]: " +labels: ["enhancement"] +body: + - type: markdown + attributes: + value: | + 感谢提出功能建议，我们将仔细考虑！ + - type: textarea + id: related-problem + attributes: + label: 你的功能建议是否和某个问题相关？ + description: 清晰并简洁地描述问题是什么，例如，当我...时，我总是感到困扰。 + validations: + required: false + - type: textarea + id: desired-solution + attributes: + label: 你希望看到什么解决方案？ + description: 清晰并简洁地描述你希望发生的事情。 + validations: + required: true + - type: textarea + id: alternatives + attributes: + label: 你考虑过哪些替代方案？ + description: 清晰并简洁地描述你考虑过的任何替代解决方案或功能。 + validations: + required: false + - type: textarea + id: additional-context + attributes: + label: 你有其他上下文或截图吗？ + description: 在此处添加有关功能请求的任何其他上下文或截图。 + validations: + required: false + - type: checkboxes + attributes: + label: 意向参与贡献 + options: + - label: 我有意向参与具体功能的开发实现并将代码贡献回到上游社区 + required: false \ No newline at end of file From c8e9c2de76cb1dc7fb66ccb86f661d81bb61aec1 Mon Sep 17 00:00:00 2001 From: wangkang4 <2950778279@qq.com> Date: Mon, 28 Aug 2023 10:40:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96sqlserver=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/DataSourceManagement/src/setDatasource.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue index 8dcd7d19..92ec8ffa 100644 --- a/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue +++ b/data-room-ui/packages/DataSourceManagement/src/setDatasource.vue @@ -339,7 +339,7 @@ export default { case 'com.ibm.db2.jcc.DB2Driver': return 'jdbc:db2://localhost:5000/db_name' case 'com.microsoft.sqlserver.jdbc.SQLServerDriver': - return 'jdbc:sqlserver://localhost:1433;databaseName=mydatabase' + return 'jdbc:sqlserver://localhost:1433;databaseName=db_name' case 'org.postgresql.Driver': return 'jdbc:postgresql://localhost:13308/db_name' case 'org.apache.hive.jdbc.HiveDriver':