Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 063fbb7

Browse filesBrowse files
altuseaaltusea
authored
🎨 升级部分依赖版本，优化代码，部分代码增加泛型参数
1 parent a7b007f commit 063fbb7
Copy full SHA for 063fbb7

File tree

Expand file treeCollapse file tree

263 files changed

+559
-607
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

263 files changed

+559
-607
lines changed

‎pom.xml

Copy file name to clipboardExpand all lines: pom.xml
+7-5Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,17 +196,19 @@
196196
<dependency>
197197
<groupId>com.google.guava</groupId>
198198
<artifactId>guava</artifactId>
199-
<version>32.1.2-jre</version>
199+
<version>33.3.1-jre</version>
200200
</dependency>
201201
<dependency>
202202
<groupId>com.google.code.gson</groupId>
203203
<artifactId>gson</artifactId>
204-
<version>2.10.1</version>
204+
<version>2.13.1</version>
205205
</dependency>
206206
<dependency>
207-
<groupId>com.fasterxml.jackson.dataformat</groupId>
208-
<artifactId>jackson-dataformat-xml</artifactId>
209-
<version>2.15.2</version>
207+
<groupId>com.fasterxml.jackson</groupId>
208+
<artifactId>jackson-bom</artifactId>
209+
<version>2.18.1</version>
210+
<type>pom</type>
211+
<scope>import</scope>
210212
</dependency>
211213

212214
<!-- 测试所用依赖 -->

‎solon-plugins/wx-java-qidian-solon-plugin/src/main/java/com/binarywang/solon/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java

Copy file name to clipboardExpand all lines: solon-plugins/wx-java-qidian-solon-plugin/src/main/java/com/binarywang/solon/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@
1818
import org.noear.solon.annotation.Configuration;
1919
import org.noear.solon.annotation.Inject;
2020
import org.noear.solon.core.AppContext;
21+
import redis.clients.jedis.Jedis;
2122
import redis.clients.jedis.JedisPool;
2223
import redis.clients.jedis.JedisPoolConfig;
2324
import redis.clients.jedis.JedisSentinelPool;
2425
import redis.clients.jedis.util.Pool;
2526

27+
import java.time.Duration;
2628
import java.util.Set;
2729

2830
/**
@@ -75,7 +77,7 @@ private WxQidianConfigStorage defaultConfigStorage() {
7577
}
7678

7779
private WxQidianConfigStorage jedisConfigStorage() {
78-
Pool jedisPool;
80+
Pool<Jedis> jedisPool;
7981
if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) {
8082
jedisPool = getJedisPool();
8183
} else {
@@ -104,7 +106,7 @@ private void setWxMpInfo(WxQidianDefaultConfigImpl config) {
104106
}
105107
}
106108

107-
private Pool getJedisPool() {
109+
private Pool<Jedis> getJedisPool() {
108110
WxQidianProperties.ConfigStorage storage = wxQidianProperties.getConfigStorage();
109111
RedisProperties redis = storage.getRedis();
110112

@@ -116,7 +118,7 @@ private Pool getJedisPool() {
116118
config.setMaxIdle(redis.getMaxIdle());
117119
}
118120
if (redis.getMaxWaitMillis() != null) {
119-
config.setMaxWaitMillis(redis.getMaxWaitMillis());
121+
config.setMaxWait(Duration.ofMillis(redis.getMaxWaitMillis()));
120122
}
121123
if (redis.getMinIdle() != null) {
122124
config.setMinIdle(redis.getMinIdle());

‎spring-boot-starters/wx-java-qidian-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java

Copy file name to clipboardExpand all lines: spring-boot-starters/wx-java-qidian-spring-boot-starter/src/main/java/com/binarywang/spring/starter/wxjava/qidian/config/WxQidianStorageAutoConfiguration.java
+3-2Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.springframework.context.annotation.Bean;
2121
import org.springframework.context.annotation.Configuration;
2222
import org.springframework.data.redis.core.StringRedisTemplate;
23+
import redis.clients.jedis.Jedis;
2324
import redis.clients.jedis.JedisPool;
2425
import redis.clients.jedis.JedisPoolConfig;
2526
import redis.clients.jedis.JedisSentinelPool;
@@ -80,7 +81,7 @@ private WxQidianConfigStorage defaultConfigStorage() {
8081
}
8182

8283
private WxQidianConfigStorage jedisConfigStorage() {
83-
Pool jedisPool;
84+
Pool<Jedis> jedisPool;
8485
if (StringUtils.isNotEmpty(redisHost) || StringUtils.isNotEmpty(redisHost2)) {
8586
jedisPool = getJedisPool();
8687
} else {
@@ -136,7 +137,7 @@ private void setWxMpInfo(WxQidianDefaultConfigImpl config) {
136137
}
137138
}
138139

139-
private Pool getJedisPool() {
140+
private Pool<Jedis> getJedisPool() {
140141
WxQidianProperties.ConfigStorage storage = wxQidianProperties.getConfigStorage();
141142
RedisProperties redis = storage.getRedis();
142143

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/BaseWxChannelService.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/BaseWxChannelService.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,5 +131,5 @@ public interface BaseWxChannelService extends WxService {
131131
*
132132
* @return . request http
133133
*/
134-
RequestHttp getRequestHttp();
134+
RequestHttp<?, ?> getRequestHttp();
135135
}

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/BaseWxChannelServiceImpl.java
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public abstract class BaseWxChannelServiceImpl<H, P> implements WxChannelService
6666
private int maxRetryTimes = 5;
6767

6868
@Override
69-
public RequestHttp getRequestHttp() {
69+
public RequestHttp<H, P> getRequestHttp() {
7070
return this;
7171
}
7272

@@ -75,7 +75,7 @@ public boolean checkSignature(String timestamp, String nonce, String signature)
7575
try {
7676
return SHA1.gen(this.getConfig().getToken(), timestamp, nonce).equals(signature);
7777
} catch (Exception e) {
78-
log.error("Checking signature failed, and the reason is :" + e.getMessage());
78+
log.error("Checking signature failed, and the reason is :{}", e.getMessage());
7979
return false;
8080
}
8181
}
@@ -276,7 +276,7 @@ protected <T, E> T executeInternal(RequestExecutor<T, E> executor, String uri, E
276276
* @throws WxErrorException 异常
277277
*/
278278
protected String extractAccessToken(String resultContent) throws WxErrorException {
279-
log.debug("access-token response: " + resultContent);
279+
log.debug("access-token response: {}", resultContent);
280280
WxChannelConfig config = this.getConfig();
281281
WxError error = WxError.fromJson(resultContent, WxType.Channel);
282282
if (error.getErrorCode() != 0) {

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxAssistantServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxAssistantServiceImpl.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class WxAssistantServiceImpl implements WxAssistantService {
2929

3030
/** 微信商店服务 */
31-
private final BaseWxChannelServiceImpl shopService;
31+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3232
@Override
3333
public WxChannelBaseResponse addWindowProduct(AddWindowProductRequest req) throws WxErrorException {
3434
String resJson = shopService.post(ADD_WINDOW_PRODUCT_URL, "{}");

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAddressServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAddressServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
public class WxChannelAddressServiceImpl implements WxChannelAddressService {
3030

3131
/** 微信商店服务 */
32-
private final BaseWxChannelServiceImpl shopService;
32+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3333

34-
public WxChannelAddressServiceImpl(BaseWxChannelServiceImpl shopService) {
34+
public WxChannelAddressServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
3535
this.shopService = shopService;
3636
}
3737

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAfterSaleServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelAfterSaleServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
public class WxChannelAfterSaleServiceImpl implements WxChannelAfterSaleService {
2424

2525
/** 微信商店服务 */
26-
private final BaseWxChannelServiceImpl shopService;
26+
private final BaseWxChannelServiceImpl<?, ?> shopService;
2727

28-
public WxChannelAfterSaleServiceImpl(BaseWxChannelServiceImpl shopService) {
28+
public WxChannelAfterSaleServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
2929
this.shopService = shopService;
3030
}
3131

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelBasicServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelBasicServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
public class WxChannelBasicServiceImpl implements WxChannelBasicService {
3232

3333
/** 微信商店服务 */
34-
private final BaseWxChannelServiceImpl shopService;
34+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3535

36-
public WxChannelBasicServiceImpl(BaseWxChannelServiceImpl shopService) {
36+
public WxChannelBasicServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
3737
this.shopService = shopService;
3838
}
3939

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelBrandServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelBrandServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
public class WxChannelBrandServiceImpl implements WxChannelBrandService {
3434

3535
/** 微信商店服务 */
36-
private final BaseWxChannelServiceImpl shopService;
36+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3737

38-
public WxChannelBrandServiceImpl(BaseWxChannelServiceImpl shopService) {
38+
public WxChannelBrandServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
3939
this.shopService = shopService;
4040
}
4141

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCategoryServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCategoryServiceImpl.java
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
public class WxChannelCategoryServiceImpl implements WxChannelCategoryService {
3838

3939
/** 微信商店服务 */
40-
private final BaseWxChannelServiceImpl shopService;
40+
private final BaseWxChannelServiceImpl<?, ?> shopService;
4141

42-
public WxChannelCategoryServiceImpl(BaseWxChannelServiceImpl shopService) {
42+
public WxChannelCategoryServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
4343
this.shopService = shopService;
4444
}
4545

@@ -56,7 +56,7 @@ public List<ShopCategory> listAvailableCategory(String parentId) throws WxErrorE
5656
try {
5757
pid = Long.parseLong(parentId);
5858
} catch (Throwable e) {
59-
log.error("parentId必须为数字, " + parentId, e);
59+
log.error("parentId必须为数字, {}", parentId, e);
6060
return Collections.emptyList();
6161
}
6262
String reqJson = "{\"f_cat_id\": " + pid + "}";
@@ -80,7 +80,7 @@ public CategoryDetailResult getCategoryDetail(String id) throws WxErrorException
8080
try {
8181
catId = Long.parseLong(id);
8282
} catch (Throwable e) {
83-
log.error("id必须为数字, " + id, e);
83+
log.error("id必须为数字, {}", id, e);
8484
return ResponseUtils.internalError(CategoryDetailResult.class);
8585
}
8686
String reqJson = "{\"cat_id\": " + catId + "}";

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassFinderServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public class WxChannelCompassFinderServiceImpl implements WxChannelCompassFinder
2020
/**
2121
* 微信商店服务
2222
*/
23-
private final BaseWxChannelServiceImpl shopService;
23+
private final BaseWxChannelServiceImpl<?, ?> shopService;
2424

25-
public WxChannelCompassFinderServiceImpl(BaseWxChannelServiceImpl shopService) {this.shopService = shopService;}
25+
public WxChannelCompassFinderServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {this.shopService = shopService;}
2626

2727
@Override
2828
public OverallResponse getOverall(String ds) throws WxErrorException {

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassShopServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCompassShopServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public class WxChannelCompassShopServiceImpl implements WxChannelCompassShopServ
4141
/**
4242
* 微信商店服务
4343
*/
44-
private final BaseWxChannelServiceImpl shopService;
44+
private final BaseWxChannelServiceImpl<?, ?> shopService;
4545

46-
public WxChannelCompassShopServiceImpl(BaseWxChannelServiceImpl shopService) {this.shopService = shopService;}
46+
public WxChannelCompassShopServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {this.shopService = shopService;}
4747

4848
@Override
4949
public ShopOverallResponse getShopOverall(String ds) throws WxErrorException {

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCouponServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelCouponServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
public class WxChannelCouponServiceImpl implements WxChannelCouponService {
3636

3737
/** 微信商店服务 */
38-
private final BaseWxChannelServiceImpl shopService;
38+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3939

40-
public WxChannelCouponServiceImpl(BaseWxChannelServiceImpl shopService) {
40+
public WxChannelCouponServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
4141
this.shopService = shopService;
4242
}
4343

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelFreightTemplateServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelFreightTemplateServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
@Slf4j
2525
public class WxChannelFreightTemplateServiceImpl implements WxChannelFreightTemplateService {
2626
/** 微信商店服务 */
27-
private final BaseWxChannelServiceImpl shopService;
27+
private final BaseWxChannelServiceImpl<?, ?> shopService;
2828

29-
public WxChannelFreightTemplateServiceImpl(BaseWxChannelServiceImpl shopService) {
29+
public WxChannelFreightTemplateServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
3030
this.shopService = shopService;
3131
}
3232

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelFundServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelFundServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public class WxChannelFundServiceImpl implements WxChannelFundService {
5454

5555

5656
/** 微信商店服务 */
57-
private final BaseWxChannelServiceImpl shopService;
57+
private final BaseWxChannelServiceImpl<?, ?> shopService;
5858

59-
public WxChannelFundServiceImpl(BaseWxChannelServiceImpl shopService) {
59+
public WxChannelFundServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
6060
this.shopService = shopService;
6161
}
6262

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelLiveDashboardServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public class WxChannelLiveDashboardServiceImpl implements WxChannelLiveDashboard
2727
/**
2828
* 微信商店服务
2929
*/
30-
private final BaseWxChannelServiceImpl shopService;
30+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3131
private final ObjectMapper objectMapper = new ObjectMapper();
3232

33-
public WxChannelLiveDashboardServiceImpl(BaseWxChannelServiceImpl shopService) {this.shopService = shopService;}
33+
public WxChannelLiveDashboardServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {this.shopService = shopService;}
3434

3535
@Override
3636
public LiveListResponse getLiveList(Long ds) throws WxErrorException {

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelOrderServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
public class WxChannelOrderServiceImpl implements WxChannelOrderService {
4040

4141
/** 微信商店服务 */
42-
private final BaseWxChannelServiceImpl shopService;
42+
private final BaseWxChannelServiceImpl<?, ?> shopService;
4343

44-
public WxChannelOrderServiceImpl(BaseWxChannelServiceImpl shopService) {
44+
public WxChannelOrderServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
4545
this.shopService = shopService;
4646
}
4747

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelProductServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelProductServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
public class WxChannelProductServiceImpl implements WxChannelProductService {
5757

5858
/** 微信商店服务 */
59-
private final BaseWxChannelServiceImpl shopService;
59+
private final BaseWxChannelServiceImpl<?, ?> shopService;
6060

61-
public WxChannelProductServiceImpl(BaseWxChannelServiceImpl shopService) {
61+
public WxChannelProductServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
6262
this.shopService = shopService;
6363
}
6464

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelSharerServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelSharerServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
public class WxChannelSharerServiceImpl implements WxChannelSharerService {
3434

3535
/** 微信商店服务 */
36-
private final BaseWxChannelServiceImpl shopService;
36+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3737

38-
public WxChannelSharerServiceImpl(BaseWxChannelServiceImpl shopService) {
38+
public WxChannelSharerServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
3939
this.shopService = shopService;
4040
}
4141

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelVipServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelVipServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
@Slf4j
2020
public class WxChannelVipServiceImpl implements WxChannelVipService {
21-
private BaseWxChannelServiceImpl shopService;
21+
private final BaseWxChannelServiceImpl<?, ?> shopService;
2222

23-
public WxChannelVipServiceImpl(BaseWxChannelServiceImpl shopService) {
23+
public WxChannelVipServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
2424
this.shopService = shopService;
2525
}
2626

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelWarehouseServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelWarehouseServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
public class WxChannelWarehouseServiceImpl implements WxChannelWarehouseService {
4141

4242
/** 微信商店服务 */
43-
private final BaseWxChannelServiceImpl shopService;
43+
private final BaseWxChannelServiceImpl<?, ?> shopService;
4444

45-
public WxChannelWarehouseServiceImpl(BaseWxChannelServiceImpl shopService) {
45+
public WxChannelWarehouseServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
4646
this.shopService = shopService;
4747
}
4848

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxFinderLiveServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxFinderLiveServiceImpl.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class WxFinderLiveServiceImpl implements WxFinderLiveService {
2727

2828
/** 微信商店服务 */
29-
private final BaseWxChannelServiceImpl shopService;
29+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3030
@Override
3131
public FinderAttrResponse getFinderAttrByAppid() throws WxErrorException {
3232
String resJson = shopService.post(GET_FINDER_ATTR_BY_APPID, "{}");

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeadComponentServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeadComponentServiceImpl.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
public class WxLeadComponentServiceImpl implements WxLeadComponentService {
3939

4040
/** 微信商店服务 */
41-
private final BaseWxChannelServiceImpl shopService;
41+
private final BaseWxChannelServiceImpl<?, ?> shopService;
4242
private final ObjectMapper objectMapper = new ObjectMapper();
4343
@Override
4444
public LeadInfoResponse getLeadsInfoByComponentId(GetLeadInfoByComponentRequest req) throws WxErrorException {

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeagueProductServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeagueProductServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
public class WxLeagueProductServiceImpl implements WxLeagueProductService {
3333

3434
/** 微信商店服务 */
35-
private final BaseWxChannelServiceImpl shopService;
35+
private final BaseWxChannelServiceImpl<?, ?> shopService;
3636

37-
public WxLeagueProductServiceImpl(BaseWxChannelServiceImpl shopService) {
37+
public WxLeagueProductServiceImpl(BaseWxChannelServiceImpl<?, ?>shopService) {
3838
this.shopService = shopService;
3939
}
4040

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeaguePromoterServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeaguePromoterServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
public class WxLeaguePromoterServiceImpl implements WxLeaguePromoterService {
2525

2626
/** 微信商店服务 */
27-
private final BaseWxChannelServiceImpl shopService;
27+
private final BaseWxChannelServiceImpl<?, ?> shopService;
2828

29-
public WxLeaguePromoterServiceImpl(BaseWxChannelServiceImpl shopService) {
29+
public WxLeaguePromoterServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
3030
this.shopService = shopService;
3131
}
3232

‎weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeagueSupplierServiceImpl.java

Copy file name to clipboardExpand all lines: weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxLeagueSupplierServiceImpl.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
public class WxLeagueSupplierServiceImpl implements WxLeagueSupplierService {
3939

4040
/** 微信商店服务 */
41-
private final BaseWxChannelServiceImpl shopService;
41+
private final BaseWxChannelServiceImpl<?, ?> shopService;
4242

43-
public WxLeagueSupplierServiceImpl(BaseWxChannelServiceImpl shopService) {
43+
public WxLeagueSupplierServiceImpl(BaseWxChannelServiceImpl<?, ?> shopService) {
4444
this.shopService = shopService;
4545
}
4646

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.