From 3c1b87ecc2ce1f6c3ac6502c54e2c9ae33ebe987 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 21 四月 2026 14:09:26 +0800
Subject: [PATCH] update

---
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java     |   10 ++++++----
 ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java |    2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
index f2bfae5..218e50a 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/config/DatasourceModel.java
@@ -23,7 +23,7 @@
     private Integer initialSize =2;
 //    private String url = "jdbc:mysql://127.0.0.1:3306/dolphin_study?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai";
 //    private String username = "root";
-//    private String password = "root";
+//    private String password = "123456";
 //    private String driverClassName = "com.mysql.cj.jdbc.Driver";
 //    private Integer maxActive =20;
 //    private Long maxWait = 60000L;
diff --git a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java
index 809a726..cd06e5e 100644
--- a/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java
+++ b/ruoyi-service/ruoyi-study/src/main/java/com/ruoyi/study/utils/PayMoneyUtil.java
@@ -57,13 +57,13 @@
 
     private String smid = "2088330203191220";//平台支付宝商户号...
 
-    private String appid = "wx723c6b080f204773";//微信appid
+    private String appid = "wx795cdb6e422b1775";//微信appid
 
     private String appSecret = "cf0ebf950f5926a69041a0e2bbe20f3e";
 
-    private String mchId = "1501481761";//微信商户号
+    private String mchId = "1744256494";//微信商户号
 
-    private String key = "6f5e0c2dcabfa9c27b5da5836a362fef";//微信商户号
+    private String key = "c82FYbCPiFxlgkFNOTpyZhyeAn972p80";//微信商户号
 
 //    private String callbackPath = "https://v7ro848ar5jx.ngrok.xiaomiqiu123.top/study";//支付回调网关地址
     private String callbackPath = "https://dollearn.com/api/study";//支付回调网关地址
@@ -74,7 +74,7 @@
 
     private String alipay_root_cert_path = "C:/cert/alipay/user/alipay_root_cert_path.crt";//支付宝CA根证书文件路径
 
-    private String certPath = "/usr/playpai/cert/weixin/apiclient_cert.p12";//微信证书
+    private String certPath = "/usr/local/project/cert/apiclient_cert.p12";//微信证书
 
 
     /**
@@ -298,8 +298,10 @@
         map.put("nonce_str", nonce_str);
         map.put("body", body);
         map.put("attach", attach);//存储订单id
+        map.put("version", "1.0");//版本
         map.put("out_trade_no", out_trade_no);//存储的订单code
         map.put("total_fee", i);
+        map.put("fee_type", "CNY");
         map.put("spbill_create_ip", hostAddress);
         map.put("notify_url", callbackPath + notify_url);
         map.put("trade_type", tradeType);

--
Gitblit v1.7.1