From a7d894e24f9dd87c9b697dd2bc5e78e1a47daaa7 Mon Sep 17 00:00:00 2001 From: smallchill Date: Wed, 23 Mar 2022 16:27:52 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=20=E5=A2=9E=E5=8A=A0=E8=BE=BE=E6=A2=A6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/resource/entity/Attach.java | 2 +- blade-ops/blade-flow-design/pom.xml | 4 ++++ blade-ops/blade-flow/pom.xml | 10 ++-------- .../org/springblade/resource/endpoint/OssEndpoint.java | 2 +- .../org/springblade/resource/mapper/AttachMapper.xml | 2 +- .../java/org/springblade/system/entity/Tenant.java | 2 +- .../system/controller/TenantController.java | 4 ++-- .../org/springblade/system/mapper/TenantMapper.xml | 2 +- doc/nacos/blade-dev.yaml | 7 ++++++- pom.xml | 2 -- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/entity/Attach.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/entity/Attach.java index f42c0099..986d99e4 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/entity/Attach.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/entity/Attach.java @@ -45,7 +45,7 @@ public class Attach extends TenantEntity { * 附件域名 */ @ApiModelProperty(value = "附件域名") - private String domain; + private String domainUrl; /** * 附件名称 */ diff --git a/blade-ops/blade-flow-design/pom.xml b/blade-ops/blade-flow-design/pom.xml index 1b413957..dee1793b 100644 --- a/blade-ops/blade-flow-design/pom.xml +++ b/blade-ops/blade-flow-design/pom.xml @@ -14,6 +14,10 @@ ${bladex.project.version} jar + + 6.4.2 + + org.springblade diff --git a/blade-ops/blade-flow/pom.xml b/blade-ops/blade-flow/pom.xml index a3696653..1851ca5f 100644 --- a/blade-ops/blade-flow/pom.xml +++ b/blade-ops/blade-flow/pom.xml @@ -59,14 +59,8 @@ - org.flowable - flowable-spring-boot-starter - ${flowable.version} - - - org.flowable - flowable-json-converter - ${flowable.version} + org.springblade + blade-starter-flowable diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java index e662d5d6..7d00626d 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/endpoint/OssEndpoint.java @@ -205,7 +205,7 @@ public class OssEndpoint { private Long buildAttach(String fileName, Long fileSize, BladeFile bladeFile) { String fileExtension = FileUtil.getFileExtension(fileName); Attach attach = new Attach(); - attach.setDomain(bladeFile.getDomain()); + attach.setDomainUrl(bladeFile.getDomain()); attach.setLink(bladeFile.getLink()); attach.setName(bladeFile.getName()); attach.setOriginalName(bladeFile.getOriginalName()); diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/AttachMapper.xml b/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/AttachMapper.xml index ba35e2c1..8976ce79 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/AttachMapper.xml +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/AttachMapper.xml @@ -13,7 +13,7 @@ - + diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java index 35f81c50..c5e3f329 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java @@ -57,7 +57,7 @@ public class Tenant extends BaseEntity { * 域名地址 */ @ApiModelProperty(value = "域名地址") - private String domain; + private String domainUrl; /** * 系统背景 */ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java index 6570876c..e6d619a3 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java @@ -190,11 +190,11 @@ public class TenantController extends BladeController { @ApiOperationSupport(order = 10) @ApiOperation(value = "配置信息", notes = "传入domain") public R info(String domain) { - Tenant tenant = tenantService.getOne(Wrappers.query().lambda().eq(Tenant::getDomain, domain)); + Tenant tenant = tenantService.getOne(Wrappers.query().lambda().eq(Tenant::getDomainUrl, domain)); Kv kv = Kv.create(); if (tenant != null) { kv.set("tenantId", tenant.getTenantId()) - .set("domain", tenant.getDomain()) + .set("domain", tenant.getDomainUrl()) .set("backgroundUrl", tenant.getBackgroundUrl()); } return R.data(kv); diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml index 3c94fc1d..ea11951a 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml @@ -13,7 +13,7 @@ - + diff --git a/doc/nacos/blade-dev.yaml b/doc/nacos/blade-dev.yaml index b629efa2..cf5c0060 100644 --- a/doc/nacos/blade-dev.yaml +++ b/doc/nacos/blade-dev.yaml @@ -16,10 +16,11 @@ spring: #driver-class-name: org.postgresql.Driver #driver-class-name: oracle.jdbc.OracleDriver #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: dm.jdbc.driver.DmDriver druid: # MySql、PostgreSQL、SqlServer校验 validation-query: select 1 - # Oracle校验 + # Oracle、DaMeng校验 #validation-query: select 1 from dual #项目模块集中配置 @@ -56,3 +57,7 @@ blade: #url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=bladex #username: bladex #password: bladex + # DaMeng + #url: jdbc:dm://127.0.0.1:5236/BLADEX?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 + #username: BLADEX + #password: BLADEX diff --git a/pom.xml b/pom.xml index 197369bc..799a4ade 100644 --- a/pom.xml +++ b/pom.xml @@ -16,8 +16,6 @@ UTF-8 UTF-8 - 6.4.2 - 2.3.12.RELEASE Hoxton.SR12 Cairo-SR8