Visitar URL original
特约商户进件相关接口实现 by zhouyongshen · Pull Request #1706 · binarywang/WxJava · GitHub
Skip to content

特约商户进件相关接口实现 #1706

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.

Sign up for GitHub

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
binarywang merged 3 commits into from
Aug 7, 2020
Merged

特约商户进件相关接口实现 #1706

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9eed3a
1. 实现v3上传图片功能
zhouyongshen Aug 7, 2020
c2a4f95
实现特约商户进件相关接口
zhouyongshen Aug 7, 2020
06005db
Merge remote-tracking branch 'upstream/develop' into applyment4sub
zhouyongshen Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'upstream/develop' into applyment4sub 
# Conflicts:
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/WxPayService.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceApacheHttpImpl.java
#	weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/WxPayServiceJoddHttpImpl.java
  • Loading branch information
@zhouyongshen
zhouyongshen committed Aug 7, 2020
commit 06005db97cafa591c497ad897934d3b9f8aa55b4
5 changes: 1 addition & 4 deletions weixin-java-pay/src/main/java/com/github/binarywang/wxpay/config/WxPayConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
import com.github.binarywang.wxpay.v3.auth.*;
import com.github.binarywang.wxpay.v3.util.PemUtils;
import jodd.util.ResourcesUtil;
import lombok.AccessLevel;
import lombok.Data;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.RegExUtils;
Expand All @@ -29,7 +27,6 @@
* @author Binary Wang (https://github.com/binarywang)
*/
@Data
@Getter
public class WxPayConfig {
private static final String DEFAULT_PAY_BASE_URL = "https://api.mch.weixin.qq.com";
private static final String PROBLEM_MSG = "证书文件【%s】有问题，请核实！";
Expand Down Expand Up @@ -325,7 +322,7 @@ public CloseableHttpClient initApiV3HttpClient() throws WxPayException {
.withValidator(new WxPayValidator(verifier))
.build();
this.apiV3HttpClient = httpClient;
this.verifier = verifier;
this.verifier=verifier;

return httpClient;
} catch (Exception e) {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.