-
-
Notifications
You must be signed in to change notification settings - Fork 9k
补充miniapp、open模块Apache HttpClient 5.x实现，将多个模块服务迁移至Apache HttpClient 5.x客户端实现 #3834
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
...iniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/WxMaServiceHttpComponentsImpl.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| package cn.binarywang.wx.miniapp.api.impl; | ||
|
|
||
| import cn.binarywang.wx.miniapp.bean.WxMaStableAccessTokenRequest; | ||
| import cn.binarywang.wx.miniapp.config.WxMaConfig; | ||
| import lombok.extern.slf4j.Slf4j; | ||
| import me.chanjar.weixin.common.util.http.HttpClientType; | ||
| import me.chanjar.weixin.common.util.http.hc.BasicResponseHandler; | ||
| import me.chanjar.weixin.common.util.http.hc.DefaultHttpComponentsClientBuilder; | ||
| import me.chanjar.weixin.common.util.http.hc.HttpComponentsClientBuilder; | ||
| import org.apache.commons.lang3.StringUtils; | ||
| import org.apache.hc.client5.http.classic.methods.HttpGet; | ||
| import org.apache.hc.client5.http.classic.methods.HttpPost; | ||
| import org.apache.hc.client5.http.config.RequestConfig; | ||
| import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; | ||
| import org.apache.hc.core5.http.ContentType; | ||
| import org.apache.hc.core5.http.HttpHost; | ||
| import org.apache.hc.core5.http.io.entity.StringEntity; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Apache Http client5 方式实现 | ||
| * | ||
| * @author <a href="https://github.com/buaazyl">zhangyl</a> | ||
| */ | ||
| @Slf4j | ||
| public class WxMaServiceHttpComponentsImpl extends BaseWxMaServiceImpl<CloseableHttpClient, HttpHost> { | ||
| private CloseableHttpClient httpClient; | ||
| private HttpHost httpProxy; | ||
|
|
||
| @Override | ||
| public void initHttp() { | ||
| WxMaConfig configStorage = this.getWxMaConfig(); | ||
| HttpComponentsClientBuilder apacheHttpClientBuilder = DefaultHttpComponentsClientBuilder.get(); | ||
|
|
||
| apacheHttpClientBuilder.httpProxyHost(configStorage.getHttpProxyHost()) | ||
| .httpProxyPort(configStorage.getHttpProxyPort()) | ||
| .httpProxyUsername(configStorage.getHttpProxyUsername()) | ||
| .httpProxyPassword(configStorage.getHttpProxyPassword() == null ? null : | ||
| configStorage.getHttpProxyPassword().toCharArray()); | ||
|
|
||
| if (configStorage.getHttpProxyHost() != null && configStorage.getHttpProxyPort() > 0) { | ||
| this.httpProxy = new HttpHost(configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort()); | ||
| } | ||
|
|
||
| this.httpClient = apacheHttpClientBuilder.build(); | ||
| } | ||
|
|
||
| @Override | ||
| public CloseableHttpClient getRequestHttpClient() { | ||
| return httpClient; | ||
| } | ||
|
|
||
| @Override | ||
| public HttpHost getRequestHttpProxy() { | ||
| return httpProxy; | ||
| } | ||
|
|
||
| @Override | ||
| public HttpClientType getRequestType() { | ||
| return HttpClientType.HTTP_COMPONENTS; | ||
| } | ||
|
|
||
| @Override | ||
| protected String doGetAccessTokenRequest() throws IOException { | ||
| String url = StringUtils.isNotEmpty(this.getWxMaConfig().getAccessTokenUrl()) ? | ||
| this.getWxMaConfig().getAccessTokenUrl() : | ||
| GET_ACCESS_TOKEN_URL.replace(WxMaConfig.DEFAULT_API_HOST_URL, this.getWxMaConfig().getEffectiveApiHostUrl()); | ||
|
|
||
| url = String.format(url, this.getWxMaConfig().getAppid(), this.getWxMaConfig().getSecret()); | ||
|
|
||
| HttpGet httpGet = new HttpGet(url); | ||
| if (this.getRequestHttpProxy() != null) { | ||
| RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build(); | ||
| httpGet.setConfig(config); | ||
| } | ||
| return getRequestHttpClient().execute(httpGet, BasicResponseHandler.INSTANCE); | ||
| } | ||
|
|
||
| @Override | ||
| protected String doGetStableAccessTokenRequest(boolean forceRefresh) throws IOException { | ||
| String url = StringUtils.isNotEmpty(this.getWxMaConfig().getAccessTokenUrl()) ? | ||
| this.getWxMaConfig().getAccessTokenUrl() : | ||
| GET_STABLE_ACCESS_TOKEN.replace( | ||
| WxMaConfig.DEFAULT_API_HOST_URL, this.getWxMaConfig().getEffectiveApiHostUrl()); | ||
|
|
||
| HttpPost httpPost = new HttpPost(url); | ||
| if (this.getRequestHttpProxy() != null) { | ||
| RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build(); | ||
| httpPost.setConfig(config); | ||
| } | ||
| WxMaStableAccessTokenRequest wxMaAccessTokenRequest = new WxMaStableAccessTokenRequest(); | ||
| wxMaAccessTokenRequest.setAppid(this.getWxMaConfig().getAppid()); | ||
| wxMaAccessTokenRequest.setSecret(this.getWxMaConfig().getSecret()); | ||
| wxMaAccessTokenRequest.setGrantType("client_credential"); | ||
| wxMaAccessTokenRequest.setForceRefresh(forceRefresh); | ||
|
|
||
| httpPost.setEntity(new StringEntity(wxMaAccessTokenRequest.toJson(), ContentType.APPLICATION_JSON)); | ||
| return getRequestHttpClient().execute(httpPost, BasicResponseHandler.INSTANCE); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.