diff --git a/pom.xml b/pom.xml index 530db57..0c18960 100644 --- a/pom.xml +++ b/pom.xml @@ -75,6 +75,11 @@ spring-cloud-starter-alibaba-nacos-discovery + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + org.springframework.cloud spring-cloud-commons diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index 78a9172..cd61e36 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -607,7 +607,7 @@ public class OrderServiceImpl implements OrderService { } LambdaQueryWrapper querySubWrapper2 = new LambdaQueryWrapper<>(); querySubWrapper2.eq(OrderSubPO::getOrderId, orderMainPO.getOrderId()) - .eq(OrderSubPO::getPayStatus, PayStatusEnum.SUCCESS.getCode()).orderByDesc(OrderSubPO::getCreateTime); + .eq(OrderSubPO::getPayStatus, PayStatusEnum.SUCCESS.getCode()).orderByDesc(OrderSubPO::getUpdateTime); List orderSubPOList2 = orderSubRepo.list(querySubWrapper2); if(!CollectionUtils.isEmpty(orderSubPOList2)){ orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId()); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e55c478..44e9dbf 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,90 +1,6 @@ -server: - port: 8088 spring: application: name: sczx-order # 微服务名称 - http: - encoding: - charset: UTF-8 - enabled: true - force: true - mvc: - async: - request-timeout: -1 - jackson: - date-format: yyyy-MM-dd HH:mm:ss - time-zone: GMT+8 - cloud: - nacos: - discovery: - server-addr: 115.190.8.52:8848 # Nacos 地址 - group: DEFAULT_GROUP - metadata: - version: 1.0.0 - env: dev - lifecycle: - timeout-per-shutdown-phase: 30s # 设置优雅停机时间 - datasource: - url: jdbc:mysql://115.190.8.52:3306/sczx?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true - username: sczx_user - password: Sczx123@ - driver-class-name: com.mysql.cj.jdbc.Driver - hikari: - maximum-pool-size: 20 # 最大连接数 - minimum-idle: 5 # 最小空闲连接数 - connection-timeout: 30000 # 连接超时时间(毫秒) - idle-timeout: 600000 # 空闲连接超时时间(毫秒) - max-lifetime: 1800000 # 连接最大存活时间(毫秒) - leak-detection-threshold: 60000 # 连接泄漏检测阈值(毫秒) - auto-commit: true - redis: - host: 115.190.8.52 - port: 6379 - database: 0 - lettuce: - pool: - max-active: 8 - max-wait: 2000ms - max-idle: 4 - min-idle: 1 - max-life-time: 300000ms -management: - endpoints: - web: - exposure: - include: "*" # 暴露所有监控端点 - endpoint: - health: - show-details: always - -feign: - client: - config: - default: - connectTimeout: 5000 - readTimeout: 5000 - hystrix: - enabled: true # 启用 Feign 的 Hystrix 支持 - -hystrix: - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 10000 # 默认熔断超时时间 - - -mybatis-plus: - mapper-locations: classpath*:mapper/**/*.xml - type-aliases-package: com.sczx.order.po # 实体类包路径 - configuration: - mapUnderscoreToCamelCase: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 控制台打印 SQL(调试用) - -auth: - secret-key: his-is-a-very-long-and-secure-secret-key-for-jwt-signing-please-dont-use-short-keys - token-expiration: 86400000 # 24小时 diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..c17f377 --- /dev/null +++ b/src/main/resources/bootstrap.yml @@ -0,0 +1,15 @@ +spring: + application: + name: sczx-order # 应用名称,对应 Nacos 配置的 dataId + cloud: + nacos: + server-addr: 115.190.8.52:8848 # Nacos 服务器地址 + config: + group: DEFAULT_GROUP # 配置分组 + file-extension: yaml # 配置文件格式 + timeout: 5000 # 配置读取超时时间 + # 添加共享配置 + shared-configs: + - data-id: shared-config.yaml + group: DEFAULT_GROUP + refresh: true # 是否支持动态刷新 \ No newline at end of file