🎨 升级部分依赖版本，优化代码，部分代码增加泛型参数

codeOwlAI · codeOwlAI · May 13, 2025 · May 13, 2025 · May 13, 2025 · May 13, 2025
commit 063fbb7f194e4f0fcac7fceea9f6e85065f6333e
diff --git a/pom.xml b/pom.xml
@@ -196,17 +196,19 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>32.1.2-jre</version>
+        <version>33.3.1-jre</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.gson</groupId>
         <artifactId>gson</artifactId>
-        <version>2.10.1</version>
+        <version>2.13.1</version>
       </dependency>
       <dependency>
-        <groupId>com.fasterxml.jackson.dataformat</groupId>
-        <artifactId>jackson-dataformat-xml</artifactId>
-        <version>2.15.2</version>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
+        <version>2.18.1</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <!-- 测试所用依赖 -->

diff --git a/...main/java/com/binarywang/solon/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java b/...main/java/com/binarywang/solon/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java
@@ -18,11 +18,13 @@
 import org.noear.solon.annotation.Configuration;
 import org.noear.solon.annotation.Inject;
 import org.noear.solon.core.AppContext;
+import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.JedisSentinelPool;
 import redis.clients.jedis.util.Pool;
 
+import java.time.Duration;
 import java.util.Set;
 
 /**
@@ -75,7 +77,7 @@ private WxQidianConfigStorage defaultConfigStorage() {
   }
 
   private WxQidianConfigStorage jedisConfigStorage() {
-    Pool jedisPool;
+    Pool<Jedis> jedisPool;
     if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) {
       jedisPool = getJedisPool();
     } else {
@@ -104,7 +106,7 @@ private void setWxMpInfo(WxQidianDefaultConfigImpl config) {
     }
   }
 
-  private Pool getJedisPool() {
+  private Pool<Jedis> getJedisPool() {
     WxQidianProperties.ConfigStorage storage = wxQidianProperties.getConfigStorage();
     RedisProperties redis = storage.getRedis();
 
@@ -116,7 +118,7 @@ private Pool getJedisPool() {
       config.setMaxIdle(redis.getMaxIdle());
     }
     if (redis.getMaxWaitMillis() != null) {
-      config.setMaxWaitMillis(redis.getMaxWaitMillis());
+      config.setMaxWait(Duration.ofMillis(redis.getMaxWaitMillis()));
     }
     if (redis.getMinIdle() != null) {
       config.setMinIdle(redis.getMinIdle());

diff --git a/.../com/binarywang/spring/starter/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java b/.../com/binarywang/spring/starter/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java
@@ -20,6 +20,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.StringRedisTemplate;
+import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
 import redis.clients.jedis.JedisSentinelPool;
@@ -80,7 +81,7 @@ private WxQidianConfigStorage defaultConfigStorage() {
   }
 
   private WxQidianConfigStorage jedisConfigStorage() {
-    Pool jedisPool;
+    Pool<Jedis> jedisPool;
     if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) {
       jedisPool = getJedisPool();
     } else {
@@ -136,7 +137,7 @@ private void setWxMpInfo(WxQidianDefaultConfigImpl config) {
     }
   }
 
-  private Pool getJedisPool() {
+  private Pool<Jedis> getJedisPool() {
     WxQidianProperties.ConfigStorage storage = wxQidianProperties.getConfigStorage();
     RedisProperties redis = storage.getRedis();
 

diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/BaseWxChannelService.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/BaseWxChannelService.java
@@ -131,5 +131,5 @@ public interface BaseWxChannelService extends WxService {
    *
    * @return . request http
    */
-  RequestHttp getRequestHttp();
+  RequestHttp<?, ?> getRequestHttp();
 }
diff --git a/...va-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java b/...va-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java
@@ -66,7 +66,7 @@ public abstract class BaseWxChannelServiceImpl<H, P> implements WxChannelService
   private int maxRetryTimes = 5;
 
   @Override
-  public RequestHttp getRequestHttp() {
+  public RequestHttp<H, P> getRequestHttp() {
     return this;
   }
 
@@ -75,7 +75,7 @@ public boolean checkSignature(String timestamp, String nonce, String signature)
     try {
       return SHA1.gen(this.getConfig().getToken(), timestamp, nonce).equals(signature);
     } catch (Exception e) {
-      log.error("Checking signature failed, and the reason is :" + e.getMessage());
+      log.error("Checking signature failed, and the reason is :{}", e.getMessage());
       return false;
     }
   }
@@ -276,7 +276,7 @@ protected <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E
    * @throws WxErrorException 异常
    */
   protected String extractAccessToken(String resultContent) throws WxErrorException {
-    log.debug("access-token response: " + resultContent);
+    log.debug("access-token response: {}", resultContent);
     WxChannelConfig config = this.getConfig();
     WxError error = WxError.fromJson(resultContent, WxType.Channel);
     if (error.getErrorCode() != 0) {

diff --git a/...java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxAssistantServiceImpl.java b/...java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxAssistantServiceImpl.java
@@ -28,7 +28,7 @@
 public class WxAssistantServiceImpl implements WxAssistantService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
   @Override
   public WxChannelBaseResponse addWindowProduct(AddWindowProductRequest req) throws WxErrorException {
     String resJson = shopService.post(ADD_WINDOW_PRODUCT_URL, "{}");

diff --git a/...channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAddressServiceImpl.java b/...channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAddressServiceImpl.java
@@ -29,9 +29,9 @@
 public class WxChannelAddressServiceImpl implements WxChannelAddressService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelAddressServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelAddressServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...annel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAfterSaleServiceImpl.java b/...annel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAfterSaleServiceImpl.java
@@ -23,9 +23,9 @@
 public class WxChannelAfterSaleServiceImpl implements WxChannelAfterSaleService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelAfterSaleServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelAfterSaleServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...a-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelBasicServiceImpl.java b/...a-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelBasicServiceImpl.java
@@ -31,9 +31,9 @@
 public class WxChannelBasicServiceImpl implements WxChannelBasicService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelBasicServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelBasicServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...a-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelBrandServiceImpl.java b/...a-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelBrandServiceImpl.java
@@ -33,9 +33,9 @@
 public class WxChannelBrandServiceImpl implements WxChannelBrandService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelBrandServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelBrandServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...hannel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCategoryServiceImpl.java b/...hannel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCategoryServiceImpl.java
@@ -37,9 +37,9 @@
 public class WxChannelCategoryServiceImpl implements WxChannelCategoryService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelCategoryServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelCategoryServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 
@@ -56,7 +56,7 @@ public List<ShopCategory> listAvailableCategory(String parentId) throws WxErrorE
     try {
       pid = Long.parseLong(parentId);
     } catch (Throwable e) {
-      log.error("parentId必须为数字, " + parentId, e);
+      log.error("parentId必须为数字, {}", parentId, e);
       return Collections.emptyList();
     }
     String reqJson = "{\"f_cat_id\": " + pid + "}";
@@ -80,7 +80,7 @@ public CategoryDetailResult getCategoryDetail(String id) throws WxErrorException
     try {
       catId = Long.parseLong(id);
     } catch (Throwable e) {
-      log.error("id必须为数字, " + id, e);
+      log.error("id必须为数字, {}", id, e);
       return ResponseUtils.internalError(CategoryDetailResult.class);
     }
     String reqJson = "{\"cat_id\": " + catId + "}";

diff --git a/...l/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImpl.java b/...l/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImpl.java
@@ -20,9 +20,9 @@ public class WxChannelCompassFinderServiceImpl implements WxChannelCompassFinder
   /**
    * 微信商店服务
    */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelCompassFinderServiceImpl(BaseWxChannelServiceImpl shopService) {this.shopService = shopService;}
+  public WxChannelCompassFinderServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {this.shopService = shopService;}
 
   @Override
   public OverallResponse getOverall(String ds) throws WxErrorException {

diff --git a/...nel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassShopServiceImpl.java b/...nel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassShopServiceImpl.java
@@ -41,9 +41,9 @@ public class WxChannelCompassShopServiceImpl implements WxChannelCompassShopServ
   /**
    * 微信商店服务
    */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelCompassShopServiceImpl(BaseWxChannelServiceImpl shopService) {this.shopService = shopService;}
+  public WxChannelCompassShopServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {this.shopService = shopService;}
 
   @Override
   public ShopOverallResponse getShopOverall(String ds) throws WxErrorException {

diff --git a/...-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCouponServiceImpl.java b/...-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCouponServiceImpl.java
@@ -35,9 +35,9 @@
 public class WxChannelCouponServiceImpl implements WxChannelCouponService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelCouponServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelCouponServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelFreightTemplateServiceImpl.java b/...src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelFreightTemplateServiceImpl.java
@@ -24,9 +24,9 @@
 @Slf4j
 public class WxChannelFreightTemplateServiceImpl implements WxChannelFreightTemplateService {
     /** 微信商店服务 */
-    private final BaseWxChannelServiceImpl shopService;
+    private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-    public WxChannelFreightTemplateServiceImpl(BaseWxChannelServiceImpl shopService) {
+    public WxChannelFreightTemplateServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
         this.shopService = shopService;
     }
 

diff --git a/...va-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelFundServiceImpl.java b/...va-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelFundServiceImpl.java
@@ -54,9 +54,9 @@ public class WxChannelFundServiceImpl implements WxChannelFundService {
 
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelFundServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelFundServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...l/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImpl.java b/...l/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImpl.java
@@ -27,10 +27,10 @@ public class WxChannelLiveDashboardServiceImpl implements WxChannelLiveDashboard
   /**
    * 微信商店服务
    */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
   private final ObjectMapper objectMapper = new ObjectMapper();
 
-  public WxChannelLiveDashboardServiceImpl(BaseWxChannelServiceImpl shopService) {this.shopService = shopService;}
+  public WxChannelLiveDashboardServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {this.shopService = shopService;}
 
   @Override
   public LiveListResponse getLiveList(Long ds) throws WxErrorException {

diff --git a/...a-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImpl.java b/...a-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImpl.java
@@ -39,9 +39,9 @@
 public class WxChannelOrderServiceImpl implements WxChannelOrderService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelOrderServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelOrderServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelProductServiceImpl.java b/...channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelProductServiceImpl.java
@@ -56,9 +56,9 @@
 public class WxChannelProductServiceImpl implements WxChannelProductService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelProductServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelProductServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelSharerServiceImpl.java b/...-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelSharerServiceImpl.java
@@ -33,9 +33,9 @@
 public class WxChannelSharerServiceImpl implements WxChannelSharerService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelSharerServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelSharerServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...ava-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelVipServiceImpl.java b/...ava-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelVipServiceImpl.java
@@ -18,9 +18,9 @@
 
 @Slf4j
 public class WxChannelVipServiceImpl implements WxChannelVipService {
-  private BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelVipServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelVipServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...annel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelWarehouseServiceImpl.java b/...annel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelWarehouseServiceImpl.java
@@ -40,9 +40,9 @@
 public class WxChannelWarehouseServiceImpl implements WxChannelWarehouseService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxChannelWarehouseServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxChannelWarehouseServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...ava-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxFinderLiveServiceImpl.java b/...ava-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxFinderLiveServiceImpl.java
@@ -26,7 +26,7 @@
 public class WxFinderLiveServiceImpl implements WxFinderLiveService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
   @Override
   public FinderAttrResponse getFinderAttrByAppid() throws WxErrorException {
     String resJson = shopService.post(GET_FINDER_ATTR_BY_APPID, "{}");

diff --git a/...-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeadComponentServiceImpl.java b/...-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeadComponentServiceImpl.java
@@ -38,7 +38,7 @@
 public class WxLeadComponentServiceImpl implements WxLeadComponentService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
   private final ObjectMapper objectMapper = new ObjectMapper();
   @Override
   public LeadInfoResponse getLeadsInfoByComponentId(GetLeadInfoByComponentRequest req) throws WxErrorException {

diff --git a/...-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeagueProductServiceImpl.java b/...-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeagueProductServiceImpl.java
@@ -32,9 +32,9 @@
 public class WxLeagueProductServiceImpl implements WxLeagueProductService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxLeagueProductServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxLeagueProductServiceImpl(BaseWxChannelServiceImpl<?, ?>shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeaguePromoterServiceImpl.java b/...channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeaguePromoterServiceImpl.java
@@ -24,9 +24,9 @@
 public class WxLeaguePromoterServiceImpl implements WxLeaguePromoterService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxLeaguePromoterServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxLeaguePromoterServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }
 

diff --git a/...channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeagueSupplierServiceImpl.java b/...channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeagueSupplierServiceImpl.java
@@ -38,9 +38,9 @@
 public class WxLeagueSupplierServiceImpl implements WxLeagueSupplierService {
 
   /** 微信商店服务 */
-  private final BaseWxChannelServiceImpl shopService;
+  private final BaseWxChannelServiceImpl<?, ?> shopService;
 
-  public WxLeagueSupplierServiceImpl(BaseWxChannelServiceImpl shopService) {
+  public WxLeagueSupplierServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
     this.shopService = shopService;
   }