From 03ee0616a508ecece59e40d55d524775f038a0b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=A7=E6=98=9F=E9=95=BFzolay?= Date: Wed, 15 Apr 2026 18:06:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(seata):=20=E4=BF=AE=E5=A4=8Dseata=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E9=A1=B9=E7=9B=AE=E4=BD=99=E9=A2=9D=E4=B8=8D=E8=B6=B3?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E5=9B=9E=E6=BB=9A?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98=20fix=20#9287?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SeataAccountController.java | 5 +++-- .../account/service/SeataAccountService.java | 4 +++- .../service/impl/SeataAccountServiceImpl.java | 6 ++++-- .../src/main/resources/application.yml | 6 +++--- .../test/seata/order/feign/AccountClient.java | 3 ++- .../test/seata/order/feign/ProductClient.java | 3 ++- .../service/impl/SeataOrderServiceImpl.java | 20 ++++++++++++++----- .../src/main/resources/application.yml | 6 +++--- .../controller/SeataProductController.java | 3 ++- .../product/service/SeataProductService.java | 4 +++- .../service/impl/SeataProductServiceImpl.java | 7 ++++--- .../src/main/resources/application.yml | 13 ++++++++++-- 12 files changed, 55 insertions(+), 25 deletions(-) diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.java index 2653a0897..82fd3d894 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/controller/SeataAccountController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.test.seata.account.controller; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.test.seata.account.service.SeataAccountService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -20,7 +21,7 @@ public class SeataAccountController { private SeataAccountService accountService; @PostMapping("/reduceBalance") - public void reduceBalance(Long userId, BigDecimal amount) { - accountService.reduceBalance(userId, amount); + public Result reduceBalance(Long userId, BigDecimal amount) { + return accountService.reduceBalance(userId, amount); } } diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/SeataAccountService.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/SeataAccountService.java index 008b0b6c5..aea6953df 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/SeataAccountService.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/SeataAccountService.java @@ -1,5 +1,7 @@ package org.jeecg.modules.test.seata.account.service; +import org.jeecg.common.api.vo.Result; + import java.math.BigDecimal; /** @@ -14,5 +16,5 @@ public interface SeataAccountService { * @param userId 用户 ID * @param amount 扣减金额 */ - void reduceBalance(Long userId, BigDecimal amount); + Result reduceBalance(Long userId, BigDecimal amount); } diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.java index fd5c2f14a..306e4e358 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/java/org/jeecg/modules/test/seata/account/service/impl/SeataAccountServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import io.seata.core.context.RootContext; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.test.seata.account.entity.SeataAccount; import org.jeecg.modules.test.seata.account.mapper.SeataAccountMapper; import org.jeecg.modules.test.seata.account.service.SeataAccountService; @@ -34,7 +35,7 @@ public class SeataAccountServiceImpl implements SeataAccountService { @DS("account") @Override @Transactional(propagation = Propagation.REQUIRES_NEW,rollbackFor = Exception.class) - public void reduceBalance(Long userId, BigDecimal amount) { + public Result reduceBalance(Long userId, BigDecimal amount) { log.info("xid:"+ RootContext.getXID()); log.info("=============ACCOUNT START================="); SeataAccount account = accountMapper.selectById(userId); @@ -44,7 +45,7 @@ public class SeataAccountServiceImpl implements SeataAccountService { if (balance.compareTo(amount)==-1) { log.warn("用户 {} 余额不足，当前余额:{}", userId, balance); - throw new RuntimeException("余额不足"); + return Result.error("余额不足"); } log.info("开始扣减用户 {} 余额", userId); BigDecimal currentBalance = account.getBalance().subtract(amount); @@ -52,5 +53,6 @@ public class SeataAccountServiceImpl implements SeataAccountService { accountMapper.updateById(account); log.info("扣减用户 {} 余额成功,扣减后用户账户余额为{}", userId, currentBalance); log.info("=============ACCOUNT END================="); + return Result.OK(); } } diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.yml b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.yml index e494597ce..82091ecde 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.yml +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-account/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: data: redis: ##redis 单机环境配置 - host: localhost + host: jeecg-boot-redis port: 6379 database: 0 password: @@ -22,7 +22,7 @@ spring: autoconfigure: exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration datasource: - url: jdbc:mysql://127.0.0.1:3306/jeecg_account?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true + url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg_account?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: root driver-class-name: com.mysql.cj.jdbc.Driver @@ -30,7 +30,7 @@ spring: init: schema-locations: classpath:sql/schema-account.sql seata: - enable-auto-data-source-proxy: false + enable-auto-data-source-proxy: true service: grouplist: default: 127.0.0.1:8091 diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/AccountClient.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/AccountClient.java index bff3d030a..dd194642c 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/AccountClient.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/AccountClient.java @@ -1,5 +1,6 @@ package org.jeecg.modules.test.seata.order.feign; +import org.jeecg.common.api.vo.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -19,5 +20,5 @@ public interface AccountClient { * @return */ @PostMapping("/test/seata/account/reduceBalance") - String reduceBalance(@RequestParam("userId") Long userId, @RequestParam("amount") BigDecimal amount); + Result reduceBalance(@RequestParam("userId") Long userId, @RequestParam("amount") BigDecimal amount); } diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/ProductClient.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/ProductClient.java index ffc8d7ef8..4edfd67c2 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/ProductClient.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/feign/ProductClient.java @@ -1,5 +1,6 @@ package org.jeecg.modules.test.seata.order.feign; +import org.jeecg.common.api.vo.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -21,5 +22,5 @@ public interface ProductClient { * @return */ @PostMapping("/test/seata/product/reduceStock") - BigDecimal reduceStock(@RequestParam("productId") Long productId, @RequestParam("count") Integer count); + Result reduceStock(@RequestParam("productId") Long productId, @RequestParam("count") Integer count); } diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.java index 8c68dedc9..e40b5312d 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/java/org/jeecg/modules/test/seata/order/service/impl/SeataOrderServiceImpl.java @@ -5,6 +5,9 @@ import com.baomidou.dynamic.datasource.annotation.DS; import io.seata.core.context.RootContext; import io.seata.spring.annotation.GlobalTransactional; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.exception.JeecgBootBizTipException; +import org.jeecg.common.util.oConvertUtils; import org.jeecg.modules.test.seata.order.dto.PlaceOrderRequest; import org.jeecg.modules.test.seata.order.entity.SeataOrder; import org.jeecg.modules.test.seata.order.enums.OrderStatus; @@ -59,13 +62,20 @@ public class SeataOrderServiceImpl implements SeataOrderService { orderMapper.insert(order); log.info("订单一阶段生成，等待扣库存付款中"); // 扣减库存并计算总价 - BigDecimal amount = productClient.reduceStock(productId, count); + Result productRes = productClient.reduceStock(productId, count); + if (!productRes.isSuccess()) { + String message = productRes.getMessage(); + message = oConvertUtils.isEmpty(message) ? "操作失败" : message; + throw new JeecgBootBizTipException(message); + } + BigDecimal amount = productRes.getResult(); // 扣减余额 - String str = accountClient.reduceBalance(userId, amount); + Result accountRes = accountClient.reduceBalance(userId, amount); // feign响应被二次封装，判断使主事务回滚 - JSONObject jsonObject = JSONObject.parseObject(str); - if (jsonObject.getInteger("code") != 200) { - throw new RuntimeException(); + if (!accountRes.isSuccess()) { + String message = accountRes.getMessage(); + message = oConvertUtils.isEmpty(message) ? "操作失败" : message; + throw new JeecgBootBizTipException(message); } order.setStatus(OrderStatus.SUCCESS); diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.yml b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.yml index 0443d879b..8efbef029 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.yml +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-order/src/main/resources/application.yml @@ -4,7 +4,7 @@ spring: data: redis: ##redis 单机环境配置 - host: localhost + host: jeecg-boot-redis port: 6379 database: 0 password: @@ -23,14 +23,14 @@ spring: exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/jeecg_order?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useSSL=false + url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg_order?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: root sql: init: schema-locations: classpath:sql/schema-order.sql seata: - enable-auto-data-source-proxy: false + enable-auto-data-source-proxy: true service: grouplist: default: 127.0.0.1:8091 diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/controller/SeataProductController.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/controller/SeataProductController.java index c858a207e..166359a49 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/controller/SeataProductController.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/controller/SeataProductController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.test.seata.product.controller; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.test.seata.product.service.SeataProductService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -20,7 +21,7 @@ public class SeataProductController { private SeataProductService seataProductService; @PostMapping("/reduceStock") - public BigDecimal reduceStock(Long productId, Integer count, HttpServletRequest request) { + public Result reduceStock(Long productId, Integer count, HttpServletRequest request) { return seataProductService.reduceStock(productId, count); } } diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/SeataProductService.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/SeataProductService.java index a2cba391d..4f2b9f98c 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/SeataProductService.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/SeataProductService.java @@ -1,5 +1,7 @@ package org.jeecg.modules.test.seata.product.service; +import org.jeecg.common.api.vo.Result; + import java.math.BigDecimal; /** @@ -16,5 +18,5 @@ public interface SeataProductService { * @param count 扣减数量 * @return 商品总价 */ - BigDecimal reduceStock(Long productId, Integer count); + Result reduceStock(Long productId, Integer count); } diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.java b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.java index 3c50042df..62971df99 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.java +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/java/org/jeecg/modules/test/seata/product/service/impl/SeataProductServiceImpl.java @@ -5,6 +5,7 @@ import io.seata.core.context.RootContext; import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; import org.jeecg.modules.test.seata.product.entity.SeataProduct; import org.jeecg.modules.test.seata.product.mapper.SeataProductMapper; import org.jeecg.modules.test.seata.product.service.SeataProductService; @@ -35,7 +36,7 @@ public class SeataProductServiceImpl implements SeataProductService { @DS("product") @Transactional(propagation = Propagation.REQUIRES_NEW,rollbackFor = Exception.class) @Override - public BigDecimal reduceStock(Long productId, Integer count) { + public Result reduceStock(Long productId, Integer count) { log.info("xid:"+ RootContext.getXID()); log.info("=============PRODUCT START================="); // 检查库存 @@ -46,7 +47,7 @@ public class SeataProductServiceImpl implements SeataProductService { if (stock < count) { log.warn("商品编号为{} 库存不足，当前库存:{}", productId, stock); - throw new RuntimeException("库存不足"); + return Result.error("库存不足"); } log.info("开始扣减商品编号为 {} 库存,单价商品价格为{}", productId, product.getPrice()); // 扣减库存 @@ -56,6 +57,6 @@ public class SeataProductServiceImpl implements SeataProductService { BigDecimal totalPrice = product.getPrice().multiply(new BigDecimal(count)); log.info("扣减商品编号为 {} 库存成功,扣减后库存为{}, {} 件商品总价为 {} ", productId, currentStock, count, totalPrice); log.info("=============PRODUCT END================="); - return totalPrice; + return Result.OK(totalPrice); } } \ No newline at end of file diff --git a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.yml b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.yml index 15b765e95..d478efa1e 100644 --- a/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.yml +++ b/jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/jeecg-cloud-test-seata-product/src/main/resources/application.yml @@ -1,6 +1,15 @@ server: port: 5003 spring: + data: + redis: + ##redis 单机环境配置 + host: jeecg-boot-redis + port: 6379 + database: 0 + password: + ssl: + enabled: false application: name: seata-product cloud: @@ -14,14 +23,14 @@ spring: exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/jeecg_product?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&useSSL=false + url: jdbc:mysql://jeecg-boot-mysql:3306/jeecg_product?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai username: root password: root sql: init: schema-locations: classpath:sql/schema-product.sql seata: - enable-auto-data-source-proxy: false + enable-auto-data-source-proxy: true service: grouplist: default: 127.0.0.1:8091