From bd12b21d5ed8532120fd928585b143dcf2ceef73 Mon Sep 17 00:00:00 2001 From: wangsq Date: Fri, 28 Nov 2025 16:23:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7=E3=80=81?= =?UTF-8?q?=E5=BA=9F=E5=BC=83API=E8=B0=83=E6=95=B4=EF=BC=8C=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 345 ++++++++++-------- .../java/com/ynxbd/ali/helper/AliHelper.java | 2 +- src/main/java/com/ynxbd/common/TestA.java | 2 + .../ynxbd/common/action/RegisterAction.java | 5 +- .../ynxbd/common/action/test/TestAction.java | 6 + .../ynxbd/common/dao/his/HisRegisterDao.java | 3 +- .../common/helper/common/Base64Helper.java | 20 +- .../common/helper/common/FileHelper.java | 8 +- .../ynxbd/common/helper/common/SmbHelper.java | 5 +- .../helper/redis/RedisStreamHelper.java | 2 +- .../common/helper/xbd/XBDHttpHelper.java | 7 +- .../com/ynxbd/common/rabbitmq/Producer.java | 48 +++ .../com/ynxbd/common/result/JsonResult.java | 6 +- .../ynxbd/common/result/JsonResultEnum.java | 14 +- .../java/com/ynxbd/wx/pwe/bean/PWEResult.java | 1 - .../com/ynxbd/wx/wxfactory/WxPayHelper.java | 2 +- .../wx/wxfactory/base/refund/Client.java | 6 +- .../{ => copy/wx}/wx-backup.properties | 0 src/main/webapp/WEB-INF/web.xml | 34 ++ src/main/webapp/index.html | 2 +- 20 files changed, 329 insertions(+), 189 deletions(-) create mode 100644 src/main/java/com/ynxbd/common/rabbitmq/Producer.java rename src/main/resources/{ => copy/wx}/wx-backup.properties (100%) diff --git a/pom.xml b/pom.xml index b2e85eb..9539cdc 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.ynxbd wx - 6.0.1 + 6.2.1 war wx Maven Webapp @@ -18,8 +18,9 @@ 1.8 1.8 6.8.0 - 2.18.5 + 2.15.4 1.2.83 + 2.0.7 @@ -38,25 +39,17 @@ - com.alibaba - fastjson - ${fastjson.version} - - - - - org.apache.struts - struts2-core - ${struts.version} + org.slf4j + slf4j-api + ${slf4j.version} - + - org.apache.struts - struts2-convention-plugin - ${struts.version} - jar - compile + javax.servlet + javax.servlet-api + 4.0.1 + provided @@ -70,35 +63,99 @@ com.rabbitmq amqp-client - 5.27.0 + 5.27.1 + + + slf4j-api + org.slf4j + + - javax.servlet - jstl - 1.2 + org.ehcache + ehcache + 3.11.1 + + + slf4j-api + org.slf4j + + + + + + redis.clients + jedis + 7.1.0 + + + slf4j-api + org.slf4j + + + + + + com.auth0 + java-jwt + 4.5.0 + + + + com.alibaba + fastjson + ${fastjson.version} com.fasterxml.jackson.core jackson-core - ${jsckson.version} + ${jackson.version} com.fasterxml.jackson.core jackson-databind - ${jsckson.version} + ${jackson.version} com.fasterxml.jackson.core jackson-annotations - ${jsckson.version} + ${jackson.version} + + + + + org.apache.struts + struts2-core + ${struts.version} + + + error_prone_annotations + com.google.errorprone + + + + + + + org.apache.struts + struts2-convention-plugin + ${struts.version} + jar + compile - + + javax.servlet + jstl + 1.2 + + + @@ -120,28 +177,12 @@ org.json - httpclient - org.apache.httpcomponents + slf4j-api + org.slf4j - - - - - commons-net - commons-net - 3.12.0 - - - - - eu.agno3.jcifs - jcifs-ng - 2.1.6 - - commons-codec commons-codec @@ -160,24 +201,48 @@ 4.5.0 - - com.thoughtworks.xstream - xstream - 1.4.21 + org.apache.pdfbox + pdfbox + 2.0.25 + + + commons-logging + commons-logging + + - - mysql - mysql-connector-java - 5.1.47 + org.apache.poi + poi + 5.5.0 + + + commons-io + commons-io + + + log4j-api + org.apache.logging.log4j + + - com.alibaba - druid - 1.2.5 + org.apache.poi + poi-ooxml + 5.5.0 + + + commons-io + commons-io + + + log4j-api + org.apache.logging.log4j + + @@ -187,11 +252,12 @@ 2.1.4 - - - - - + + + com.thoughtworks.xstream + xstream + 1.4.21 + @@ -200,10 +266,18 @@ 1.2.0 + - org.ehcache - ehcache - 3.11.1 + commons-net + commons-net + 3.12.0 + + + + + eu.agno3.jcifs + jcifs-ng + 2.1.6 slf4j-api @@ -219,20 +293,6 @@ 3.4.1 - - org.mariadb.jdbc - mariadb-java-client - 3.0.8 - - - - - javax.servlet - javax.servlet-api - 4.0.1 - provided - - com.aliyun @@ -259,30 +319,49 @@ commons-codec commons-codec - - - - - - com.baidu.aip - java-sdk - 4.16.8 - - json - org.json + jaxb-runtime + org.glassfish.jaxb - slf4j-api - org.slf4j + gson + com.google.code.gson - guava - com.google.guava + httpcore + org.apache.httpcomponents + + + commons-logging + commons-logging + + + httpclient + org.apache.httpcomponents + + + com.alibaba + druid + 1.2.27 + + + + + mysql + mysql-connector-java + 5.1.47 + + + + org.mariadb.jdbc + mariadb-java-client + 3.0.8 + + com.microsoft.sqlserver mssql-jdbc @@ -309,6 +388,14 @@ gson com.google.code.gson + + checker-qual + org.checkerframework + + + error_prone_annotations + com.google.errorprone + @@ -332,87 +419,35 @@ - - com.auth0 - java-jwt - 3.19.2 - - - jackson-databind - com.fasterxml.jackson.core - - - + + - org.apache.poi - poi - 5.5.0 + com.baidu.aip + java-sdk + 4.16.18 - commons-io - commons-io + json + org.json - log4j-api - org.apache.logging.log4j - - - - - - org.apache.poi - poi-ooxml - 5.5.0 - - - commons-io - commons-io + slf4j-api + org.slf4j - log4j-api - org.apache.logging.log4j + guava + com.google.guava - - org.apache.pdfbox - pdfbox - 2.0.25 - - cn.hutool hutool-all 5.8.41 - - - - - - - - - redis.clients - jedis - 7.1.0 - - - slf4j-api - org.slf4j - - - - - - com.alipay.sdk - easysdk-kernel - 1.0.12 - - com.tencent healthcard diff --git a/src/main/java/com/ynxbd/ali/helper/AliHelper.java b/src/main/java/com/ynxbd/ali/helper/AliHelper.java index 567fada..ca675be 100644 --- a/src/main/java/com/ynxbd/ali/helper/AliHelper.java +++ b/src/main/java/com/ynxbd/ali/helper/AliHelper.java @@ -722,7 +722,7 @@ public class AliHelper { String billDownUrl = downloadBill("trade", billDate); if (billDownUrl == null) { throw new ServiceException(ResultEnum.INTERFACE_ALI_INVOKE_ERROR); - } else if ("".equals(billDownUrl)) { + } else if (ObjectUtils.isEmpty(billDownUrl)) { return ""; } diff --git a/src/main/java/com/ynxbd/common/TestA.java b/src/main/java/com/ynxbd/common/TestA.java index a9caa6c..b54440b 100644 --- a/src/main/java/com/ynxbd/common/TestA.java +++ b/src/main/java/com/ynxbd/common/TestA.java @@ -1,5 +1,7 @@ package com.ynxbd.common; +import com.ynxbd.common.helper.common.Base64Helper; + import java.io.UnsupportedEncodingException; public class TestA { diff --git a/src/main/java/com/ynxbd/common/action/RegisterAction.java b/src/main/java/com/ynxbd/common/action/RegisterAction.java index e40f128..ee77ddc 100644 --- a/src/main/java/com/ynxbd/common/action/RegisterAction.java +++ b/src/main/java/com/ynxbd/common/action/RegisterAction.java @@ -379,15 +379,14 @@ public class RegisterAction extends BaseAction { begDate = DateHelper.getCurDate() + " 06:00:00"; endDate = DateHelper.getCurDate() + " 23:59:59"; } - JSONArray dataList = new HisRegisterDao().getRegLineSignInRecordsOld(begDate, endDate); + JSONArray dataList = new HisRegisterDao().getRegLineSignInRecordsOld(begDate, endDate, patientId); Map dataMap = new HashMap<>(); dataMap.put("date", DateHelper.getCurDateTime()); if (dataList == null || dataList.isEmpty()) { dataMap.put("list", new ArrayList<>()); return Result.success(dataMap); } - List findDataList = dataList.stream().filter(iter -> Objects.equals(((JSONObject) iter).getString("PatientId"), patientId)).collect(Collectors.toList()); - dataMap.put("list", findDataList); + dataMap.put("list", dataList); return Result.success(dataMap); } diff --git a/src/main/java/com/ynxbd/common/action/test/TestAction.java b/src/main/java/com/ynxbd/common/action/test/TestAction.java index 653f88e..ed40fa5 100644 --- a/src/main/java/com/ynxbd/common/action/test/TestAction.java +++ b/src/main/java/com/ynxbd/common/action/test/TestAction.java @@ -78,6 +78,12 @@ public class TestAction extends BaseAction { } + @Action("testLog") + public Result testLog() throws ServiceException { + log.info("testLog====="); + return Result.success(); + } + // @Action("lock") diff --git a/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java b/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java index 36e7b8d..19135fc 100644 --- a/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java +++ b/src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java @@ -1083,10 +1083,11 @@ public class HisRegisterDao { * @param endDate 结束时间 * @return 待签到记录 */ - public JSONArray getRegLineSignInRecordsOld(String begDate, String endDate) { + public JSONArray getRegLineSignInRecordsOld(String begDate, String endDate, String patientId) { JsonResult jsonResult = HisHelper.getJsonResult(HisEnum.AP_Query_Line_SignIn, params -> { params.put("BegDate", begDate); params.put("EndDate", endDate); + params.put("PatientID", patientId); }); if (jsonResult.success()) { return jsonResult.getJsonArray("Items", "Item"); diff --git a/src/main/java/com/ynxbd/common/helper/common/Base64Helper.java b/src/main/java/com/ynxbd/common/helper/common/Base64Helper.java index 13c518c..4f430ff 100644 --- a/src/main/java/com/ynxbd/common/helper/common/Base64Helper.java +++ b/src/main/java/com/ynxbd/common/helper/common/Base64Helper.java @@ -28,9 +28,10 @@ public class Base64Helper { * @return 解密后的内容 */ public static String decode(String data) { - return new String(java.util.Base64.getDecoder().decode(data), StandardCharsets.UTF_8); // + return new String(java.util.Base64.getDecoder().decode(data), StandardCharsets.UTF_8); } + /** * BASE64解密 * @@ -38,12 +39,7 @@ public class Base64Helper { * @return 解密后的内容 */ public static byte[] decodeByte(String data) { - try { - return java.util.Base64.getDecoder().decode(data); - } catch (Exception e) { - e.printStackTrace(); - } - return null; + return java.util.Base64.getDecoder().decode(data); } /** @@ -56,6 +52,16 @@ public class Base64Helper { return java.util.Base64.getEncoder().encodeToString(data.getBytes(StandardCharsets.UTF_8)); } + /** + * BASE64加密 + * + * @param data 需要加密的字符串 + * @return 加密后的字符串 + */ + public static String encode(byte[] data) { + return java.util.Base64.getEncoder().encodeToString(data); + } + /** * BASE64加密 * diff --git a/src/main/java/com/ynxbd/common/helper/common/FileHelper.java b/src/main/java/com/ynxbd/common/helper/common/FileHelper.java index bbcd1ae..8819552 100644 --- a/src/main/java/com/ynxbd/common/helper/common/FileHelper.java +++ b/src/main/java/com/ynxbd/common/helper/common/FileHelper.java @@ -12,7 +12,6 @@ package com.ynxbd.common.helper.common;/* import com.ynxbd.common.result.ServiceException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; -import sun.security.action.GetPropertyAction; import java.io.*; import java.net.URL; @@ -20,6 +19,7 @@ import java.net.URLConnection; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.security.AccessController; +import java.security.PrivilegedAction; import java.text.SimpleDateFormat; import java.util.*; import java.util.zip.ZipEntry; @@ -346,7 +346,11 @@ public class FileHelper { FileOutputStream out = null; try { - File rootFile = new File(AccessController.doPrivileged(new GetPropertyAction("java.io.tmpdir"))); +// File rootFile = new File(AccessController.doPrivileged(new GetPropertyAction("java.io.tmpdir"))); + File rootFile = new File(AccessController.doPrivileged( + (PrivilegedAction) () -> System.getProperty("java.io.tmpdir") + )); + URLConnection conn = new URL(downUrl).openConnection(); in = conn.getInputStream(); if (ObjectUtils.isEmpty(folderName)) { diff --git a/src/main/java/com/ynxbd/common/helper/common/SmbHelper.java b/src/main/java/com/ynxbd/common/helper/common/SmbHelper.java index add1762..4f49e41 100644 --- a/src/main/java/com/ynxbd/common/helper/common/SmbHelper.java +++ b/src/main/java/com/ynxbd/common/helper/common/SmbHelper.java @@ -25,9 +25,10 @@ public class SmbHelper { private final String user; private final String pass; - public byte[] smbGet(String shareUrl) throws Exception { + @SuppressWarnings("deprecation") + public byte[] smbGet(String shareUrl) throws Exception { CIFSContext base = SingletonContext.getInstance(); - CIFSContext auth = base.withCredentials(new NtlmPasswordAuthentication(base,null, user, pass)); + CIFSContext auth = base.withCredentials(new NtlmPasswordAuthentication(base, null, user, pass)); SmbFile dir = new SmbFile(shareUrl, auth); if (!dir.exists()) { log.info("共享文件不存在"); diff --git a/src/main/java/com/ynxbd/common/helper/redis/RedisStreamHelper.java b/src/main/java/com/ynxbd/common/helper/redis/RedisStreamHelper.java index 28a649a..804c772 100644 --- a/src/main/java/com/ynxbd/common/helper/redis/RedisStreamHelper.java +++ b/src/main/java/com/ynxbd/common/helper/redis/RedisStreamHelper.java @@ -66,7 +66,7 @@ public class RedisStreamHelper { */ XReadGroupParams xReadGroupParams = new XReadGroupParams().block(0).count(1); Map streams = new HashMap<>(); - streams.put(key, StreamEntryID.UNRECEIVED_ENTRY); // > + streams.put(key, StreamEntryID.NEW_ENTRY); // > List>> entries = jedis.xreadGroup(groupName, consumeName, xReadGroupParams, streams); diff --git a/src/main/java/com/ynxbd/common/helper/xbd/XBDHttpHelper.java b/src/main/java/com/ynxbd/common/helper/xbd/XBDHttpHelper.java index 0b63a49..ac24c91 100644 --- a/src/main/java/com/ynxbd/common/helper/xbd/XBDHttpHelper.java +++ b/src/main/java/com/ynxbd/common/helper/xbd/XBDHttpHelper.java @@ -1,6 +1,7 @@ package com.ynxbd.common.helper.xbd; import com.alibaba.fastjson.JSONObject; +import com.ynxbd.common.helper.common.Base64Helper; import com.ynxbd.common.helper.http.OkHttpHelper; import com.ynxbd.common.result.JsonResult; import com.ynxbd.common.result.ServiceException; @@ -221,7 +222,8 @@ public class XBDHttpHelper { e.printStackTrace(); } // 前端传递base64=>1、AES加密=>2、URLEncoder加密=>3、转二进制=>4、二进制转base64 - return new sun.misc.BASE64Encoder().encode(out.toByteArray()); + return Base64Helper.encode(out.toByteArray()); +// return new sun.misc.BASE64Encoder().encode(out.toByteArray()); } // public static void main(String[] args) { @@ -238,7 +240,8 @@ public class XBDHttpHelper { byte[] compressed = null; String decompressed = null; try { - compressed = new sun.misc.BASE64Decoder().decodeBuffer(compressedStr); + compressed = Base64Helper.decodeByte(compressedStr); +// compressed = new sun.misc.BASE64Decoder().decodeBuffer(compressedStr); in = new ByteArrayInputStream(compressed); ginzip = new GZIPInputStream(in); diff --git a/src/main/java/com/ynxbd/common/rabbitmq/Producer.java b/src/main/java/com/ynxbd/common/rabbitmq/Producer.java new file mode 100644 index 0000000..16ccd67 --- /dev/null +++ b/src/main/java/com/ynxbd/common/rabbitmq/Producer.java @@ -0,0 +1,48 @@ +package com.ynxbd.common.rabbitmq; + +import com.rabbitmq.client.Channel; +import com.rabbitmq.client.Connection; +import com.rabbitmq.client.ConnectionFactory; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class Producer { + + // 队列名称 + public static final String QUEUE_NAME = "RIN"; + + + public static void main(String[] args) { + ConnectionFactory factory = new ConnectionFactory(); + factory.setHost("127.0.0.1"); + + factory.setUsername("guest"); + factory.setPassword("guest"); + + try(Connection connection = factory.newConnection()){ + Channel channel = connection.createChannel(); // 信道 + /* + * 生产一个队列 + * @1.队列名称 + * @2.队列里面的消息是否持久化（磁盘），默认情况消息存储在内存中 + * @3。该队列是否只提供一个消费者进行消费，是否消息共享（true：只能一个消费者，false：可以多个消费者） + * @4.最后一个消费者断开连接后，是否自动删除 + * @ + */ + channel.queueDeclare(QUEUE_NAME, false, false, false, null); + + String message = "hello word"; + + /* + * @1.发送到哪个交换机 + * @2.路由的key值（队列名称） + * @3.其他参数 + * @4.发送消息的消息体 + */ + channel.basicPublish("", QUEUE_NAME, null, message.getBytes()); + System.out.println("消息发送"); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/ynxbd/common/result/JsonResult.java b/src/main/java/com/ynxbd/common/result/JsonResult.java index c5134e6..3d01305 100644 --- a/src/main/java/com/ynxbd/common/result/JsonResult.java +++ b/src/main/java/com/ynxbd/common/result/JsonResult.java @@ -1,6 +1,7 @@ package com.ynxbd.common.result; +import cn.hutool.http.HttpStatus; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.annotation.JSONField; @@ -9,7 +10,6 @@ import com.ynxbd.common.helper.common.ErrorHelper; import com.ynxbd.common.helper.common.JsonHelper; import lombok.*; import lombok.extern.slf4j.Slf4j; -import org.apache.http.HttpStatus; import org.dom4j.Attribute; import org.dom4j.Document; import org.dom4j.DocumentHelper; @@ -89,7 +89,7 @@ public class JsonResult { result.message = message; result.successCode = jsonResultEnum.getSUCCESS_CODE(); if (jsonResultEnum.getTIMEOUT_CODE() == null) { - result.timeoutCode = String.valueOf(HttpStatus.SC_REQUEST_TIMEOUT); + result.timeoutCode = String.valueOf(HttpStatus.HTTP_CLIENT_TIMEOUT); } else { result.timeoutCode = jsonResultEnum.getTIMEOUT_CODE(); } @@ -157,7 +157,7 @@ public class JsonResult { result.dataMap = map; result.successCode = jsonResultEnum.getSUCCESS_CODE(); if (jsonResultEnum.getTIMEOUT_CODE() == null) { - result.timeoutCode = String.valueOf(HttpStatus.SC_REQUEST_TIMEOUT); + result.timeoutCode = String.valueOf(HttpStatus.HTTP_CLIENT_TIMEOUT); } else { result.timeoutCode = jsonResultEnum.getTIMEOUT_CODE(); } diff --git a/src/main/java/com/ynxbd/common/result/JsonResultEnum.java b/src/main/java/com/ynxbd/common/result/JsonResultEnum.java index d079da9..df0dab7 100644 --- a/src/main/java/com/ynxbd/common/result/JsonResultEnum.java +++ b/src/main/java/com/ynxbd/common/result/JsonResultEnum.java @@ -1,9 +1,8 @@ package com.ynxbd.common.result; - +import cn.hutool.http.HttpStatus; import lombok.Getter; import lombok.ToString; -import org.apache.http.HttpStatus; /** * 第三方系统调用编码枚举 @@ -13,18 +12,17 @@ import org.apache.http.HttpStatus; @Getter @ToString public enum JsonResultEnum { - SYS_WX("[微信]", "return_code", "return_msg", "SUCCESS", "FAIL", String.valueOf(HttpStatus.SC_REQUEST_TIMEOUT)), + SYS_WX("[微信]", "return_code", "return_msg", "SUCCESS", "FAIL", String.valueOf(HttpStatus.HTTP_CLIENT_TIMEOUT)), - SYS_ME("[医保]", "return_code", "return_msg", "SUCCESS", "FAIL", String.valueOf(HttpStatus.SC_REQUEST_TIMEOUT)), + SYS_ME("[医保]", "return_code", "return_msg", "SUCCESS", "FAIL", String.valueOf(HttpStatus.HTTP_CLIENT_TIMEOUT)), - SYS_MEDICAL_ASSISTANT("[就医助手]", "errcode", "errmsg", "0", "-1", String.valueOf(HttpStatus.SC_REQUEST_TIMEOUT)), + SYS_MEDICAL_ASSISTANT("[就医助手]", "errcode", "errmsg", "0", "-1", String.valueOf(HttpStatus.HTTP_CLIENT_TIMEOUT)), SYS_HIS("[HIS]", "ResponseCode", "ResponseMessage", "0", "-1", "500"), - SYS_RESERVE("[天助预约]","code","msg","0","-1",String.valueOf(HttpStatus.SC_REQUEST_TIMEOUT)), - - SYS_RM_LIS("[瑞美LIS]", "ResultCode", "ResultMessage", "1", "0", String.valueOf(HttpStatus.SC_REQUEST_TIMEOUT)); + SYS_RESERVE("[天助预约]","code","msg","0","-1",String.valueOf(HttpStatus.HTTP_CLIENT_TIMEOUT)), + SYS_RM_LIS("[瑞美LIS]", "ResultCode", "ResultMessage", "1", "0", String.valueOf(HttpStatus.HTTP_CLIENT_TIMEOUT)); // 调用系统标识 diff --git a/src/main/java/com/ynxbd/wx/pwe/bean/PWEResult.java b/src/main/java/com/ynxbd/wx/pwe/bean/PWEResult.java index 8cb9789..8c8fbad 100644 --- a/src/main/java/com/ynxbd/wx/pwe/bean/PWEResult.java +++ b/src/main/java/com/ynxbd/wx/pwe/bean/PWEResult.java @@ -1,7 +1,6 @@ package com.ynxbd.wx.pwe.bean; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ynxbd.common.result.Result; import com.ynxbd.common.result.struts2.BaseResult; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java b/src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java index 3ff57c2..12a2a88 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java @@ -547,7 +547,7 @@ public class WxPayHelper { List refundOrderList = wxResult.getItems(); - if (refundOrderList == null || refundOrderList.size() == 0) { + if (refundOrderList == null || refundOrderList.isEmpty()) { return billList; } diff --git a/src/main/java/com/ynxbd/wx/wxfactory/base/refund/Client.java b/src/main/java/com/ynxbd/wx/wxfactory/base/refund/Client.java index 29d30dd..e3c7063 100644 --- a/src/main/java/com/ynxbd/wx/wxfactory/base/refund/Client.java +++ b/src/main/java/com/ynxbd/wx/wxfactory/base/refund/Client.java @@ -5,6 +5,7 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.http.client.methods.HttpUriRequest; import org.apache.http.client.methods.RequestBuilder; + import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.message.BasicHeader; @@ -20,13 +21,16 @@ import java.util.Map; @Slf4j @NoArgsConstructor public class Client { + public WxRefundQueryRoot refundQuery(Refundquery refundquery, String mchKey) { Map map = MapUtil.objectToMap(refundquery); String sign = SignatureUtil.generateSign(map, refundquery.getSign_type(), mchKey); refundquery.setSign(sign); String reqXml = XMLConverUtil.convertToXML(refundquery); - HttpUriRequest httpUriRequest = RequestBuilder.post().setHeader(new BasicHeader("Content-Type", ContentType.APPLICATION_XML.toString())).setUri("https://api.mch.weixin.qq.com" + "/pay/refundquery").setEntity(new StringEntity(reqXml, StandardCharsets.UTF_8)).build(); + HttpUriRequest httpUriRequest = RequestBuilder.post() + .setHeader(new BasicHeader("Content-Type", ContentType.APPLICATION_XML.toString())).setUri("https://api.mch.weixin.qq.com/pay/refundquery").setEntity(new StringEntity(reqXml, StandardCharsets.UTF_8)).build(); return LocalHttpClient.executeXmlResult(httpUriRequest, WxRefundQueryRoot.class, refundquery.getSign_type(), mchKey); } + } diff --git a/src/main/resources/wx-backup.properties b/src/main/resources/copy/wx/wx-backup.properties similarity index 100% rename from src/main/resources/wx-backup.properties rename to src/main/resources/copy/wx/wx-backup.properties diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index ab3d076..fdb6d02 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -2,6 +2,9 @@ + + + index.jsp @@ -14,6 +17,37 @@ struts2 org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 1ec97f2..389c600 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -9,7 +9,7 @@ - OK + OK 德宏州 \ No newline at end of file