diff --git a/README.md b/README.md index f48ce6d..921520f 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@

- Downloads + Downloads Build Status Build Status - Coverage Status - Downloads + Coverage Status + Downloads Downloads diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 30c30d0..4807d45 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 2.6.1 + 2.6.2 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 6a27646..f09aa45 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index 3870c3c..48544d1 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 50a7cb4..4eefae8 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index 51b3d53..efa56c7 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index af1faf1..be49f6a 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml index 839076b..9a042ed 100644 --- a/blade-ops/blade-seata-order/pom.xml +++ b/blade-ops/blade-seata-order/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-ops/blade-seata-order/src/main/resources/application-dev.yml b/blade-ops/blade-seata-order/src/main/resources/application-dev.yml index 14e5433..4f39516 100644 --- a/blade-ops/blade-seata-order/src/main/resources/application-dev.yml +++ b/blade-ops/blade-seata-order/src/main/resources/application-dev.yml @@ -11,7 +11,6 @@ spring: # seata配置 seata: - tx-service-group: blade-seata-order-group #registry: # type: nacos # nacos: @@ -20,12 +19,13 @@ seata: # type: nacos # nacos: # server-addr: localhost + tx-service-group: blade-seata-order-group service: - grouplist: 127.0.0.1:8091 - vgroup-mapping: default + grouplist: + default: 127.0.0.1:8091 + vgroup-mapping: + blade-seata-order-group: default disable-global-transaction: false client: - support: - spring: - datasource-autoproxy: false - rm-report-success-enable: false + rm: + report-success-enable: false diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml index 61e570c..aceac62 100644 --- a/blade-ops/blade-seata-storage/pom.xml +++ b/blade-ops/blade-seata-storage/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-ops/blade-seata-storage/src/main/resources/application-dev.yml b/blade-ops/blade-seata-storage/src/main/resources/application-dev.yml index 3118022..8e8a376 100644 --- a/blade-ops/blade-seata-storage/src/main/resources/application-dev.yml +++ b/blade-ops/blade-seata-storage/src/main/resources/application-dev.yml @@ -11,7 +11,6 @@ spring: # seata配置 seata: - tx-service-group: blade-seata-storage-group #registry: # type: nacos # nacos: @@ -20,12 +19,13 @@ seata: # type: nacos # nacos: # server-addr: localhost + tx-service-group: blade-seata-storage-group service: - grouplist: 127.0.0.1:8091 - vgroup-mapping: default + grouplist: + default: 127.0.0.1:8091 + vgroup-mapping: + blade-seata-storage-group: default disable-global-transaction: false client: - support: - spring: - datasource-autoproxy: false - rm-report-success-enable: false + rm: + report-success-enable: false diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index d1dd745..1dcdaad 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 11e595b..f7c5ece 100644 --- a/blade-service-api/blade-demo-api/pom.xml +++ b/blade-service-api/blade-demo-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index c59fdf8..5537491 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 4a7e48a..0258ad7 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index 8928f00..038b9b5 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index 4a0fb24..c67feab 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index c7b39a3..1309cf5 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 2.6.1 + 2.6.2 4.0.0 blade-service-api ${project.artifactId} - 2.6.1 + 2.6.2 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index 8687f7a..3d14754 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 6a7bfeb..516448c 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index 8d562d0..e96b700 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 8135b5a..1d7b70b 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service/blade-user/pom.xml b/blade-service/blade-user/pom.xml index f1ed881..033c67e 100644 --- a/blade-service/blade-user/pom.xml +++ b/blade-service/blade-user/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.6.1 + 2.6.2 4.0.0 diff --git a/blade-service/pom.xml b/blade-service/pom.xml index b767548..a04e6db 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -7,12 +7,12 @@ org.springblade SpringBlade - 2.6.1 + 2.6.2 blade-service ${project.artifactId} - 2.6.1 + 2.6.2 pom SpringBlade 微服务集合 diff --git a/pom.xml b/pom.xml index d446294..23d5105 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springblade SpringBlade - 2.6.1 + 2.6.2 pom - 2.6.1 - 2.6.1 + 2.6.2 + 2.6.2 1.8 3.8.1 @@ -24,8 +24,8 @@ 2.2.0.RELEASE 2.2.2 - 2.2.4.RELEASE - Hoxton.SR1 + 2.2.5.RELEASE + Hoxton.SR2 Cairo-SR8 diff --git a/script/docker/.env b/script/docker/.env index 247f0b4..537b2c8 100644 --- a/script/docker/.env +++ b/script/docker/.env @@ -1,2 +1,2 @@ REGISTER=192.168.0.157/blade -TAG=2.6.1 +TAG=2.6.2