Skip to content

Commit e61cf93

Browse files
hongbinhsuBinary Wang
hongbinhsu
authored and
Binary Wang
committed
⬆️ 升级guava版本修复 CVE-2023-2976，同时升级其他依赖包版本
1 parent 189bcdc commit e61cf93

4 files changed

Lines changed: 31 additions & 26 deletions

File tree

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,17 @@
178178
<summary>点击此处展开查看贡献次数最多的几位小伙伴</summary>
179179

180180
1. [chanjarster (Daniel Qian)](https://github.com/chanjarster)
181-
1. [binarywang (Binary Wang)](https://github.com/binarywang)
182-
1. [007gzs](https://github.com/007gzs)
183-
1. [Silloy](https://github.com/silloy)
184-
1. [mgcnrx11](https://github.com/mgcnrx11)
185-
1. [0katekate0 (Wang_Wong)](https://github.com/0katekate0)
186-
1. [yuanqixun](https://github.com/yuanqixun)
187-
1. [kakotor](https://github.com/kakotor)
188-
1. [aimilin6688 (Jonk)](https://github.com/aimilin6688)
189-
1. [lkqm (Mario Luo)](https://github.com/lkqm)
190-
1. [kareanyi (MillerLin)](https://github.com/kareanyi)
191-
181+
2. [binarywang (Binary Wang)](https://github.com/binarywang)
182+
3. [007gzs](https://github.com/007gzs)
183+
4. [Silloy](https://github.com/silloy)
184+
5. [mgcnrx11](https://github.com/mgcnrx11)
185+
6. [0katekate0 (Wang_Wong)](https://github.com/0katekate0)
186+
7. [yuanqixun](https://github.com/yuanqixun)
187+
8. [kakotor](https://github.com/kakotor)
188+
9. [aimilin6688 (Jonk)](https://github.com/aimilin6688)
189+
10. [lkqm (Mario Luo)](https://github.com/lkqm)
190+
11. [kareanyi (MillerLin)](https://github.com/kareanyi)
191+
12. [Bincent (Hongbin.hsu)](https://gitee.com/bincent)
192192
</details>
193193

194194
### GitHub Stargazers over time

‎pom.xml‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<licenses>
1313
<license>
1414
<name>The Apache License, Version 2.0</name>
15-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
15+
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
1616
</license>
1717
</licenses>
1818

@@ -102,6 +102,11 @@
102102
<email>wangkaikate@163.com</email>
103103
<url>https://github.com/0katekate0</url>
104104
</developer>
105+
<developer>
106+
<name>Bincent</name>
107+
<email>hongbin.hsu@qq.com</email>
108+
<url>https://gitee.com/bincent</url>
109+
</developer>
105110
</developers>
106111

107112
<scm>
@@ -139,12 +144,12 @@
139144
<dependency>
140145
<groupId>com.github.binarywang</groupId>
141146
<artifactId>qrcode-utils</artifactId>
142-
<version>1.1</version>
147+
<version>1.3</version>
143148
</dependency>
144149
<dependency>
145150
<groupId>org.jodd</groupId>
146151
<artifactId>jodd-http</artifactId>
147-
<version>6.2.1</version>
152+
<version>6.3.0</version>
148153
<scope>provided</scope>
149154
</dependency>
150155
<dependency>
@@ -192,17 +197,17 @@
192197
<dependency>
193198
<groupId>com.google.guava</groupId>
194199
<artifactId>guava</artifactId>
195-
<version>32.0.0-jre</version>
200+
<version>32.1.2-jre</version>
196201
</dependency>
197202
<dependency>
198203
<groupId>com.google.code.gson</groupId>
199204
<artifactId>gson</artifactId>
200-
<version>2.8.9</version>
205+
<version>2.10.1</version>
201206
</dependency>
202207
<dependency>
203208
<groupId>com.fasterxml.jackson.dataformat</groupId>
204209
<artifactId>jackson-dataformat-xml</artifactId>
205-
<version>2.13.0</version>
210+
<version>2.15.2</version>
206211
</dependency>
207212

208213
<!-- 测试所用依赖 -->
@@ -287,7 +292,7 @@
287292
<dependency>
288293
<groupId>org.redisson</groupId>
289294
<artifactId>redisson</artifactId>
290-
<version>3.12.0</version>
295+
<version>3.23.3</version>
291296
<optional>true</optional>
292297
<scope>provided</scope>
293298
<exclusions>
@@ -355,7 +360,7 @@
355360
<plugin>
356361
<groupId>org.apache.maven.plugins</groupId>
357362
<artifactId>maven-source-plugin</artifactId>
358-
<version>2.2.1</version>
363+
<version>3.1.0</version>
359364
<executions>
360365
<execution>
361366
<id>attach-sources</id>
@@ -368,7 +373,7 @@
368373
<plugin>
369374
<groupId>org.apache.maven.plugins</groupId>
370375
<artifactId>maven-javadoc-plugin</artifactId>
371-
<version>2.9.1</version>
376+
<version>3.5.0</version>
372377
<executions>
373378
<execution>
374379
<id>attach-javadocs</id>
@@ -386,7 +391,7 @@
386391
<plugin>
387392
<groupId>org.apache.maven.plugins</groupId>
388393
<artifactId>maven-gpg-plugin</artifactId>
389-
<version>1.6</version>
394+
<version>3.1.0</version>
390395
<executions>
391396
<execution>
392397
<id>sign-artifacts</id>

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,7 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
10251025
* @param sideLength 要生成的二维码的边长，如果为空，则取默认值400
10261026
* @return 生成的二维码的字节数组 byte [ ]
10271027
*/
1028-
byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength);
1028+
byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) throws Exception;
10291029

10301030
/**
10311031
* <pre>
@@ -1054,7 +1054,7 @@ WxPayRefundQueryResult refundQuery(String transactionId, String outTradeNo, Stri
10541054
* @param sideLength 要生成的二维码的边长，如果为空，则取默认值400
10551055
* @return 生成的二维码的字节数组 byte [ ]
10561056
*/
1057-
byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength);
1057+
byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) throws Exception;
10581058

10591059
/**
10601060
* <pre>

‎weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/BaseWxPayServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ public Map<String, String> getPayInfo(WxPayUnifiedOrderRequest request) throws W
837837
}
838838

839839
@Override
840-
public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) {
840+
public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) throws Exception {
841841
String content = this.createScanPayQrcodeMode1(productId);
842842
return this.createQrcode(content, logoFile, sideLength);
843843
}
@@ -867,11 +867,11 @@ public String createScanPayQrcodeMode1(String productId) {
867867
}
868868

869869
@Override
870-
public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) {
870+
public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) throws Exception {
871871
return this.createQrcode(codeUrl, logoFile, sideLength);
872872
}
873873

874-
private byte[] createQrcode(String content, File logoFile, Integer sideLength) {
874+
private byte[] createQrcode(String content, File logoFile, Integer sideLength) throws Exception {
875875
if (sideLength == null || sideLength < 1) {
876876
return QrcodeUtils.createQrcode(content, logoFile);
877877
}

0 commit comments

Comments
 (0)