🎉 增加达梦数据库适配

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;
 	/**
 	 * 附件名称
 	 */

blade-ops/blade-flow-design/pom.xml

@@ -14,6 +14,10 @@
     <version>${bladex.project.version}</version>
     <packaging>jar</packaging>
 
+    <properties>
+        <flowable.version>6.4.2</flowable.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>

blade-ops/blade-flow/pom.xml

@@ -59,14 +59,8 @@
         </dependency>
         <!-- 工作流 -->
         <dependency>
-            <groupId>org.flowable</groupId>
-            <artifactId>flowable-spring-boot-starter</artifactId>
-            <version>${flowable.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.flowable</groupId>
-            <artifactId>flowable-json-converter</artifactId>
-            <version>${flowable.version}</version>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-starter-flowable</artifactId>
         </dependency>
     </dependencies>
 

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());

blade-ops/blade-resource/src/main/java/org/springblade/resource/mapper/AttachMapper.xml

@@ -13,7 +13,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="link" property="link"/>
-        <result column="domain" property="domain"/>
+        <result column="domain_url" property="domainUrl"/>
         <result column="name" property="name"/>
         <result column="original_name" property="originalName"/>
         <result column="extension" property="extension"/>

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;
 	/**
 	 * 系统背景
 	 */

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<Kv> info(String domain) {
-		Tenant tenant = tenantService.getOne(Wrappers.<Tenant>query().lambda().eq(Tenant::getDomain, domain));
+		Tenant tenant = tenantService.getOne(Wrappers.<Tenant>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);

blade-service/blade-system/src/main/java/org/springblade/system/mapper/TenantMapper.xml

@@ -13,7 +13,7 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="tenant_id" property="tenantId"/>
         <result column="tenant_name" property="tenantName"/>
-        <result column="domain" property="domain"/>
+        <result column="domain_url" property="domainUrl"/>
         <result column="background_url" property="backgroundUrl"/>
         <result column="linkman" property="linkman"/>
         <result column="contact_number" property="contactNumber"/>

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

pom.xml

@@ -16,8 +16,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <flowable.version>6.4.2</flowable.version>
-
         <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
         <spring.cloud.version>Hoxton.SR12</spring.cloud.version>
         <spring.platform.version>Cairo-SR8</spring.platform.version>