Merge remote-tracking branch 'origin/master'

Divinus5663 · Feb 7, 2020 · cb4dde7 · cb4dde7
2 parents bdadf49 + 67df6ea
commit cb4dde7
Show file tree

Hide file tree

Showing 82 changed files with 2,474 additions and 385 deletions.
diff --git a/...order-provider/src/main/java/com/gupaoedu/seata/orderprovider/config/SeataAutoConfig.java b/...order-provider/src/main/java/com/gupaoedu/seata/orderprovider/config/SeataAutoConfig.java
diff --git a/...e-rest-web/src/main/java/com/gupaoedu/seata/web/samplerestweb/config/SeataAutoConfig.java b/...e-rest-web/src/main/java/com/gupaoedu/seata/web/samplerestweb/config/SeataAutoConfig.java
diff --git a/seata-sample/sample-rest-web/src/main/resources/application.yml b/seata-sample/sample-rest-web/src/main/resources/application.yml
@@ -6,8 +6,6 @@ dubbo:
 spring:
   application:
     name: sample-rest-web
-  aop:
-    proxy-target-class: true
 
 seata:
   enabled: true

diff --git a/seata-sample/spring-boot-demo/pom.xml b/seata-sample/spring-boot-demo/pom.xml
diff --git a/...spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo01/ConfigurationDemo.java b/...spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo01/ConfigurationDemo.java
diff --git a/...spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo01/ConfigurationMain.java b/...spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo01/ConfigurationMain.java
diff --git a/...-sample/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo01/DemoClass.java b/...-sample/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo01/DemoClass.java
diff --git a/...mple/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo02/DefaultClass.java b/...mple/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo02/DefaultClass.java
diff --git a/...mple/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo02/SpringConfig.java b/...mple/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo02/SpringConfig.java
diff --git a/...sample/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo03/EnableMain.java b/...sample/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo03/EnableMain.java
diff --git a/...ple/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo03/EnableService.java b/...ple/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo03/EnableService.java
diff --git a/.../spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo03/GpImportSelector.java b/.../spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo03/GpImportSelector.java
diff --git a/...ample/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo03/TestService.java b/...ample/spring-boot-demo/src/main/java/com/gupaoedu/springboot/demo/demo03/TestService.java
diff --git a/...-boot-demo/src/main/java/com/gupaoedu/springboot/demo/springbootdemo/HelloController.java b/...-boot-demo/src/main/java/com/gupaoedu/springboot/demo/springbootdemo/HelloController.java
diff --git a/.../src/main/java/com/gupaoedu/springboot/demo/springbootdemo/SpringBootDemoApplication.java b/.../src/main/java/com/gupaoedu/springboot/demo/springbootdemo/SpringBootDemoApplication.java
diff --git a/seata-sample/spring-boot-demo/src/main/resources/application.properties b/seata-sample/spring-boot-demo/src/main/resources/application.properties