Recoding
/
WxPay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

依赖升级、废弃API调整，依赖冲突解决

Browse Source
debug
王绍全 3 weeks ago
parent 0bcac98ba0
commit bd12b21d5e
20 changed files with 329 additions and 189 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 345
      pom.xml
  2. 2
      src/main/java/com/ynxbd/ali/helper/AliHelper.java
  3. 2
      src/main/java/com/ynxbd/common/TestA.java
  4. 5
      src/main/java/com/ynxbd/common/action/RegisterAction.java
  5. 6
      src/main/java/com/ynxbd/common/action/test/TestAction.java
  6. 3
      src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java
  7. 20
      src/main/java/com/ynxbd/common/helper/common/Base64Helper.java
  8. 8
      src/main/java/com/ynxbd/common/helper/common/FileHelper.java
  9. 5
      src/main/java/com/ynxbd/common/helper/common/SmbHelper.java
  10. 2
      src/main/java/com/ynxbd/common/helper/redis/RedisStreamHelper.java
  11. 7
      src/main/java/com/ynxbd/common/helper/xbd/XBDHttpHelper.java
  12. 48
      src/main/java/com/ynxbd/common/rabbitmq/Producer.java
  13. 6
      src/main/java/com/ynxbd/common/result/JsonResult.java
  14. 14
      src/main/java/com/ynxbd/common/result/JsonResultEnum.java
  15. 1
      src/main/java/com/ynxbd/wx/pwe/bean/PWEResult.java
  16. 2
      src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java
  17. 6
      src/main/java/com/ynxbd/wx/wxfactory/base/refund/Client.java
  18. 0
      src/main/resources/copy/wx/wx-backup.properties
  19. 34
      src/main/webapp/WEB-INF/web.xml
  20. 2
      src/main/webapp/index.html

345
pom.xml
Unescape View File

@ -6,7 +6,7 @@
<groupId>com.ynxbd</groupId>
<artifactId>wx</artifactId>
<version>6.0.1</version>
<version>6.2.1</version>
<packaging>war</packaging>
<name>wx Maven Webapp</name>
@ -18,8 +18,9 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<struts.version>6.8.0</struts.version>
<jsckson.version>2.18.5</jsckson.version>
<jackson.version>2.15.4</jackson.version>
<fastjson.version>1.2.83</fastjson.version>
<slf4j.version>2.0.7</slf4j.version>
</properties>
<dependencies>
@ -38,25 +39,17 @@
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!-- struts2核心依赖 -->
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>${struts.version}</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
<!-- struts2零配置依赖 -->
<!--servlet-->
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
<version>${struts.version}</version>
<type>jar</type>
<scope>compile</scope>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<!-- logback含sl4j 1.3.x系支持jdk1.8 -->
@ -70,35 +63,99 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
<version>5.27.0</version>
<version>5.27.1</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>3.11.1</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>7.1.0</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>4.5.0</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!-- jackson -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jsckson.version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jsckson.version}</version>
<version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>${jsckson.version}</version>
<version>${jackson.version}</version>
</dependency>
<!-- struts2核心依赖 -->
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
<version>${struts.version}</version>
<exclusions>
<exclusion>
<artifactId>error_prone_annotations</artifactId>
<groupId>com.google.errorprone</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- struts2零配置依赖 -->
<dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-convention-plugin</artifactId>
<version>${struts.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<!-- 微信菜单-包冲突 -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
<!-- 微信菜单-包冲突-->
<!-- <dependency>-->
<!-- <groupId>com.soecode.wx-tools</groupId>-->
<!-- <artifactId>wx-tools</artifactId>-->
@ -120,28 +177,12 @@
<groupId>org.json</groupId>
</exclusion>
<exclusion>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- FTP工具包 -->
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.12.0</version>
</dependency>
<!-- 共享文件工具包-->
<dependency>
<groupId>eu.agno3.jcifs</groupId>
<artifactId>jcifs-ng</artifactId>
<version>2.1.6</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@ -160,24 +201,48 @@
<version>4.5.0</version>
</dependency>
<!-- XML -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.21</version>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.25</version>
<exclusions>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
</exclusions>
</dependency>
<!-- mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.47</version>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.5.0</version>
<exclusions>
<exclusion>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.2.5</version>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.5.0</version>
<exclusions>
<exclusion>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<!--dom4j-->
@ -187,11 +252,12 @@
<version>2.1.4</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.github.wechatpay-apiv3</groupId>-->
<!-- <artifactId>wechatpay-apache-httpclient</artifactId>-->
<!-- <version>0.4.4</version>-->
<!-- </dependency>-->
<!-- XML -->
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.21</version>
</dependency>
<!-- xml主要依赖 -->
<dependency>
@ -200,10 +266,18 @@
<version>1.2.0</version>
</dependency>
<!-- FTP工具包-->
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>3.11.1</version>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.12.0</version>
</dependency>
<!-- 共享文件工具包-->
<dependency>
<groupId>eu.agno3.jcifs</groupId>
<artifactId>jcifs-ng</artifactId>
<version>2.1.6</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
@ -219,20 +293,6 @@
<version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.0.8</version>
</dependency>
<!--servlet-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>
<!--阿里云短信-->
<dependency>
<groupId>com.aliyun</groupId>
@ -259,30 +319,49 @@
<artifactId>commons-codec</artifactId>
<groupId>commons-codec</groupId>
</exclusion>
</exclusions>
</dependency>
<!--百度身份证识别-->
<dependency>
<groupId>com.baidu.aip</groupId>
<artifactId>java-sdk</artifactId>
<version>4.16.8</version>
<exclusions>
<exclusion>
<artifactId>json</artifactId>
<groupId>org.json</groupId>
<artifactId>jaxb-runtime</artifactId>
<groupId>org.glassfish.jaxb</groupId>
</exclusion>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
</exclusion>
<exclusion>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
<artifactId>httpcore</artifactId>
<groupId>org.apache.httpcomponents</groupId>
</exclusion>
<exclusion>
<artifactId>commons-logging</artifactId>
<groupId>commons-logging</groupId>
</exclusion>
<exclusion>
<artifactId>httpclient</artifactId>
<groupId>org.apache.httpcomponents</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.2.27</version>
</dependency>
<!-- mysql驱动包 -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.47</version>
</dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.0.8</version>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
@ -309,6 +388,14 @@
<artifactId>gson</artifactId>
<groupId>com.google.code.gson</groupId>
</exclusion>
<exclusion>
<artifactId>checker-qual</artifactId>
<groupId>org.checkerframework</groupId>
</exclusion>
<exclusion>
<artifactId>error_prone_annotations</artifactId>
<groupId>com.google.errorprone</groupId>
</exclusion>
</exclusions>
</dependency>
@ -332,87 +419,35 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>3.19.2</version>
<exclusions>
<exclusion>
<artifactId>jackson-databind</artifactId>
<groupId>com.fasterxml.jackson.core</groupId>
</exclusion>
</exclusions>
</dependency>
<!--百度身份证识别-->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.5.0</version>
<groupId>com.baidu.aip</groupId>
<artifactId>java-sdk</artifactId>
<version>4.16.18</version>
<exclusions>
<exclusion>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
<artifactId>json</artifactId>
<groupId>org.json</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.5.0</version>
<exclusions>
<exclusion>
<artifactId>commons-io</artifactId>
<groupId>commons-io</groupId>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
<version>2.0.25</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.8.41</version>
</dependency>
<!-- &lt;!&ndash; https://mvnrepository.com/artifact/com.rabbitmq/amqp-client &ndash;&gt;-->
<!-- <dependency>-->
<!-- <groupId>com.rabbitmq</groupId>-->
<!-- <artifactId>amqp-client</artifactId>-->
<!-- <version>5.14.2</version>-->
<!-- </dependency>-->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>7.1.0</version>
<exclusions>
<exclusion>
<artifactId>slf4j-api</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.alipay.sdk</groupId>
<artifactId>easysdk-kernel</artifactId>
<version>1.0.12</version>
</dependency>
<dependency>
<groupId>com.tencent</groupId>
<artifactId>healthcard</artifactId>

2
src/main/java/com/ynxbd/ali/helper/AliHelper.java
Unescape View File

@ -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 "";
}

2
src/main/java/com/ynxbd/common/TestA.java
Unescape View File

@ -1,5 +1,7 @@
package com.ynxbd.common;
import com.ynxbd.common.helper.common.Base64Helper;
import java.io.UnsupportedEncodingException;
public class TestA {

5
src/main/java/com/ynxbd/common/action/RegisterAction.java
Unescape View File

@ -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<String, Object> dataMap = new HashMap<>();
dataMap.put("date", DateHelper.getCurDateTime());
if (dataList == null || dataList.isEmpty()) {
dataMap.put("list", new ArrayList<>());
return Result.success(dataMap);
}
List<Object> 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);
}

6
src/main/java/com/ynxbd/common/action/test/TestAction.java
Unescape View File

@ -78,6 +78,12 @@ public class TestAction extends BaseAction {
}
@Action("testLog")
public Result testLog() throws ServiceException {
log.info("testLog=====");
return Result.success();
}
// @Action("lock")

3
src/main/java/com/ynxbd/common/dao/his/HisRegisterDao.java
Unescape View File

@ -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");

20
src/main/java/com/ynxbd/common/helper/common/Base64Helper.java
Unescape View File

@ -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加密
*

8
src/main/java/com/ynxbd/common/helper/common/FileHelper.java
Unescape View File

@ -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<String>) () -> System.getProperty("java.io.tmpdir")
));
URLConnection conn = new URL(downUrl).openConnection();
in = conn.getInputStream();
if (ObjectUtils.isEmpty(folderName)) {

5
src/main/java/com/ynxbd/common/helper/common/SmbHelper.java
Unescape View File

@ -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("共享文件不存在");

2
src/main/java/com/ynxbd/common/helper/redis/RedisStreamHelper.java
Unescape View File

@ -66,7 +66,7 @@ public class RedisStreamHelper {
*/
XReadGroupParams xReadGroupParams = new XReadGroupParams().block(0).count(1);
Map<String, StreamEntryID> streams = new HashMap<>();
streams.put(key, StreamEntryID.UNRECEIVED_ENTRY); // >
streams.put(key, StreamEntryID.NEW_ENTRY); // >
List<Map.Entry<String, List<StreamEntry>>>
entries = jedis.xreadGroup(groupName, consumeName, xReadGroupParams, streams);

7
src/main/java/com/ynxbd/common/helper/xbd/XBDHttpHelper.java
Unescape View File

@ -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);

48
src/main/java/com/ynxbd/common/rabbitmq/Producer.java
Unescape View File

@ -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();
}
}
}

6
src/main/java/com/ynxbd/common/result/JsonResult.java
Unescape View File

@ -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();
}

14
src/main/java/com/ynxbd/common/result/JsonResultEnum.java
Unescape View File

@ -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));
// 调用系统标识

1
src/main/java/com/ynxbd/wx/pwe/bean/PWEResult.java
Unescape View File

@ -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;

2
src/main/java/com/ynxbd/wx/wxfactory/WxPayHelper.java
Unescape View File

@ -547,7 +547,7 @@ public class WxPayHelper {
List<WxRefundItem> refundOrderList = wxResult.getItems();
if (refundOrderList == null || refundOrderList.size() == 0) {
if (refundOrderList == null || refundOrderList.isEmpty()) {
return billList;
}

6
src/main/java/com/ynxbd/wx/wxfactory/base/refund/Client.java
Unescape View File

@ -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<String, String> 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);
}
}

0
src/main/resources/wx-backup.properties → src/main/resources/copy/wx/wx-backup.properties
Unescape View File

34
src/main/webapp/WEB-INF/web.xml
Unescape View File

@ -2,6 +2,9 @@
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
</welcome-file-list>
@ -14,6 +17,37 @@
<filter-name>struts2</filter-name>
<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
</filter>
<!-- &lt;!&ndash; 字符集过滤 &ndash;&gt;-->
<!-- <filter>-->
<!-- <filter-name>encodingFilter</filter-name>-->
<!-- <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>-->
<!-- <async-supported>true</async-supported>-->
<!-- &lt;!&ndash; 传入参数 &ndash;&gt;-->
<!-- <init-param>-->
<!-- <param-name>encoding</param-name>-->
<!-- <param-value>UTF-8</param-value>-->
<!-- </init-param>-->
<!-- &lt;!&ndash; 强制覆盖 &ndash;&gt;-->
<!-- <init-param>-->
<!-- <param-name>forceEncoding</param-name>-->
<!-- <param-value>true</param-value>-->
<!-- </init-param>-->
<!-- </filter>-->
<!-- &lt;!&ndash;过滤所有&ndash;&gt;-->
<!-- <filter-mapping>-->
<!-- <filter-name>encodingFilter</filter-name>-->
<!-- <url-pattern>/*</url-pattern>-->
<!-- </filter-mapping>-->
<!--过滤所有-->
<!-- <filter-mapping>-->
<!-- <filter-name>encodingFilter</filter-name>-->
<!-- <url-pattern>/*</url-pattern>-->
<!-- </filter-mapping>-->
<!-- <filter-mapping>-->
<!-- <filter-name>struts2</filter-name>-->
<!-- <url-pattern>*.do</url-pattern>-->

2
src/main/webapp/index.html
Unescape View File

@ -9,7 +9,7 @@
</head>
<body>
OK
OK 德宏州
</body>
</html>
Write Preview
Loading…
Cancel
Save