8000 格式化代码，并清理无用代码 · devandroid/weixin-java-tools@9188cea · GitHub
[go: up one dir, main page]
Skip to content

Commit 9188cea

Browse files
binarywangbinarywang
committed
格式化代码，并清理无用代码
1 parent a6d73a2 commit 9188cea

10 files changed

+14
-25
lines changed

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenComponentService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ public interface WxOpenComponentService {
3939
String MINIAPP_JSCODE_2_SESSION = "https://api.weixin.qq.com/sns/component/jscode2session?appid=%s&js_code=%s&grant_type=authorization_code&component_appid=%s";
4040

4141
WxMpService getWxMpServiceByAppid(String appid);
42+
4243
WxMaService getWxMaServiceByAppid(String appid);
44+
4345
WxOpenConfigStorage getWxOpenConfigStorage();
4446

4547
boolean checkSignature(String 10000 timestamp, String nonce, String signature);
@@ -52,6 +54,7 @@ public interface WxOpenComponentService {
5254
String getPreAuthUrl(String redirectURI) throws WxErrorException;
5355

5456
String route(WxOpenXmlMessage wxMessage) throws WxErrorException;
57+
5558
/**
5659
* 使用授权码换取公众号或小程序的接口调用凭据和授权信息
5760
*/
@@ -81,6 +84,7 @@ public interface WxOpenComponentService {
8184
WxMpOAuth2AccessToken oauth2refreshAccessToken(String appid, String refreshToken) throws WxErrorException;
8285

8386
String oauth2buildAuthorizationUrl(String appid, String redirectURI, String scope, String state);
87+
8488
WxMaJscode2SessionResult miniappJscode2Session(String appid, String jsCode, String appId) throws WxErrorException;
8589

8690
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenConfigStorage.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public interface WxOpenConfigStorage {
3737
void updateComponentAccessTokent(WxOpenComponentAccessToken componentAccessToken);
3838

3939
WxMpConfigStorage getWxMpConfigStorage(String appId);
40+
4041
WxMaConfig getWxMaConfig(String appId);
4142

4243
/**
@@ -52,14 +53,12 @@ public interface WxOpenConfigStorage {
5253
*/
5354
boolean autoRefreshToken();
5455

55-
5656
String getAuthorizerRefreshToken(String appId);
5757

5858
void setAuthorizerRefreshToken(String appId, String authorizerRefreshToken);
5959

6060
String getAuthorizerAccessToken(String appId);
6161

62-
6362
boolean isAuthorizerAccessTokenExpired(String appId);
6463

6564
/**

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public WxMaService getWxMaServiceByAppid(String appId) {
7272
}
7373
return wxMaService;
7474
}
75+
7576
public WxOpenService getWxOpenService() {
7677
return wxOpenService;
7778
}
@@ -238,7 +239,7 @@ public String oauth2buildAuthorizationUrl(String appId, String redirectURI, Stri
238239
}
239240

240241
@Override
241-
public WxMaJscode2SessionResult miniappJscode2Session(String appid, String jsCode, String appId) throws WxErrorException {
242+
public WxMaJscode2SessionResult miniappJscode2Session(String appid, String jsCode, String appId) throws WxErrorException {
242243
String url = String.format(MINIAPP_JSCODE_2_SESSION, appId, jsCode, getWxOpenConfigStorage().getComponentAppId());
243244
String responseContent = get(url);
244245
return WxMaJscode2SessionResult.fromJson(responseContent);

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenInMemoryConfigStorage.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,14 @@ private static class Token {
228228
private String token;
229229
private Long expiresTime;
230230
}
231+
231232
private static class WxOpenInnerConfigStorage implements WxMpConfigStorage, WxMaConfig {
232233
private WxOpenConfigStorage wxOpenConfigStorage;
233234
private String appId;
234235
private Lock accessTokenLock = new ReentrantLock();
235236
private Lock jsapiTicketLock = new ReentrantLock();
236237
private Lock cardApiTicketLock = new ReentrantLock();
238+
237239
private WxOpenInnerConfigStorage(WxOpenConfigStorage wxOpenConfigStorage, String appId) {
238240
this.wxOpenConfigStorage = wxOpenConfigStorage;
239241
this.appId = appId;

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMaServiceImpl.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
44
import cn.binarywang.wx.miniapp.config.WxMaConfig;
55
import me.chanjar.weixin.common.exception.WxErrorException;
6-
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
7-
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
8-
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
96
import me.chanjar.weixin.open.api.WxOpenComponentService;
107

118
/**

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMessageRouter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
public class WxOpenMessageRouter extends WxMpMessageRouter {
1212
private WxOpenService wxOpenService;
13+
1314
public WxOpenMessageRouter(WxOpenService wxOpenService) {
1415
super(null);
1516
this.wxOpenService = wxOpenService;
@@ -18,6 +19,7 @@ public WxOpenMessageRouter(WxOpenService wxOpenService) {
1819
public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, String appId) {
1920
return route(wxMessage, new HashMap<String, Object>(), appId);
2021
}
22+
2123
public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String, Object> context, String appId) {
2224
return route(wxMessage, context, wxOpenService.getWxOpenComponentService().getWxMpServiceByAppid(appId));
2325
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenMpServiceImpl.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ public WxMpOAuth2AccessToken oauth2getAccessToken(String code) throws WxErrorExc
3636
return wxOpenComponentService.oauth2getAccessToken(appId, code);
3737
}
3838

39-
// @Override
40-
// public boolean checkSignature(String timestamp, String nonce, String signature) {
41-
// return wxOpenComponentService.checkSignature(appId, timestamp, nonce, signature);
42-
// }
43-
4439
@Override
4540
public WxMpOAuth2AccessToken oauth2refreshAccessToken(String refreshToken) throws WxErrorException {
4641
return wxOpenComponentService.oauth2refreshAccessToken(appId, refreshToken);

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenServiceAbstractImpl.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,6 @@ protected synchronized <T, E> T execute(RequestExecutor<T, E> executor, String u
4242
return result;
4343
} catch (WxErrorException e) {
4444
WxError error = e.getError();
45-
// /*
46-
// * 发生以下情况时尝试刷新access_token
47-
// * 40001 获取access_token时AppSecret错误，或者access_token无效
48-
// * 42001 access_token超时
49-
// * 40014 不合法的access_token，请开发者认真比对access_token的有效性（如是否过期），或查看是否正在为恰当的公众号调用接口
50-
// */
51-
// if (error.getErrorCode() == 42001 || error.getErrorCode() == 40001 || error.getErrorCode() == 40014) {
52-
// // 强制设置wxCpConfigStorage它的access token过期了，这样在下一次请求里就会刷新access token
53-
// this.configStorage.expireAccessToken();
54-
// return execute(executor, uri, data);
55-
// }
56-
5745
if (error.getErrorCode() != 0) {
5846
this.log.error("\n【请求地址】: {}\n【请求参数】：{}\n【错误信息】：{}", uri, data, error);
5947
throw new WxErrorException(error, e);

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/message/WxOpenXmlMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class WxOpenXmlMessage implements Serializable {
5353
@XStreamConverter(value = XStreamCDataConverter.class)
5454
private String preAuthCode;
5555

56-
public static String wxMpOutXmlMessageToEncryptedXml(WxMpXmlOutMessage message, WxOpenConfigStorage wxOpenConfigStorage){
56+
public static String wxMpOutXmlMessageToEncryptedXml(WxMpXmlOutMessage message, WxOpenConfigStorage wxOpenConfigStorage) {
5757
String plainXml = message.toXml();
5858
WxOpenCryptUtil pc = new WxOpenCryptUtil(wxOpenConfigStorage);
5959
return pc.encrypt(plainXml);

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/result/WxOpenAuthorizerInfoResult.java

Lines changed: 2 additions & 1 deletion
< 17AE /div>
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ public class WxOpenAuthorizerInfoResult implements Serializable {
1515

1616
private WxOpenAuthorizationInfo authorizationInfo;
1717
private WxOpenAuthorizerInfo authorizerInfo;
18-
public boolean isMiniProgram(){
18+
19+
public boolean isMiniProgram() {
1920
return authorizerInfo != null && authorizerInfo.getMiniProgramInfo() != null;
2021
}
2122
}

0 commit comments

Comments
 (0)
0