Browse Source

Changes

master
主管理员 3 weeks ago
parent
commit
ba8464ec5c
4 changed files with 24 additions and 3 deletions
  1. +2
    -2
      ruoyi-admin/src/main/resources/application-druid-root.yml
  2. +1
    -1
      ruoyi-admin/src/main/resources/application.yml
  3. +12
    -0
      ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java
  4. +9
    -0
      ruoyi-mall/src/test/java/com/example/ruoyimall/RuoyiMallApplicationTests.java

+ 2
- 2
ruoyi-admin/src/main/resources/application-druid-root.yml View File

@ -6,8 +6,8 @@ spring:
druid: druid:
# 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true # 主库数据源 jdbc:mysql://localhost:3306/catmdogf?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
master: 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 username: root
password: Qweruiop@123 password: Qweruiop@123
# 从库数据源 # 从库数据源


+ 1
- 1
ruoyi-admin/src/main/resources/application.yml View File

@ -20,7 +20,7 @@ ruoyi:
# 开发环境配置.0 # 开发环境配置.0
server: server:
# 服务器的HTTP端口,默认为8080 # 服务器的HTTP端口,默认为8080
port: 8002
port: 8080
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /


+ 12
- 0
ruoyi-mall/src/main/java/com/cyl/h5/controller/PayNotifyController.java View File

@ -46,6 +46,18 @@ public class PayNotifyController {
private final SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); 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 * @param request


+ 9
- 0
ruoyi-mall/src/test/java/com/example/ruoyimall/RuoyiMallApplicationTests.java View File

@ -1,13 +1,22 @@
package com.example.ruoyimall; 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.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest;
import java.util.Date;
@SpringBootTest @SpringBootTest
class RuoyiMallApplicationTests { class RuoyiMallApplicationTests {
@Test @Test
void contextLoads() { void contextLoads() {
} }
} }

Loading…
Cancel
Save