Skip to content

1.增加判断防止出现HttpClient出现NullPointException。2.防止覆盖ConfigStorages #3144

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 1 commit into from
Oct 10, 2023
Merged

1.增加判断防止出现HttpClient出现NullPointException。2.防止覆盖ConfigStorages #3144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/api/impl/BaseWxMaServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,15 +377,24 @@ public void setMultiConfigs(Map<String, WxMaConfig> configs) {
@Override
@JsonDeserialize
public void setMultiConfigs(Map<String, WxMaConfig> configs, String defaultMiniappId) {
this.configMap = Maps.newHashMap(configs);
// 防止覆盖配置
if(this.configMap != null) {
this.configMap.putAll(configs);
} else {
this.configMap = Maps.newHashMap(configs);
}
WxMaConfigHolder.set(defaultMiniappId);
this.initHttp();
}

@Override
public void addConfig(String miniappId, WxMaConfig configStorages) {
synchronized (this) {
if (this.configMap == null) {
/*
* 因为commit f74b00cf 默认初始化了configMap，导致使用此方法无法进入if从而触发initHttp()，
* 就会出现HttpClient报NullPointException
*/
if (this.configMap == null || this.configMap.isEmpty()) {
this.setWxMaConfig(configStorages);
} else {
WxMaConfigHolder.set(miniappId);
Expand Down
13 changes: 11 additions & 2 deletions weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/BaseWxMpServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,15 +542,24 @@ public void setMultiConfigStorages(Map<String, WxMpConfigStorage> configStorages

@Override
public void setMultiConfigStorages(Map<String, WxMpConfigStorage> configStorages, String defaultMpId) {
this.configStorageMap = Maps.newHashMap(configStorages);
// 防止覆盖配置
if(this.configStorageMap != null) {
this.configStorageMap.putAll(configStorages);
} else {
this.configStorageMap = Maps.newHashMap(configStorages);
}
WxMpConfigStorageHolder.set(defaultMpId);
this.initHttp();
}

@Override
public void addConfigStorage(String mpId, WxMpConfigStorage configStorages) {
synchronized (this) {
if (this.configStorageMap == null) {
/*
* 因为commit 2aa27cf12d 默认初始化了configStorageMap，导致使用此方法无法进入if从而触发initHttp()，
* 就会出现HttpClient报NullPointException
*/
if (this.configStorageMap == null || this.configStorageMap.isEmpty()) {
this.setWxMpConfigStorage(configStorages);
} else {
WxMpConfigStorageHolder.set(mpId);
Expand Down