Browse Source

:arrow_up: 升级guava版本修复 CVE-2023-2976,同时升级其他依赖包版本

Bincent 1 year ago
parent
commit
e61cf93a12

+ 11 - 11
README.md

@@ -178,17 +178,17 @@
 <summary>点击此处展开查看贡献次数最多的几位小伙伴</summary>
 
 1. [chanjarster (Daniel Qian)](https://github.com/chanjarster)
-1. [binarywang (Binary Wang)](https://github.com/binarywang)
-1. [007gzs](https://github.com/007gzs)
-1. [Silloy](https://github.com/silloy)
-1. [mgcnrx11](https://github.com/mgcnrx11)
-1. [0katekate0 (Wang_Wong)](https://github.com/0katekate0)
-1. [yuanqixun](https://github.com/yuanqixun)
-1. [kakotor](https://github.com/kakotor)
-1. [aimilin6688 (Jonk)](https://github.com/aimilin6688)
-1. [lkqm (Mario Luo)](https://github.com/lkqm)
-1. [kareanyi (MillerLin)](https://github.com/kareanyi)
-
+2. [binarywang (Binary Wang)](https://github.com/binarywang)
+3. [007gzs](https://github.com/007gzs)
+4. [Silloy](https://github.com/silloy)
+5. [mgcnrx11](https://github.com/mgcnrx11)
+6. [0katekate0 (Wang_Wong)](https://github.com/0katekate0)
+7. [yuanqixun](https://github.com/yuanqixun)
+8. [kakotor](https://github.com/kakotor)
+9. [aimilin6688 (Jonk)](https://github.com/aimilin6688)
+10. [lkqm (Mario Luo)](https://github.com/lkqm)
+11. [kareanyi (MillerLin)](https://github.com/kareanyi)
+12. [Bincent (Hongbin.hsu)](https://gitee.com/bincent)
 </details>
 
 ### GitHub Stargazers over time

+ 15 - 10
pom.xml

@@ -12,7 +12,7 @@
   <licenses>
     <license>
       <name>The Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
     </license>
   </licenses>
 
@@ -102,6 +102,11 @@
       <email>wangkaikate@163.com</email>
       <url>https://github.com/0katekate0</url>
     </developer>
+    <developer>
+      <name>Bincent</name>
+      <email>hongbin.hsu@qq.com</email>
+      <url>https://gitee.com/bincent</url>
+    </developer>
   </developers>
 
   <scm>
@@ -139,12 +144,12 @@
       <dependency>
         <groupId>com.github.binarywang</groupId>
         <artifactId>qrcode-utils</artifactId>
-        <version>1.1</version>
+        <version>1.3</version>
       </dependency>
       <dependency>
         <groupId>org.jodd</groupId>
         <artifactId>jodd-http</artifactId>
-        <version>6.2.1</version>
+        <version>6.3.0</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -192,17 +197,17 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>32.0.0-jre</version>
+        <version>32.1.2-jre</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
-        <version>2.8.9</version>
+        <version>2.10.1</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson.dataformat</groupId>
         <artifactId>jackson-dataformat-xml</artifactId>
-        <version>2.13.0</version>
+        <version>2.15.2</version>
       </dependency>
 
       <!-- 测试所用依赖 -->
@@ -287,7 +292,7 @@
       <dependency>
         <groupId>org.redisson</groupId>
         <artifactId>redisson</artifactId>
-        <version>3.12.0</version>
+        <version>3.23.3</version>
         <optional>true</optional>
         <scope>provided</scope>
         <exclusions>
@@ -355,7 +360,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
+            <version>3.1.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -368,7 +373,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
+            <version>3.5.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -386,7 +391,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <version>3.1.0</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>

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

@@ -1025,7 +1025,7 @@ public interface WxPayService {
    * @param sideLength 要生成的二维码的边长,如果为空,则取默认值400
    * @return 生成的二维码的字节数组 byte [ ]
    */
-  byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength);
+  byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) throws Exception;
 
   /**
    * <pre>
@@ -1054,7 +1054,7 @@ public interface WxPayService {
    * @param sideLength 要生成的二维码的边长,如果为空,则取默认值400
    * @return 生成的二维码的字节数组 byte [ ]
    */
-  byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength);
+  byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) throws Exception;
 
   /**
    * <pre>

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

@@ -837,7 +837,7 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
   }
 
   @Override
-  public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) {
+  public byte[] createScanPayQrcodeMode1(String productId, File logoFile, Integer sideLength) throws Exception {
     String content = this.createScanPayQrcodeMode1(productId);
     return this.createQrcode(content, logoFile, sideLength);
   }
@@ -867,11 +867,11 @@ public abstract class BaseWxPayServiceImpl implements WxPayService {
   }
 
   @Override
-  public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) {
+  public byte[] createScanPayQrcodeMode2(String codeUrl, File logoFile, Integer sideLength) throws Exception {
     return this.createQrcode(codeUrl, logoFile, sideLength);
   }
 
-  private byte[] createQrcode(String content, File logoFile, Integer sideLength) {
+  private byte[] createQrcode(String content, File logoFile, Integer sideLength) throws Exception {
     if (sideLength == null || sideLength < 1) {
       return QrcodeUtils.createQrcode(content, logoFile);
     }