From 045c5ff4876b07aa5d249862c95b1e0cae77ed33 Mon Sep 17 00:00:00 2001 From: Wendal Chen Date: Fri, 19 Apr 2019 11:48:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20seata(=E5=8E=9Ffescar)=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF=E5=89=8D=E7=BC=80=E4=B9=9F=E5=BE=97?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 6 +++--- .../src/main/resources/application.properties | 6 +++--- .../src/main/resources/application.properties | 6 +++--- .../src/main/resources/application.properties | 6 +++--- .../java/org/nutz/boot/starter/seata/SeataStarter.java | 10 +++++----- pom.xml | 5 +++++ 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-account/src/main/resources/application.properties b/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-account/src/main/resources/application.properties index 246a01c1..133be78d 100644 --- a/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-account/src/main/resources/application.properties +++ b/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-account/src/main/resources/application.properties @@ -4,9 +4,9 @@ jdbc.url=jdbc:mysql://127.0.0.1/fescar_demo jdbc.username=root jdbc.password=root -fescar.enabled=true -fescar.applicationId=dubbo-fescar-account -fescar.txServiceGroup=my_test_tx_group +seata.enabled=true +seata.applicationId=dubbo-fescar-account +seata.txServiceGroup=my_test_tx_group dubbo.application.name=dubbo-fescar-account dubbo.registry.address=zookeeper://127.0.0.1:2181 diff --git a/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-order/src/main/resources/application.properties b/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-order/src/main/resources/application.properties index 77d129bb..d84367c8 100644 --- a/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-order/src/main/resources/application.properties +++ b/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-order/src/main/resources/application.properties @@ -9,6 +9,6 @@ jdbc.url=jdbc:mysql://127.0.0.1/fescar_demo jdbc.username=root jdbc.password=root -fescar.enabled=true -fescar.applicationId=dubbo-fescar-order -fescar.txServiceGroup=my_test_tx_group \ No newline at end of file +seata.enabled=true +seata.applicationId=dubbo-fescar-order +seata.txServiceGroup=my_test_tx_group diff --git a/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-storage/src/main/resources/application.properties b/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-storage/src/main/resources/application.properties index 854d30f9..83a4452a 100644 --- a/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-storage/src/main/resources/application.properties +++ b/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-storage/src/main/resources/application.properties @@ -9,6 +9,6 @@ jdbc.url=jdbc:mysql://127.0.0.1/fescar_demo jdbc.username=root jdbc.password=root -fescar.enabled=true -fescar.applicationId=dubbo-fescar-storage -fescar.txServiceGroup=my_test_tx_group \ No newline at end of file +seata.enabled=true +seata.applicationId=dubbo-fescar-storage +seata.txServiceGroup=my_test_tx_group \ No newline at end of file diff --git a/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-web/src/main/resources/application.properties b/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-web/src/main/resources/application.properties index 84620549..3466bd18 100644 --- a/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-web/src/main/resources/application.properties +++ b/nutzboot-demo/nutzboot-demo-dubbo-seata/nutzboot-demo-dubbo-seata-web/src/main/resources/application.properties @@ -10,6 +10,6 @@ jdbc.url=jdbc:mysql://127.0.0.1/fescar_demo jdbc.username=root jdbc.password=root -fescar.enabled=true -fescar.applicationId=dubbo-fescar-web -fescar.txServiceGroup=my_test_tx_group \ No newline at end of file +seata.enabled=true +seata.applicationId=dubbo-fescar-web +seata.txServiceGroup=my_test_tx_group \ No newline at end of file diff --git a/nutzboot-starter/nutzboot-starter-seata/src/main/java/org/nutz/boot/starter/seata/SeataStarter.java b/nutzboot-starter/nutzboot-starter-seata/src/main/java/org/nutz/boot/starter/seata/SeataStarter.java index d559f7f5..ddba3186 100644 --- a/nutzboot-starter/nutzboot-starter-seata/src/main/java/org/nutz/boot/starter/seata/SeataStarter.java +++ b/nutzboot-starter/nutzboot-starter-seata/src/main/java/org/nutz/boot/starter/seata/SeataStarter.java @@ -19,15 +19,15 @@ public class SeataStarter implements ServerFace { private static final Log log = Logs.get(); - protected static final String PRE = "fescar."; + protected static final String PRE = "seata."; - @PropDoc(value = "fescar是否启用", defaultValue = "false", type = "boolean") + @PropDoc(value = "seata是否启用", defaultValue = "false", type = "boolean") public static String PROP_ENABLED = PRE + "enabled"; - @PropDoc(value = "fescar应用id", need = true) + @PropDoc(value = "seata应用id", need = true) public static String PROP_APPID = PRE + "applicationId"; - @PropDoc(value = "fescar事务组", need = true) + @PropDoc(value = "seata事务组", need = true) public static String PROP_TXGROUP = PRE + "txServiceGroup"; @PropDoc(value = "自动创建undo表", defaultValue = "true") @@ -59,7 +59,7 @@ public class SeataStarter implements ServerFace { throw Lang.makeThrow("Ioc.$conf expect property '%s'", PROP_APPID); } txServiceGroup = conf.check(PROP_TXGROUP); - log.infof("fescar applicationId=%s txServiceGroup=%s", applicationId, txServiceGroup); + log.infof("seata applicationId=%s txServiceGroup=%s", applicationId, txServiceGroup); initClient(); } diff --git a/pom.xml b/pom.xml index 145dd6c1..c837bbdc 100644 --- a/pom.xml +++ b/pom.xml @@ -937,6 +937,11 @@ nutzboot-starter-seata ${nutzboot.version} + + org.nutz + nutzboot-starter-fescar + ${nutzboot.version} + org.nutz nutzboot-starter-caffeine