update feigin,ribbon dependency,remove duplicate,format (apache#100)

Inaho-yzb · Apr 29, 2019 · cf7b591 · cf7b591
1 parent 2005274
commit cf7b591
Show file tree

Hide file tree

Showing 156 changed files with 505 additions and 577 deletions.
diff --git a/dubbo/src/main/java/io/seata/samples/dubbo/service/impl/AccountServiceImpl.java b/dubbo/src/main/java/io/seata/samples/dubbo/service/impl/AccountServiceImpl.java
@@ -18,7 +18,6 @@
 
 import io.seata.core.context.RootContext;
 import io.seata.samples.dubbo.service.AccountService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;

diff --git a/dubbo/src/main/java/io/seata/samples/dubbo/service/impl/BusinessServiceImpl.java b/dubbo/src/main/java/io/seata/samples/dubbo/service/impl/BusinessServiceImpl.java
@@ -17,11 +17,10 @@
 package io.seata.samples.dubbo.service.impl;
 
 import io.seata.core.context.RootContext;
-import io.seata.spring.annotation.GlobalTransactional;
 import io.seata.samples.dubbo.service.BusinessService;
 import io.seata.samples.dubbo.service.OrderService;
 import io.seata.samples.dubbo.service.StorageService;
-
+import io.seata.spring.annotation.GlobalTransactional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/dubbo/src/main/java/io/seata/samples/dubbo/service/impl/OrderServiceImpl.java b/dubbo/src/main/java/io/seata/samples/dubbo/service/impl/OrderServiceImpl.java
@@ -21,10 +21,9 @@
 import java.sql.SQLException;
 
 import io.seata.core.context.RootContext;
-import io.seata.samples.dubbo.service.AccountService;
 import io.seata.samples.dubbo.Order;
+import io.seata.samples.dubbo.service.AccountService;
 import io.seata.samples.dubbo.service.OrderService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;

diff --git a/dubbo/src/main/java/io/seata/samples/dubbo/service/impl/StorageServiceImpl.java b/dubbo/src/main/java/io/seata/samples/dubbo/service/impl/StorageServiceImpl.java
@@ -18,7 +18,6 @@
 
 import io.seata.core.context.RootContext;
 import io.seata.samples.dubbo.service.StorageService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;

diff --git a/dubbo/src/main/java/io/seata/samples/dubbo/starter/DubboAccountServiceStarter.java b/dubbo/src/main/java/io/seata/samples/dubbo/starter/DubboAccountServiceStarter.java
@@ -17,7 +17,6 @@
 package io.seata.samples.dubbo.starter;
 
 import io.seata.samples.dubbo.ApplicationKeeper;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
 

diff --git a/dubbo/src/main/java/io/seata/samples/dubbo/starter/DubboBusinessTester.java b/dubbo/src/main/java/io/seata/samples/dubbo/starter/DubboBusinessTester.java
@@ -17,7 +17,6 @@
 package io.seata.samples.dubbo.starter;
 
 import io.seata.samples.dubbo.service.BusinessService;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**

diff --git a/dubbo/src/main/java/io/seata/samples/dubbo/starter/DubboOrderServiceStarter.java b/dubbo/src/main/java/io/seata/samples/dubbo/starter/DubboOrderServiceStarter.java
@@ -17,7 +17,6 @@
 package io.seata.samples.dubbo.starter;
 
 import io.seata.samples.dubbo.ApplicationKeeper;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**

diff --git a/dubbo/src/main/java/io/seata/samples/dubbo/starter/DubboStorageServiceStarter.java b/dubbo/src/main/java/io/seata/samples/dubbo/starter/DubboStorageServiceStarter.java
@@ -17,7 +17,6 @@
 package io.seata.samples.dubbo.starter;
 
 import io.seata.samples.dubbo.ApplicationKeeper;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
 

diff --git a/nacos/src/main/java/io/seata/samples/nacos/service/impl/AccountServiceImpl.java b/nacos/src/main/java/io/seata/samples/nacos/service/impl/AccountServiceImpl.java
@@ -18,7 +18,6 @@
 
 import io.seata.core.context.RootContext;
 import io.seata.samples.nacos.service.AccountService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;

diff --git a/nacos/src/main/java/io/seata/samples/nacos/service/impl/BusinessServiceImpl.java b/nacos/src/main/java/io/seata/samples/nacos/service/impl/BusinessServiceImpl.java
@@ -21,7 +21,6 @@
 import io.seata.samples.nacos.service.OrderService;
 import io.seata.samples.nacos.service.StorageService;
 import io.seata.spring.annotation.GlobalTransactional;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/nacos/src/main/java/io/seata/samples/nacos/service/impl/OrderServiceImpl.java b/nacos/src/main/java/io/seata/samples/nacos/service/impl/OrderServiceImpl.java
@@ -24,7 +24,6 @@
 import io.seata.samples.nacos.Order;
 import io.seata.samples.nacos.service.AccountService;
 import io.seata.samples.nacos.service.OrderService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;

diff --git a/nacos/src/main/java/io/seata/samples/nacos/service/impl/StorageServiceImpl.java b/nacos/src/main/java/io/seata/samples/nacos/service/impl/StorageServiceImpl.java
@@ -18,7 +18,6 @@
 
 import io.seata.core.context.RootContext;
 import io.seata.samples.nacos.service.StorageService;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;

diff --git a/nacos/src/main/java/io/seata/samples/nacos/starter/DubboAccountServiceStarter.java b/nacos/src/main/java/io/seata/samples/nacos/starter/DubboAccountServiceStarter.java
@@ -17,7 +17,6 @@
 package io.seata.samples.nacos.starter;
 
 import io.seata.samples.nacos.ApplicationKeeper;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
 

diff --git a/nacos/src/main/java/io/seata/samples/nacos/starter/DubboBusinessTester.java b/nacos/src/main/java/io/seata/samples/nacos/starter/DubboBusinessTester.java
@@ -17,7 +17,6 @@
 package io.seata.samples.nacos.starter;
 
 import io.seata.samples.nacos.service.BusinessService;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**

diff --git a/nacos/src/main/java/io/seata/samples/nacos/starter/DubboOrderServiceStarter.java b/nacos/src/main/java/io/seata/samples/nacos/starter/DubboOrderServiceStarter.java
@@ -17,7 +17,6 @@
 package io.seata.samples.nacos.starter;
 
 import io.seata.samples.nacos.ApplicationKeeper;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**

diff --git a/nacos/src/main/java/io/seata/samples/nacos/starter/DubboStorageServiceStarter.java b/nacos/src/main/java/io/seata/samples/nacos/starter/DubboStorageServiceStarter.java
@@ -17,7 +17,6 @@
 package io.seata.samples.nacos.starter;
 
 import io.seata.samples.nacos.ApplicationKeeper;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.jdbc.core.JdbcTemplate;
 

diff --git a/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-account/pom.xml b/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-account/pom.xml
@@ -2,14 +2,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>io.seata</groupId>
-		<artifactId>nutzboot-dubbo-seata</artifactId>
+        <groupId>io.seata</groupId>
+        <artifactId>nutzboot-dubbo-seata</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutzboot-dubbo-fescar-account</artifactId>
 	<dependencies>
 		<dependency>
-			<groupId>io.seata</groupId>
+            <groupId>io.seata</groupId>
 			<artifactId>nutzboot-dubbo-fescar-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>

diff --git a/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-common/pom.xml b/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-common/pom.xml
@@ -2,8 +2,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>io.seata</groupId>
-		<artifactId>nutzboot-dubbo-seata</artifactId>
+        <groupId>io.seata</groupId>
+        <artifactId>nutzboot-dubbo-seata</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutzboot-dubbo-fescar-common</artifactId>

diff --git a/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-order/pom.xml b/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-order/pom.xml
@@ -2,14 +2,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>io.seata</groupId>
-		<artifactId>nutzboot-dubbo-seata</artifactId>
+        <groupId>io.seata</groupId>
+        <artifactId>nutzboot-dubbo-seata</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutzboot-dubbo-fescar-order</artifactId>
 	<dependencies>
 		<dependency>
-			<groupId>io.seata</groupId>
+            <groupId>io.seata</groupId>
 			<artifactId>nutzboot-dubbo-fescar-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>

diff --git a/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-storage/pom.xml b/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-storage/pom.xml
@@ -2,14 +2,14 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>io.seata</groupId>
-		<artifactId>nutzboot-dubbo-seata</artifactId>
+        <groupId>io.seata</groupId>
+        <artifactId>nutzboot-dubbo-seata</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutzboot-dubbo-fescar-storage</artifactId>
 	<dependencies>
 		<dependency>
-			<groupId>io.seata</groupId>
+            <groupId>io.seata</groupId>
 			<artifactId>nutzboot-dubbo-fescar-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>

diff --git a/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-web/pom.xml b/nutzboot-dubbo-fescar/nutzboot-dubbo-fescar-web/pom.xml
@@ -2,8 +2,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>io.seata</groupId>
-		<artifactId>nutzboot-dubbo-seata</artifactId>
+        <groupId>io.seata</groupId>
+        <artifactId>nutzboot-dubbo-seata</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>nutzboot-dubbo-fescar-web</artifactId>
@@ -19,7 +19,7 @@
 			<version>${nutzboot.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>io.seata</groupId>
+            <groupId>io.seata</groupId>
 			<artifactId>nutzboot-dubbo-fescar-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>

diff --git a/...bbo-fescar-web/src/main/java/io/nutz/demo/dubbo/rpc/service/impl/BusinessServiceImpl.java b/...bbo-fescar-web/src/main/java/io/nutz/demo/dubbo/rpc/service/impl/BusinessServiceImpl.java
@@ -1,17 +1,16 @@
 package io.nutz.demo.dubbo.rpc.service.impl;
 
-import org.nutz.ioc.loader.annotation.Inject;
-import org.nutz.ioc.loader.annotation.IocBean;
-import org.nutz.log.Log;
-import org.nutz.log.Logs;
-
 import com.alibaba.dubbo.config.annotation.Reference;
 import com.alibaba.fescar.core.context.RootContext;
 import com.alibaba.fescar.spring.annotation.GlobalTransactional;
 
 import io.nutz.demo.dubbo.rpc.service.BusinessService;
 import io.nutz.demo.dubbo.rpc.service.OrderService;
 import io.nutz.demo.dubbo.rpc.service.StorageService;
+import org.nutz.ioc.loader.annotation.Inject;
+import org.nutz.ioc.loader.annotation.IocBean;
+import org.nutz.log.Log;
+import org.nutz.log.Logs;
 
 @IocBean
 public class BusinessServiceImpl implements BusinessService {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,7 +17,6 @@ @@
     package io.seata.samples.dubbo.starter;
     import io.seata.samples.dubbo.service.BusinessService;
     import org.springframework.context.support.ClassPathXmlApplicationContext;
     /**
@@ Expand Down @@