diff --git a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java index e4f3b22b3f..3687735601 100644 --- a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java +++ b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java @@ -1,7 +1,9 @@ package com.fr.design.env; import com.fanruan.workplace.http.HttpConstants; +import com.fanruan.workplace.http.HttpServiceMap; import com.fanruan.workplace.http.RepositoryManager; +import com.fanruan.workplace.http.info.Stub; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository; @@ -15,6 +17,7 @@ import com.fr.workspace.connect.WorkspaceConnectionInfo; import com.fr.workspace.connect.WorkspaceConnector; import java.net.InetAddress; +import java.util.Map; import java.util.UUID; /** @@ -52,6 +55,10 @@ public class HttpWorkspaceConnector implements WorkspaceConnector { public WorkspaceClient connect(WorkspaceConnectionInfo connectionInfo) throws Exception { FineWorkspaceHttpClient client = FineWorkspaceHttpClient.create("Http-Client", connectionInfo); try { + for (Map.Entry> entry : HttpServiceMap.getInstance().entrySet()) { + Stub stub = entry.getValue(); + stub.clearProxy(); + } LoginResponseInfoBean bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo)); // 服务器如果没返回token,肯定是出问题了,直接抛出异常 if (StringUtils.isEmpty(bean.getAccessToken())) { diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java index 3ddb144a5f..b1bf63bcfe 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JControlUpdatePane.java @@ -1,5 +1,6 @@ package com.fr.design.gui.controlpane; +import com.fr.data.impl.Connection; import com.fr.design.DesignerEnvManager; import com.fr.design.beans.BasicBeanPane; import com.fr.design.data.tabledata.tabledatapane.GlobalMultiTDTableDataPane; @@ -81,6 +82,9 @@ class JControlUpdatePane extends JPanel { if (ob2Populate instanceof Listener) { listControlPane.wrapperListener((Listener) ob2Populate); } + if (ob2Populate instanceof Connection) { + ((Connection) ob2Populate).setConnectionName(elEditing.wrapper.getName()); + } updatePanes[i].populateBean(ob2Populate); } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e);