Explorar o código

base版本升级

24282 %!s(int64=2) %!d(string=hai) anos
pai
achega
39fbee8dc7

+ 18 - 0
hx-admin/src/main/resources/application-dev.yml

@@ -2,7 +2,9 @@
 spring:
     datasource:
         dynamic:
+            seata: true
             strict: true
+            primary: base
             datasource:
                 mes:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
@@ -51,3 +53,19 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间(使用负值表示没有限制)
                 max-wait: -1ms
+
+seata:
+    config:
+        type: file
+    application-id: springboot-seata
+    #  enable-auto-data-source-proxy: false
+    registry:
+        type: file
+    service:
+        group-list:
+            default: 116.205.247.33:8091
+        vgroup-mapping:
+            springboot-seata-group: default
+    # seata 事务组编号 用于TC集群名
+    tx-service-group: springboot-seata-group
+

+ 18 - 1
hx-admin/src/main/resources/application-prod.yml

@@ -2,7 +2,9 @@
 spring:
     datasource:
         dynamic:
+            seata: true
             strict: true
+            primary: base
             datasource:
                 mes:
                     url: jdbc:mysql://127.0.0.1:28643/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
@@ -54,4 +56,19 @@ spring:
 
 server:
     servlet:
-        context-path: /prod-api
+        context-path: /prod-api
+
+seata:
+    config:
+        type: file
+    application-id: springboot-seata
+    #  enable-auto-data-source-proxy: false
+    registry:
+        type: file
+    service:
+        group-list:
+            default: 127.0.0.1:8091
+        vgroup-mapping:
+            springboot-seata-group: default
+    # seata 事务组编号 用于TC集群名
+    tx-service-group: springboot-seata-group

+ 17 - 0
hx-admin/src/main/resources/application-test.yml

@@ -2,7 +2,9 @@
 spring:
     datasource:
         dynamic:
+            seata: true
             strict: true
+            primary: base
             datasource:
                 mes:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_mes?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
@@ -55,3 +57,18 @@ spring:
 server:
     servlet:
         context-path: /test-api
+
+seata:
+    config:
+        type: file
+    application-id: springboot-seata
+    #  enable-auto-data-source-proxy: false
+    registry:
+        type: file
+    service:
+        group-list:
+            default: 116.205.247.33:8091
+        vgroup-mapping:
+            springboot-seata-group: default
+    # seata 事务组编号 用于TC集群名
+    tx-service-group: springboot-seata-group

+ 1 - 1
pom.xml

@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>com.fjhx</groupId>
                 <artifactId>hx-base</artifactId>
-                <version>1.0.0</version>
+                <version>1.0.1</version>
             </dependency>
             <dependency>
                 <groupId>com.fjhx</groupId>