diff --git a/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/service/OrderServiceImpl.java b/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/service/OrderServiceImpl.java index a7e32e34..ddec43a9 100644 --- a/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/service/OrderServiceImpl.java +++ b/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/service/OrderServiceImpl.java @@ -4,7 +4,7 @@ import cn.iocoder.springboot.lab53.accountservice.api.AccountService; import cn.iocoder.springboot.lab53.orderservice.api.OrderService; import cn.iocoder.springboot.lab53.orderservice.dao.OrderDao; import cn.iocoder.springboot.lab53.orderservice.entity.OrderDO; -import cn.iocoder.springboot.lab53.storageservice.api.ProductService; +import cn.iocoder.springboot.lab53.productservice.api.ProductService; import io.seata.core.context.RootContext; import io.seata.spring.annotation.GlobalTransactional; import org.apache.dubbo.config.annotation.Reference; diff --git a/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/storageservice/api/ProductService.java b/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/productservice/api/ProductService.java similarity index 84% rename from lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/storageservice/api/ProductService.java rename to lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/productservice/api/ProductService.java index 01e06909..86562f6e 100644 --- a/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/storageservice/api/ProductService.java +++ b/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/productservice/api/ProductService.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab53.storageservice.api; +package cn.iocoder.springboot.lab53.productservice.api; /** * 商品 Service diff --git a/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/service/ProductServiceImpl.java b/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/service/ProductServiceImpl.java index f864becf..3304a6d0 100644 --- a/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/service/ProductServiceImpl.java +++ b/lab-53/lab-53-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/service/ProductServiceImpl.java @@ -1,7 +1,7 @@ package cn.iocoder.springboot.lab53.productservice.service; import cn.iocoder.springboot.lab53.productservice.dao.ProductDao; -import cn.iocoder.springboot.lab53.storageservice.api.ProductService; +import cn.iocoder.springboot.lab53.productservice.api.ProductService; import io.seata.core.context.RootContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/pom.xml b/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/pom.xml deleted file mode 100644 index 3c8380b8..00000000 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - org.springframework.boot - spring-boot-starter-parent - 2.2.2.RELEASE - - - 4.0.0 - - labx-17-sca-seata-at-dubbo-demo-order-service - - - - cn.iocoder.springboot.labs - labx-17-sca-seata-at-dubbo-demo-order-service-api - 1.0-SNAPSHOT - - - cn.iocoder.springboot.labs - labx-17-sca-seata-at-dubbo-demo-account-service-api - 1.0-SNAPSHOT - - - cn.iocoder.springboot.labs - labx-17-sca-seata-at-dubbo-demo-product-service-api - 1.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-web - - - - - org.springframework.boot - spring-boot-starter-jdbc - - - mysql - mysql-connector-java - 5.1.48 - - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 2.1.2 - - - - - io.seata - seata-spring-boot-starter - 1.1.0 - - - - - org.apache.dubbo - dubbo - 2.7.4.1 - - - - org.apache.dubbo - dubbo-spring-boot-starter - 2.7.4.1 - - - - com.alibaba - dubbo-registry-nacos - 2.7.6 - - - - diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/pom.xml b/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/pom.xml deleted file mode 100644 index 14004fc3..00000000 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - org.springframework.boot - spring-boot-starter-parent - 2.2.2.RELEASE - - - 4.0.0 - - labx-17-sca-seata-at-dubbo-demo-product-service - - - - cn.iocoder.springboot.labs - labx-17-sca-seata-at-dubbo-demo-product-service-api - 1.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter - - - - - org.springframework.boot - spring-boot-starter-jdbc - - - mysql - mysql-connector-java - 5.1.48 - - - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - 2.1.2 - - - - - io.seata - seata-spring-boot-starter - 1.1.0 - - - - - org.apache.dubbo - dubbo - 2.7.4.1 - - - - org.apache.dubbo - dubbo-spring-boot-starter - 2.7.4.1 - - - - com.alibaba - dubbo-registry-nacos - 2.7.6 - - - - diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-account-service/src/main/resources/application-file.yaml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-account-service/src/main/resources/application-file.yaml index 85d71970..90b8d55f 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-account-service/src/main/resources/application-file.yaml +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-account-service/src/main/resources/application-file.yaml @@ -8,21 +8,27 @@ spring: username: root password: + cloud: + # Nacos 作为注册中心的配置项 + nacos: + discovery: + server-addr: 127.0.0.1:8848 + # dubbo 配置项，对应 DubboConfigurationProperties 配置类 dubbo: - # Dubbo 应用配置 - application: - name: ${spring.application.name} # 应用名 - # Dubbo 注册中心配 + # Dubbo 服务注册中心配置，对应 RegistryConfig 类 registry: - address: nacos://127.0.0.1:8848 # 注册中心地址。个鞥多注册中心，可见 http://dubbo.apache.org/zh-cn/docs/user/references/registry/introduction.html 文档。 + address: spring-cloud://127.0.0.1:8848 # 指定 Dubbo 服务注册中心的地址 # Dubbo 服务提供者协议配置 protocol: port: -1 # 协议端口。使用 -1 表示随机端口。 name: dubbo # 使用 `dubbo://` 协议。更多协议，可见 http://dubbo.apache.org/zh-cn/docs/user/references/protocol/introduction.html 文档 # 配置扫描 Dubbo 自定义的 @Service 注解，暴露成 Dubbo 服务提供者 scan: - base-packages: cn.iocoder.springboot.lab53.accountservice.service + base-packages: cn.iocoder.springcloudalibaba.labx17.accountservice.service + # Spring Cloud Alibaba Dubbo 专属配置项，对应 DubboCloudProperties 类 + cloud: + subscribed-services: '' # 设置订阅的应用列表，默认为 * 订阅所有应用。 # Seata 配置项，对应 SeataProperties 类 seata: diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service-api/pom.xml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service-api/pom.xml similarity index 100% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service-api/pom.xml rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service-api/pom.xml diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service-api/src/main/java/cn/iocoder/springboot/lab53/orderservice/api/OrderService.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service-api/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/api/OrderService.java similarity index 85% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service-api/src/main/java/cn/iocoder/springboot/lab53/orderservice/api/OrderService.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service-api/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/api/OrderService.java index 34cb0eb8..cb82ece6 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service-api/src/main/java/cn/iocoder/springboot/lab53/orderservice/api/OrderService.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service-api/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/api/OrderService.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab53.orderservice.api; +package cn.iocoder.springcloudalibaba.labx17.orderservice.api; /** * 订单 Service diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/pom.xml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/pom.xml new file mode 100644 index 00000000..009dad07 --- /dev/null +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/pom.xml @@ -0,0 +1,118 @@ + + + + org.springframework.boot + spring-boot-starter-parent + 2.2.2.RELEASE + + + 4.0.0 + + labx-17-sca-seata-at-dubbo-demo-order-service + + + 1.8 + 1.8 + 2.2.4.RELEASE + Hoxton.SR1 + 2.2.0.RELEASE + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring.cloud.alibaba.version} + pom + import + + + + + + + cn.iocoder.springboot.labs + labx-17-sca-seata-at-dubbo-demo-order-service-api + 1.0-SNAPSHOT + + + cn.iocoder.springboot.labs + labx-17-sca-seata-at-dubbo-demo-account-service-api + 1.0-SNAPSHOT + + + cn.iocoder.springboot.labs + labx-17-sca-seata-at-dubbo-demo-product-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + mysql + mysql-connector-java + 5.1.48 + + + com.alibaba + druid-spring-boot-starter + 1.1.10 + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.1.2 + + + + + com.alibaba.cloud + spring-cloud-alibaba-seata + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-dubbo + + + + diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/OrderServiceApplication.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/OrderServiceApplication.java similarity index 83% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/OrderServiceApplication.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/OrderServiceApplication.java index bf9b2ddf..4cc8a7fc 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/OrderServiceApplication.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/OrderServiceApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab53.orderservice; +package cn.iocoder.springcloudalibaba.labx17.orderservice; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/controller/OrderController.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/controller/OrderController.java similarity index 87% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/controller/OrderController.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/controller/OrderController.java index ccbef5c6..578f2994 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/controller/OrderController.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/controller/OrderController.java @@ -1,6 +1,6 @@ -package cn.iocoder.springboot.lab53.orderservice.controller; +package cn.iocoder.springcloudalibaba.labx17.orderservice.controller; -import cn.iocoder.springboot.lab53.orderservice.api.OrderService; +import cn.iocoder.springcloudalibaba.labx17.orderservice.api.OrderService; import org.apache.dubbo.config.annotation.Reference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/dao/OrderDao.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/dao/OrderDao.java similarity index 80% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/dao/OrderDao.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/dao/OrderDao.java index 2c0518bf..a0b5cbd8 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/dao/OrderDao.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/dao/OrderDao.java @@ -1,6 +1,6 @@ -package cn.iocoder.springboot.lab53.orderservice.dao; +package cn.iocoder.springcloudalibaba.labx17.orderservice.dao; -import cn.iocoder.springboot.lab53.orderservice.entity.OrderDO; +import cn.iocoder.springcloudalibaba.labx17.orderservice.entity.OrderDO; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Options; diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/entity/OrderDO.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/entity/OrderDO.java similarity index 93% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/entity/OrderDO.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/entity/OrderDO.java index 4ff509e4..590290ed 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/entity/OrderDO.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/entity/OrderDO.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab53.orderservice.entity; +package cn.iocoder.springcloudalibaba.labx17.orderservice.entity; /** * 订单实体 diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/service/OrderServiceImpl.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/service/OrderServiceImpl.java similarity index 75% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/service/OrderServiceImpl.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/service/OrderServiceImpl.java index a7e32e34..d91a1790 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springboot/lab53/orderservice/service/OrderServiceImpl.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/orderservice/service/OrderServiceImpl.java @@ -1,10 +1,10 @@ -package cn.iocoder.springboot.lab53.orderservice.service; +package cn.iocoder.springcloudalibaba.labx17.orderservice.service; -import cn.iocoder.springboot.lab53.accountservice.api.AccountService; -import cn.iocoder.springboot.lab53.orderservice.api.OrderService; -import cn.iocoder.springboot.lab53.orderservice.dao.OrderDao; -import cn.iocoder.springboot.lab53.orderservice.entity.OrderDO; -import cn.iocoder.springboot.lab53.storageservice.api.ProductService; +import cn.iocoder.springcloudalibaba.labx17.accountservice.api.AccountService; +import cn.iocoder.springcloudalibaba.labx17.orderservice.api.OrderService; +import cn.iocoder.springcloudalibaba.labx17.orderservice.dao.OrderDao; +import cn.iocoder.springcloudalibaba.labx17.orderservice.entity.OrderDO; +import cn.iocoder.springcloudalibaba.labx17.producctservice.api.ProductService; import io.seata.core.context.RootContext; import io.seata.spring.annotation.GlobalTransactional; import org.apache.dubbo.config.annotation.Reference; diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/resources/application-file.yaml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/resources/application-file.yaml similarity index 68% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/resources/application-file.yaml rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/resources/application-file.yaml index b8616381..719a9956 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/resources/application-file.yaml +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/resources/application-file.yaml @@ -11,21 +11,27 @@ spring: username: root password: + cloud: + # Nacos 作为注册中心的配置项 + nacos: + discovery: + server-addr: 127.0.0.1:8848 + # dubbo 配置项，对应 DubboConfigurationProperties 配置类 dubbo: - # Dubbo 应用配置 - application: - name: ${spring.application.name} # 应用名 - # Dubbo 注册中心配 + # Dubbo 服务注册中心配置，对应 RegistryConfig 类 registry: - address: nacos://127.0.0.1:8848 # 注册中心地址。个鞥多注册中心，可见 http://dubbo.apache.org/zh-cn/docs/user/references/registry/introduction.html 文档。 + address: spring-cloud://127.0.0.1:8848 # 指定 Dubbo 服务注册中心的地址 # Dubbo 服务提供者协议配置 protocol: port: -1 # 协议端口。使用 -1 表示随机端口。 name: dubbo # 使用 `dubbo://` 协议。更多协议，可见 http://dubbo.apache.org/zh-cn/docs/user/references/protocol/introduction.html 文档 # 配置扫描 Dubbo 自定义的 @Service 注解，暴露成 Dubbo 服务提供者 scan: - base-packages: cn.iocoder.springboot.lab53.orderservice.service + base-packages: cn.iocoder.springcloudalibaba.labx17.orderservice.service + # Spring Cloud Alibaba Dubbo 专属配置项，对应 DubboCloudProperties 类 + cloud: + subscribed-services: account-service, product-service # 设置订阅的应用列表，默认为 * 订阅所有应用。 # Seata 配置项，对应 SeataProperties 类 seata: diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/resources/application.yaml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/resources/application.yaml similarity index 71% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/resources/application.yaml rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/resources/application.yaml index 9ff3e7c8..8bc338d0 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-order-service/src/main/resources/application.yaml +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-order-service/src/main/resources/application.yaml @@ -11,21 +11,27 @@ spring: username: root password: + cloud: + # Nacos 作为注册中心的配置项 + nacos: + discovery: + server-addr: 127.0.0.1:8848 + # dubbo 配置项，对应 DubboConfigurationProperties 配置类 dubbo: - # Dubbo 应用配置 - application: - name: ${spring.application.name} # 应用名 - # Dubbo 注册中心配 + # Dubbo 服务注册中心配置，对应 RegistryConfig 类 registry: - address: nacos://127.0.0.1:8848 # 注册中心地址。个鞥多注册中心，可见 http://dubbo.apache.org/zh-cn/docs/user/references/registry/introduction.html 文档。 + address: spring-cloud://127.0.0.1:8848 # 指定 Dubbo 服务注册中心的地址 # Dubbo 服务提供者协议配置 protocol: port: -1 # 协议端口。使用 -1 表示随机端口。 name: dubbo # 使用 `dubbo://` 协议。更多协议，可见 http://dubbo.apache.org/zh-cn/docs/user/references/protocol/introduction.html 文档 # 配置扫描 Dubbo 自定义的 @Service 注解，暴露成 Dubbo 服务提供者 scan: - base-packages: cn.iocoder.springboot.lab53.orderservice.service + base-packages: cn.iocoder.springcloudalibaba.labx17.orderservice.service + # Spring Cloud Alibaba Dubbo 专属配置项，对应 DubboCloudProperties 类 + cloud: + subscribed-services: account-service, product-service # 设置订阅的应用列表，默认为 * 订阅所有应用。 # Seata 配置项，对应 SeataProperties 类 seata: diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/pom.xml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service-api/pom.xml similarity index 100% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/pom.xml rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service-api/pom.xml diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/storageservice/api/ProductService.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springcloudalibaba/labx17/producctservice/api/ProductService.java similarity index 82% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/storageservice/api/ProductService.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springcloudalibaba/labx17/producctservice/api/ProductService.java index 01e06909..e3eb4a3b 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springboot/lab53/storageservice/api/ProductService.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service-api/src/main/java/cn/iocoder/springcloudalibaba/labx17/producctservice/api/ProductService.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab53.storageservice.api; +package cn.iocoder.springcloudalibaba.labx17.producctservice.api; /** * 商品 Service diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/pom.xml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/pom.xml new file mode 100644 index 00000000..e2d202f6 --- /dev/null +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/pom.xml @@ -0,0 +1,108 @@ + + + + org.springframework.boot + spring-boot-starter-parent + 2.2.2.RELEASE + + + 4.0.0 + + labx-17-sca-seata-at-dubbo-demo-product-service + + + 1.8 + 1.8 + 2.2.4.RELEASE + Hoxton.SR1 + 2.2.0.RELEASE + + + + + + + org.springframework.boot + spring-boot-starter-parent + ${spring.boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring.cloud.alibaba.version} + pom + import + + + + + + + cn.iocoder.springboot.labs + labx-17-sca-seata-at-dubbo-demo-product-service-api + 1.0-SNAPSHOT + + + + + org.springframework.boot + spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-jdbc + + + mysql + mysql-connector-java + 5.1.48 + + + com.alibaba + druid-spring-boot-starter + 1.1.10 + + + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + 2.1.2 + + + + + com.alibaba.cloud + spring-cloud-alibaba-seata + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-dubbo + + + + diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/ProductServiceApplication.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/ProductServiceApplication.java similarity index 83% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/ProductServiceApplication.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/ProductServiceApplication.java index 0f286bb1..cfaabeab 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/ProductServiceApplication.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/ProductServiceApplication.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab53.productservice; +package cn.iocoder.springcloudalibaba.labx17.productservice; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/dao/ProductDao.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/dao/ProductDao.java similarity index 92% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/dao/ProductDao.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/dao/ProductDao.java index df404727..935fd5ea 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/dao/ProductDao.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/dao/ProductDao.java @@ -1,4 +1,4 @@ -package cn.iocoder.springboot.lab53.productservice.dao; +package cn.iocoder.springcloudalibaba.labx17.productservice.dao; import org.apache.ibatis.annotations.Mapper; diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/service/ProductServiceImpl.java b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/service/ProductServiceImpl.java similarity index 87% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/service/ProductServiceImpl.java rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/service/ProductServiceImpl.java index f864becf..f301f6cc 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springboot/lab53/productservice/service/ProductServiceImpl.java +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/java/cn/iocoder/springcloudalibaba/labx17/productservice/service/ProductServiceImpl.java @@ -1,7 +1,7 @@ -package cn.iocoder.springboot.lab53.productservice.service; +package cn.iocoder.springcloudalibaba.labx17.productservice.service; -import cn.iocoder.springboot.lab53.productservice.dao.ProductDao; -import cn.iocoder.springboot.lab53.storageservice.api.ProductService; +import cn.iocoder.springcloudalibaba.labx17.producctservice.api.ProductService; +import cn.iocoder.springcloudalibaba.labx17.productservice.dao.ProductDao; import io.seata.core.context.RootContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/resources/application-file.yaml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/resources/application-file.yaml similarity index 69% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/resources/application-file.yaml rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/resources/application-file.yaml index 63068ae2..01de8171 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/resources/application-file.yaml +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/resources/application-file.yaml @@ -8,21 +8,27 @@ spring: username: root password: + cloud: + # Nacos 作为注册中心的配置项 + nacos: + discovery: + server-addr: 127.0.0.1:8848 + # dubbo 配置项，对应 DubboConfigurationProperties 配置类 dubbo: - # Dubbo 应用配置 - application: - name: ${spring.application.name} # 应用名 - # Dubbo 注册中心配 + # Dubbo 服务注册中心配置，对应 RegistryConfig 类 registry: - address: nacos://127.0.0.1:8848 # 注册中心地址。个鞥多注册中心，可见 http://dubbo.apache.org/zh-cn/docs/user/references/registry/introduction.html 文档。 + address: spring-cloud://127.0.0.1:8848 # 指定 Dubbo 服务注册中心的地址 # Dubbo 服务提供者协议配置 protocol: port: -1 # 协议端口。使用 -1 表示随机端口。 name: dubbo # 使用 `dubbo://` 协议。更多协议，可见 http://dubbo.apache.org/zh-cn/docs/user/references/protocol/introduction.html 文档 # 配置扫描 Dubbo 自定义的 @Service 注解，暴露成 Dubbo 服务提供者 scan: - base-packages: cn.iocoder.springboot.lab53.productservice.service + base-packages: cn.iocoder.springcloudalibaba.labx17.productservice.service + # Spring Cloud Alibaba Dubbo 专属配置项，对应 DubboCloudProperties 类 + cloud: + subscribed-services: '' # 设置订阅的应用列表，默认为 * 订阅所有应用。 # Seata 配置项，对应 SeataProperties 类 seata: diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/resources/application.yaml b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/resources/application.yaml similarity index 72% rename from labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/resources/application.yaml rename to labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/resources/application.yaml index 614d80a6..b420187f 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/lab-53-seata-at-dubbo-demo-product-service/src/main/resources/application.yaml +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/labx-17-sca-seata-at-dubbo-demo-product-service/src/main/resources/application.yaml @@ -8,21 +8,27 @@ spring: username: root password: + cloud: + # Nacos 作为注册中心的配置项 + nacos: + discovery: + server-addr: 127.0.0.1:8848 + # dubbo 配置项，对应 DubboConfigurationProperties 配置类 dubbo: - # Dubbo 应用配置 - application: - name: ${spring.application.name} # 应用名 - # Dubbo 注册中心配 + # Dubbo 服务注册中心配置，对应 RegistryConfig 类 registry: - address: nacos://127.0.0.1:8848 # 注册中心地址。个鞥多注册中心，可见 http://dubbo.apache.org/zh-cn/docs/user/references/registry/introduction.html 文档。 + address: spring-cloud://127.0.0.1:8848 # 指定 Dubbo 服务注册中心的地址 # Dubbo 服务提供者协议配置 protocol: port: -1 # 协议端口。使用 -1 表示随机端口。 name: dubbo # 使用 `dubbo://` 协议。更多协议，可见 http://dubbo.apache.org/zh-cn/docs/user/references/protocol/introduction.html 文档 # 配置扫描 Dubbo 自定义的 @Service 注解，暴露成 Dubbo 服务提供者 scan: - base-packages: cn.iocoder.springboot.lab53.productservice.service + base-packages: cn.iocoder.springcloudalibaba.labx17.productservice.service + # Spring Cloud Alibaba Dubbo 专属配置项，对应 DubboCloudProperties 类 + cloud: + subscribed-services: '' # 设置订阅的应用列表，默认为 * 订阅所有应用。 # Seata 配置项，对应 SeataProperties 类 seata: diff --git a/labx-17/labx-17-sca-seata-at-dubbo-demo/pom.xml b/labx-17/labx-17-sca-seata-at-dubbo-demo/pom.xml index f8331c92..591dede9 100644 --- a/labx-17/labx-17-sca-seata-at-dubbo-demo/pom.xml +++ b/labx-17/labx-17-sca-seata-at-dubbo-demo/pom.xml @@ -14,6 +14,10 @@ labx-17-sca-seata-at-dubbo-demo-account-service-api labx-17-sca-seata-at-dubbo-demo-account-service + labx-17-sca-seata-at-dubbo-demo-product-service-api + labx-17-sca-seata-at-dubbo-demo-product-service + labx-17-sca-seata-at-dubbo-demo-order-service-api + labx-17-sca-seata-at-dubbo-demo-order-service