Browse Source

feat cloud确保调通

1 month ago
parent
commit
c1b9e6bd8c

+ 4 - 0
edu-travel-common/edu-travel-common-core/pom.xml

@@ -27,6 +27,10 @@
             <artifactId>mybatis-plus-extension</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+        </dependency>
+        <dependency>
             <groupId>edu.travel</groupId>
             <artifactId>edu-travel-common-resp</artifactId>
             <version>1.0-SNAPSHOT</version>

+ 4 - 0
edu-travel-common/edu-travel-common-core/src/main/java/edu/travel/web/BaseController.java

@@ -6,6 +6,7 @@ import edu.travel.interfaces.UpdateGroups;
 import edu.travel.resp.BaseResponse;
 import edu.travel.resp.PageResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ObjectError;
 import org.springframework.validation.annotation.Validated;
@@ -26,6 +27,7 @@ public class BaseController<T> {
      * @return
      */
     @PostMapping("/updateById")
+    @Transactional
     public BaseResponse<T> updateById(@Validated(UpdateGroups.class) @RequestBody T entity, Errors errors) {
         if (errors.hasErrors()) {
             List<ObjectError> allErrors = errors.getAllErrors();
@@ -40,6 +42,7 @@ public class BaseController<T> {
         return PageResponse.out(500,"error",entity);
     }
     @PostMapping("/save")
+    @Transactional
     public BaseResponse<T> save(@Validated(InsertGroups.class) @RequestBody T entity, Errors errors) {
         if (errors.hasErrors()) {
             List<ObjectError> allErrors = errors.getAllErrors();
@@ -54,6 +57,7 @@ public class BaseController<T> {
         return PageResponse.out(500,"error",entity);
     }
     @PostMapping("/deleteById")
+    @Transactional
     public BaseResponse<T> deleteById(@RequestBody List<String> ids) {
         if (ids == null || ids.isEmpty()) {
             return PageResponse.out(404,"error,not found delete data",null);

+ 5 - 0
edu-travel-common/edu-travel-common-datasource/pom.xml

@@ -30,5 +30,10 @@
             <groupId>com.alibaba</groupId>
             <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.seata</groupId>
+            <artifactId>seata-spring-boot-starter</artifactId>
+        </dependency>
+
     </dependencies>
 </project>

+ 12 - 0
edu-travel-gateway/pom.xml

@@ -19,6 +19,18 @@
 
     <dependencies>
         <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-sentinel-gateway</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-spring-cloud-gateway-adapter</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zipkin</artifactId>
         </dependency>

+ 4 - 1
edu-travel-gateway/src/main/resources/bootstrap-dev.yml

@@ -18,4 +18,7 @@ spring:
             refresh: true
           - data-id: whiteconfig.yaml
             group: DEFAULT_GROUP
-            refresh: true
+            refresh: true
+          - data-id: sentinel_gateway.yml
+            group: DEFAULT_GROUP
+            refresh: true

+ 28 - 0
edu-travel-oauth/pom.xml

@@ -31,6 +31,34 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-transport-simple-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-annotation-aspectj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-nacos</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-web-servlet</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>

+ 6 - 0
edu-travel-oauth/src/main/resources/bootstrap-dev.yml

@@ -24,4 +24,10 @@ spring:
             refresh: true
           - data-id: zipkin.yml
             group: DEFAULT_GROUP
+            refresh: true
+          - data-id: seata.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: sentinel_oauth.yaml
+            group: DEFAULT_GROUP
             refresh: true

+ 28 - 0
edu-travel-service/edu-travel-service-tenement/pom.xml

@@ -62,6 +62,34 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-transport-simple-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-annotation-aspectj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-alibaba-sentinel-datasource</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-datasource-nacos</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.csp</groupId>
+            <artifactId>sentinel-web-servlet</artifactId>
+        </dependency>
                 <dependency>
                     <groupId>edu.travel</groupId>
                     <artifactId>edu-travel-remote-tenant</artifactId>

+ 8 - 1
edu-travel-service/edu-travel-service-tenement/src/main/resources/bootstrap-dev.yml

@@ -24,4 +24,11 @@ spring:
             refresh: true
           - data-id: zipkin.yml
             group: DEFAULT_GROUP
-            refresh: true
+            refresh: true
+          - data-id: seata.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+          - data-id: sentinel_tenant.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+