lsm/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-05-04 12:47:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🎨 优化代码，重写jodd强制依赖的代码

Browse Source
This commit is contained in:
Binary Wang 2022-03-20 23:30:53 +08:00
parent 94e6d6518b
commit a4dd111def
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java
View File

@ -20,13 +20,13 @@ import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.*; import com.github.binarywang.wxpay.service.*;
import com.github.binarywang.wxpay.util.SignUtils; import com.github.binarywang.wxpay.util.SignUtils;
import com.github.binarywang.wxpay.util.XmlConfig; import com.github.binarywang.wxpay.util.XmlConfig;
import com.github.binarywang.wxpay.util.ZipUtils;
import com.github.binarywang.wxpay.v3.util.AesUtils; import com.github.binarywang.wxpay.v3.util.AesUtils;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import jodd.io.ZipUtil;
import me.chanjar.weixin.common.error.WxRuntimeException; import me.chanjar.weixin.common.error.WxRuntimeException;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -888,7 +888,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
Path path = Paths.get(tempDirectory.toString(), System.currentTimeMillis() + ".gzip"); Path path = Paths.get(tempDirectory.toString(), System.currentTimeMillis() + ".gzip");
Files.write(path, responseBytes); Files.write(path, responseBytes);
try { try {
List<String> allLines = Files.readAllLines(ZipUtil.ungzip(path.toFile()).toPath(), StandardCharsets.UTF_8); List<String> allLines = Files.readAllLines(ZipUtils.unGzip(path.toFile()).toPath(), StandardCharsets.UTF_8);
return Joiner.on("\n").join(allLines); return Joiner.on("\n").join(allLines);
} catch (ZipException e) { } catch (ZipException e) {
if (e.getMessage().contains("Not in GZIP format")) { if (e.getMessage().contains("Not in GZIP format")) {
@ -941,7 +941,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
Files.write(path, responseBytes); Files.write(path, responseBytes);
try { try {
List<String> allLines = Files.readAllLines(ZipUtil.ungzip(path.toFile()).toPath(), StandardCharsets.UTF_8); List<String> allLines = Files.readAllLines(ZipUtils.unGzip(path.toFile()).toPath(), StandardCharsets.UTF_8);
return Joiner.on("\n").join(allLines); return Joiner.on("\n").join(allLines);
} catch (ZipException e) { } catch (ZipException e) {
if (e.getMessage().contains("Not in GZIP format")) { if (e.getMessage().contains("Not in GZIP format")) {

33
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/util/ZipUtils.java Normal file
View File

@ -0,0 +1,33 @@
package com.github.binarywang.wxpay.util;
import lombok.experimental.UtilityClass;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.zip.GZIPInputStream;
/**
* @author Binary Wang
*/
@UtilityClass
public class ZipUtils {
/**
* 解压gzip文件
*/
public static File unGzip(final File file) throws IOException {
File resultFile = new File(FilenameUtils.removeExtension(file.getAbsolutePath()));
resultFile.createNewFile();
try (FileOutputStream fos = new FileOutputStream(resultFile);
GZIPInputStream gzis = new GZIPInputStream(new FileInputStream(file));) {
IOUtils.copy(gzis, fos);
}
return resultFile;
}
}