From b1990a8c22c56bc24c6a51486c4789d78d7ef0f9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 十月 2024 15:41:28 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java | 13 +-
/dev/null | 169 ------------------------------------------
2 files changed, 7 insertions(+), 175 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
index b01084c..3a14a0f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/ClientCtrl.java
@@ -14,6 +14,7 @@
import com.dy.pipIrrWechat.sms.AliyunSmsSv;
import com.dy.pipIrrWechat.sms.RandomCode;
import com.dy.pipIrrWechat.util.RestTemplateUtil;
+import com.dy.pipIrrWechat.wechatpay.PayInfo;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
@@ -42,8 +43,8 @@
private final ClientSv clientSv;
private final AliyunSmsSv aliyunSmsSv;
private final RestTemplateUtil restTemplateUtil;
- private final String appid = PayInfo.appid;
- private final String secret = PayInfo.secret;
+ //private final String appid = PayInfo.appid;
+ //private final String secret = PayInfo.secret;
private final String mchid = PayInfo.mchid;
private final String schema = PayInfo.schema;
private final String signType = PayInfo.signType;
@@ -68,8 +69,8 @@
// 鐧诲綍鍑瘉鏍￠獙
Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("appid", appid);
- queryParams.put("secret", secret);
+ queryParams.put("appid", PayInfo.appid);
+ queryParams.put("secret", PayInfo.secret);
queryParams.put("js_code", code);
queryParams.put("grant_type", grantType);
Map<String, String> headerParams = new HashMap<>();
@@ -177,8 +178,8 @@
// 鏍￠獙閫氳繃锛岃繘琛岀櫥褰曞嚟璇佹牎楠�
Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("appid", appid);
- queryParams.put("secret", secret);
+ queryParams.put("appid", PayInfo.appid);
+ queryParams.put("secret", PayInfo.secret);
queryParams.put("js_code", code);
queryParams.put("grant_type", grantType);
Map<String, String> headerParams = new HashMap<>();
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/PayInfo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/PayInfo.java
deleted file mode 100644
index ecb3ac5..0000000
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/client/PayInfo.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.dy.pipIrrWechat.client;
-
-/**
- * @author ZhuBaoMin
- * @date 2024-03-06 13:49
- * @LastEditTime 2024-03-06 13:49
- * @Description
- */
-public class PayInfo {
- /**
- * 灏忕▼搴忕櫥褰旳PI
- */
- public static String loginUrl = "https://api.weixin.qq.com/sns/jscode2session";
-
- /**
- * 妫�楠岀櫥褰曟��
- */
- public static String checkSessionUrl = "https://api.weixin.qq.com/wxa/checksession";
-
- /**
- * 閲嶇疆鐧诲綍鎬�
- */
- public static String resetUserSessionKeyUrl = "https://api.weixin.qq.com/wxa/resetusersessionkey";
-
- /**
- * 鑾峰彇鎺ュ彛璋冪敤鍑嵁
- */
- public static String tokenUrl = "https://api.weixin.qq.com/cgi-bin/token";
-
- /**
- * 缁熶竴涓嬪崟API
- */
- //public static String orderUrl = "https://api.mch.weixin.qq.com/pay/unifiedorder";
- public static String orderUrl = "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";
-
- /**
- * 骞冲彴璇佷功涓嬭浇URL
- */
- public static String certificates = "https://api.mch.weixin.qq.com/v3/certificates";
-
- /*
- * 鏀粯缁撴灉閫氱煡API
- */
- public static String notifyUrl = "https://44978f7456.imdo.co/sell/payment/orderNotify";
-
- /*
- * 鏌ヨ璁㈠崟API
- */
- public static String queryUrl = "https://api.mch.weixin.qq.com/pay/orderquery";
-
- /**
- * 鐢宠閫�娆続PI
- */
- public static String refundUrl = "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds";
-
- /*
- * 閫�娆鹃�氱煡API
- */
- public static String refundNotifyUrl = "https://www.muxiaobao.com/wxpay/pay.action";
-
- /*
- * 閫�娆炬煡璇PI
- */
- public static String refundQueryUrl = "https://api.mch.weixin.qq.com/pay/refundquery";
-
- /*
- * 灏忕▼搴忓敮涓�鏍囪瘑
- */
- //public static String appid = "wxbc2b6a00dd904ead";
- public static String appid = "wxf773810cd5643196";
-
- /*
- * 灏忕▼搴忕殑 app secret
- */
- //public static String secret = "796ffe3e9921f756db0499e80d6ed0cd";
- public static String secret = "080d4f947095551e988cfe9338e27f15";
-
- /*
- * 灏忕▼搴忕殑鎺堟潈绫诲瀷锛岀櫥褰曞嚟璇佹牎楠屼娇鐢�
- */
- public static String grantType = "authorization_code";
-
- /*
- * 鍟嗘埛鍙�(寰俊鏀粯鍒嗛厤鐨勫晢鎴峰彿)
- */
- public static String mchid = "1640721520";
-
- /*
- * 鍟嗘埛骞冲彴璁剧疆鐨勫瘑閽ey
- */
- public static String key = "DaYuJieShuiYanJiuYuan20230412ABC";
-
- /**
- * 鍟嗘埛API璇佷功搴忓垪鍙�
- */
- public static String serial_no = "52D65AA66405C738670377F467178F4C950E1606";
-
- /*
- * 缁堢IP锛岃皟鐢ㄥ井淇℃敮浠楢PI鐨勬満鍣↖P
- */
- public static String addrIp = "47.104.211.89";
-
- /*
- * 闅忔満瀛楃涓诧紝闀垮害瑕佹眰鍦�32浣嶄互鍐�
- */
- //public static String nonceStr = PayHelper.generateRandomString();
-
- /*
- * 鏃堕棿鎴� 浠�1970骞�1鏈�1鏃�00:00:00鑷充粖鐨勭鏁�,鍗冲綋鍓嶇殑鏃堕棿
- */
- //public static Long timeStamp = PayHelper.getTimeStamp();
-
- /*
- * 浜ゆ槗绫诲瀷锛屽皬绋嬪簭鍙栧�糐SAPI
- */
- public static String tradeType = "JSAPI";
-
- /*
- * 绛惧悕绫诲瀷
- */
- //public static String signType = "MD5";
- public static String signType = "RSA";
-
- /*
- * 鍟嗗搧鎻忚堪 鍟嗗搧绠�鍗曟弿杩帮紝璇ュ瓧娈佃鎸夌収瑙勮寖浼犻��
- */
- //public static String body = "澶х鐮旂┒闄�-姘磋垂";
- public static String description = "澶х鐮旂┒闄�-姘磋垂";
-
- /*
- * 闄勫姞鏁版嵁锛屽湪鏌ヨAPI鍜屾敮浠橀�氱煡涓師鏍疯繑鍥烇紝鍙綔涓鸿嚜瀹氫箟鍙傛暟浣跨敤
- */
- public static String attach = "澶╂触";
-
- /*
- * 绛惧悕锛屽弬涓庣鍚嶅弬鏁帮細appid銆乤ttach銆乵ch_id銆乶once_str銆乥ody銆乷ut_trade_no銆乼otal_fee銆乻pbill_create_ip銆乶otify_url銆乼rade_type銆乷penid
- */
- public String sign = "";
-
- /**
- * HTTP澶磋璇佺被鍨�
- */
- public static String schema = "WECHATPAY2-SHA256-RSA2048";
-
- /*
- * 寰俊璁㈠崟鍙凤紝浼樺厛浣跨敤
- */
- public static String transactionid = "";
-
- /*
- * 鍟嗘埛绯荤粺鍐呴儴璁㈠崟鍙�
- */
- public static String out_trade_no = "";
-
- /*
- * 鍟嗘埛閫�娆惧崟鍙�
- */
- public static String out_refund_no = "";
-
- /*
- * 閫�娆鹃噾棰�
- */
- public static Float refundfee;
-
- /*
- * 璁㈠崟閲戦
- */
- public static Float totalfee;
-}
--
Gitblit v1.8.0