From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 26 十一月 2024 17:25:39 +0800 Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改; 2、RTU升级模拟器增加命令行设置服务端IP和端口功能; 3、应王江海要求,井电双控协议中也实现远程升级功能,因井电双控协议、阀控器协议不同,而双方协议中的升级子协议相同,所以通信中间件做增量开发、适应性修改,以适应这种混合协议情况,同时也提高通信中间件运行效率。 --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java index 4e96448..f43fdf4 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wechatpay/PayInfo.java @@ -38,11 +38,10 @@ */ public static String certificates = "https://api.mch.weixin.qq.com/v3/certificates"; - /* + /** * 鏀粯缁撴灉閫氱煡API */ - //public static String notifyUrl = "https://www.muxiaobao.com/api/Payment/OrderNotify"; - public static String notifyUrl = "https://44978f7456.imdo.co/webchat/payment/orderNotify"; + public static String notifyUrl = "https://44978f7456.imdo.co/wx/payment/orderNotify"; /* * 鏌ヨ璁㈠崟API @@ -67,12 +66,14 @@ /* * 灏忕▼搴忓敮涓�鏍囪瘑 */ - public static String appid = "wxbc2b6a00dd904ead"; + //public static String appid = "wxbc2b6a00dd904ead"; + public static String appid = "wxf773810cd5643196"; /* * 灏忕▼搴忕殑 app secret */ - public static String secret = "796ffe3e9921f756db0499e80d6ed0cd"; + //public static String secret = "796ffe3e9921f756db0499e80d6ed0cd"; + public static String secret = "080d4f947095551e988cfe9338e27f15"; /* * 灏忕▼搴忕殑鎺堟潈绫诲瀷锛岀櫥褰曞嚟璇佹牎楠屼娇鐢� @@ -140,13 +141,6 @@ * HTTP澶磋璇佺被鍨� */ public static String schema = "WECHATPAY2-SHA256-RSA2048"; - - /** - * 绉侀挜鏂囦欢璺緞 - */ - public static String privateCertFileName = "C:\\webchat\\apiclient_key.pem"; - - public static String publicCertFileName = "C:\\webchat\\wxp_cert.pem"; /* * 寰俊璁㈠崟鍙凤紝浼樺厛浣跨敤 -- Gitblit v1.8.0