From 3a8f02368770120d2cadf4b164f15af14ac6a05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9C?= <460289628@qq.com> Date: Tue, 9 Sep 2025 17:07:42 +0800 Subject: [PATCH 1/3] Update AbstractObjectQueue.java --- .../cerc/mis/queue/AbstractObjectQueue.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java b/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java index 155ed7d2..963144a7 100644 --- a/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java +++ b/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java @@ -1,15 +1,20 @@ package cn.cerc.mis.queue; import java.lang.reflect.InvocationTargetException; +import java.util.Optional; import org.bson.Document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import cn.cerc.db.core.DataException; import cn.cerc.db.core.IHandle; +import cn.cerc.db.core.SpringBean; import cn.cerc.db.tool.JsonTool; import cn.cerc.db.tool.SimpleMessage; import cn.cerc.mis.client.CorpConfigImpl; +import cn.cerc.mis.client.RemoteService; +import cn.cerc.mis.client.ServerConfigImpl; public abstract class AbstractObjectQueue extends SmqQueue { private static final Logger log = LoggerFactory.getLogger(AbstractObjectQueue.class); @@ -36,10 +41,21 @@ public abstract class AbstractObjectQueue extends SmqQueue { return message.getMessageId(); } - public String appendToRemote(IHandle handle, CorpConfigImpl remoteToken, T data) { + public String appendToRemote(IHandle handle, CorpConfigImpl remoteConfig, T data) { this.setData(data); SmqGroup group = new SmqGroup(handle); - SmqMessage message = group.addMessage(this, remoteToken.getCorpNo()); + SmqMessage message = group.addMessage(this, remoteConfig.getCorpNo()); + Optional serviceConfig = RemoteService.getServerConfig(SpringBean.context()); + if (!remoteConfig.isLocal() && serviceConfig.isPresent()) { + Optional remoteToken; + try { + remoteToken = serviceConfig.get().getToken(handle, remoteConfig.getCorpNo()); + } catch (DataException e) { + throw new RuntimeException(e.getMessage()); + } + if (remoteToken.isPresent()) + message.setToken(remoteToken.get()); + } group.start(); return message.getMessageId(); } -- Gitee From d7ed42a2807497469030739aaa7201900cccdb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9C?= <460289628@qq.com> Date: Tue, 9 Sep 2025 17:46:35 +0800 Subject: [PATCH 2/3] ad --- .../cn/cerc/mis/client/ServerConfigImpl.java | 2 +- .../cn/cerc/mis/queue/AbstractObjectQueue.java | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/summer-controller/src/main/java/cn/cerc/mis/client/ServerConfigImpl.java b/summer-controller/src/main/java/cn/cerc/mis/client/ServerConfigImpl.java index dee64294..300244b2 100644 --- a/summer-controller/src/main/java/cn/cerc/mis/client/ServerConfigImpl.java +++ b/summer-controller/src/main/java/cn/cerc/mis/client/ServerConfigImpl.java @@ -22,7 +22,7 @@ public interface ServerConfigImpl { * @param corpNo 目标的帐套代码 * @return 返回目标帐套授权的 token */ - Optional getToken(IHandle handle, String corpNo) throws DataException; + Optional getToken(IHandle handle, String corpNo); /** * 获取指定帐套的服务节点 diff --git a/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java b/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java index 963144a7..b49d0dae 100644 --- a/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java +++ b/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java @@ -7,13 +7,11 @@ import org.bson.Document; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import cn.cerc.db.core.DataException; import cn.cerc.db.core.IHandle; import cn.cerc.db.core.SpringBean; import cn.cerc.db.tool.JsonTool; import cn.cerc.db.tool.SimpleMessage; import cn.cerc.mis.client.CorpConfigImpl; -import cn.cerc.mis.client.RemoteService; import cn.cerc.mis.client.ServerConfigImpl; public abstract class AbstractObjectQueue extends SmqQueue { @@ -45,16 +43,11 @@ public abstract class AbstractObjectQueue extends SmqQueue { this.setData(data); SmqGroup group = new SmqGroup(handle); SmqMessage message = group.addMessage(this, remoteConfig.getCorpNo()); - Optional serviceConfig = RemoteService.getServerConfig(SpringBean.context()); - if (!remoteConfig.isLocal() && serviceConfig.isPresent()) { - Optional remoteToken; - try { - remoteToken = serviceConfig.get().getToken(handle, remoteConfig.getCorpNo()); - } catch (DataException e) { - throw new RuntimeException(e.getMessage()); - } - if (remoteToken.isPresent()) - message.setToken(remoteToken.get()); + if (!remoteConfig.isLocal()) { + ServerConfigImpl configImpl = SpringBean.get(ServerConfigImpl.class); + Optional result = configImpl.getToken(handle, remoteConfig.getCorpNo()); + if (result.isPresent()) + message.setToken(result.get()); } group.start(); return message.getMessageId(); -- Gitee From c4a7208fbe494a11101b5c31523330a55b31e76a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=BF=9C?= <460289628@qq.com> Date: Tue, 9 Sep 2025 17:49:57 +0800 Subject: [PATCH 3/3] Update AbstractObjectQueue.java --- .../src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java b/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java index b49d0dae..6759ac5c 100644 --- a/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java +++ b/summer-controller/src/main/java/cn/cerc/mis/queue/AbstractObjectQueue.java @@ -1,7 +1,6 @@ package cn.cerc.mis.queue; import java.lang.reflect.InvocationTargetException; -import java.util.Optional; import org.bson.Document; import org.slf4j.Logger; @@ -45,9 +44,7 @@ public abstract class AbstractObjectQueue extends SmqQueue { SmqMessage message = group.addMessage(this, remoteConfig.getCorpNo()); if (!remoteConfig.isLocal()) { ServerConfigImpl configImpl = SpringBean.get(ServerConfigImpl.class); - Optional result = configImpl.getToken(handle, remoteConfig.getCorpNo()); - if (result.isPresent()) - message.setToken(result.get()); + configImpl.getToken(handle, remoteConfig.getCorpNo()).ifPresent(token -> message.setToken(token)); } group.start(); return message.getMessageId(); -- Gitee