From f43dfacda26ac3e710f2a74fb08960ae6d028ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 30 Jun 2022 12:46:10 +0800 Subject: [PATCH] =?UTF-8?q?remove=20=E5=88=A0=E9=99=A4=20ruoyi-demo=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=E7=94=A8=E4=B8=8D=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev/seata-server.properties | 1 - ruoyi-example/ruoyi-demo/pom.xml | 10 ---------- .../ruoyi-demo/src/main/resources/application.yml | 1 + 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/config/dev/seata-server.properties b/config/dev/seata-server.properties index be62f536..4240bae3 100644 --- a/config/dev/seata-server.properties +++ b/config/dev/seata-server.properties @@ -3,7 +3,6 @@ service.vgroupMapping.ruoyi-system-group=default service.vgroupMapping.ruoyi-resource-group=default service.vgroupMapping.ruoyi-gen-group=default service.vgroupMapping.ruoyi-job-group=default -service.vgroupMapping.ruoyi-demo-group=default service.enableDegrade=false service.disableGlobalTransaction=false diff --git a/ruoyi-example/ruoyi-demo/pom.xml b/ruoyi-example/ruoyi-demo/pom.xml index 1f0c0307..11d79a65 100644 --- a/ruoyi-example/ruoyi-demo/pom.xml +++ b/ruoyi-example/ruoyi-demo/pom.xml @@ -68,16 +68,6 @@ ruoyi-common-mybatis - - com.ruoyi - ruoyi-common-seata - - - - com.ruoyi - ruoyi-common-dubbo - - com.ruoyi ruoyi-common-idempotent diff --git a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml index 5ee40b9c..850346f2 100644 --- a/ruoyi-example/ruoyi-demo/src/main/resources/application.yml +++ b/ruoyi-example/ruoyi-demo/src/main/resources/application.yml @@ -35,6 +35,7 @@ spring: spring: datasource: dynamic: + seata: false # 设置默认的数据源或者数据源组,默认值即为 master primary: master datasource: