Skip to content
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

Jump to bottom

【小程序/公众号】异步消息路由 #2999

Merged
merged 4 commits into from
May 4, 2023
Merged

【小程序/公众号】异步消息路由 #2999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a075c61
【小程序】路由规则使用异步时，当前的appId没有传入到子线程，导致wxMaService在子线程中无法取到父线程的appId。
biubiubiu3971 Mar 23, 2023
b204ed1
Merge branch 'Wechat-Group:develop' into develop
biubiubiu3971 Mar 24, 2023
07b0f16
Merge branch 'Wechat-Group:develop' into develop
biubiubiu3971 Apr 28, 2023
8dd138f
【小程序/公众号】消息路由，使用异步消息时，向子线程传递父线程的appId的时候，兼容只有一个appId的时候，未显式设置appId的情况
biubiubiu3971 Apr 29, 2023
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
6 changes: 5 additions & 1 deletion weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/message/WxMaMessageRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,16 +128,20 @@ public WxMaXmlOutMessage route(final WxMaMessage wxMessage, final Map<String, Ob
if (matchRules.size() == 0) {
return null;
}
String miniAppId = WxMaConfigHolder.get();

final List<Future<?>> futures = new ArrayList<>();
WxMaXmlOutMessage result = null;
for (final WxMaMessageRouterRule rule : matchRules) {
// 返回最后一个非异步的rule的执行结果
if (rule.isAsync()) {
//获取当前线程使用的实际appId，兼容只有一个appId，且未显式设置当前使用的appId的情况
String miniAppId = this.wxMaService.getWxMaConfig().getAppid();
futures.add(
this.executorService.submit(() -> {
//子线程中设置实际的appId
this.wxMaService.switchoverTo(miniAppId);
rule.service(wxMessage, context, WxMaMessageRouter.this.wxMaService, WxMaMessageRouter.this.sessionManager, WxMaMessageRouter.this.exceptionHandler);
WxMaConfigHolder.remove();
})
);
} else {
Expand Down
5 changes: 4 additions & 1 deletion weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,16 +248,19 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String,

WxMpXmlOutMessage res = null;
final List<Future<?>> futures = new ArrayList<>();
String appId = WxMpConfigStorageHolder.get();

for (final WxMpMessageRouterRule rule : matchRules) {
// 返回最后一个非异步的rule的执行结果
if (rule.isAsync()) {
//获取当前线程使用的实际appId。兼容只有一个appId，且未显式设置当前使用的appId的情况
String appId = this.wxMpService.getWxMpConfigStorage().getAppId();
futures.add(
this.executorService.submit(() -> {
//传入父线程的appId
this.wxMpService.switchoverTo(appId);
rule.service(wxMessage, context, mpService, WxMpMessageRouter.this.sessionManager,
WxMpMessageRouter.this.exceptionHandler);
WxMpConfigStorageHolder.remove();
})
);
} else {
Expand Down