diff --git a/ruoyi-admin/src/main/resources/application-druid-root.yml b/ruoyi-admin/src/main/resources/application-druid-root.yml index 358ffe6..f483bad 100644 --- a/ruoyi-admin/src/main/resources/application-druid-root.yml +++ b/ruoyi-admin/src/main/resources/application-druid-root.yml @@ -6,8 +6,8 @@ spring: druid: # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true master: - url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true -# url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true +# url: jdbc:mysql://47.97.158.59:3306/catmdogf_test20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true + url: jdbc:mysql://47.97.158.59:3306/catmdogf_prod20250624?useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true username: root password: Qweruiop@123 # 从库数据源 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index e914046..0a713f2 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -20,7 +20,7 @@ ruoyi: # 开发环境配置.0 server: # 服务器的HTTP端口,默认为8080 - port: 8002 + port: 8080 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java index 8430222..51b1239 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java @@ -46,6 +46,18 @@ public class PayNotifyController { private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + @PostMapping("/callNotify") + public void callNotify() throws Exception { + PayNotifyMessageDTO message = new PayNotifyMessageDTO(); + message.setOutTradeNo(6506220475598848L); + message.setMemberId(37L); + message.setTradeStatus(Transaction.TradeStateEnum.SUCCESS); + message.setPayTime(new Date()); + message.setTradeNo("6506220475598849"); + h5OrderService.payCallBack(message); + } + + /** * 消费者下单 微信支付回调 * @param request diff --git a/ruoyi-mall/src/test/java/com/example/ruoyimall/RuoyiMallApplicationTests.java b/ruoyi-mall/src/test/java/com/example/ruoyimall/RuoyiMallApplicationTests.java index 5c1e9e3..6bdadac 100644 --- a/ruoyi-mall/src/test/java/com/example/ruoyimall/RuoyiMallApplicationTests.java +++ b/ruoyi-mall/src/test/java/com/example/ruoyimall/RuoyiMallApplicationTests.java @@ -1,13 +1,22 @@ package com.example.ruoyimall; +import com.cyl.h5.pojo.dto.PayNotifyMessageDTO; +import com.cyl.h5.service.H5OrderService; +import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import java.util.Date; + @SpringBootTest class RuoyiMallApplicationTests { @Test void contextLoads() { + + + } }