REPORT-114391 - 【微服务适配】远程&本地设计器能够正常启动 完善远程设计

designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java

@@ -2,6 +2,7 @@ package com.fr.design.env;
 
 import com.fanruan.workplace.http.HttpConstants;
 import com.fr.stable.StringUtils;
+import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 import com.fr.workspace.server.repository.compatible.register.CompatibleRegister;
 import com.fr.workspace.server.repository.connect.FineWorkspaceHttpClient;
 import com.fr.decision.webservice.bean.authentication.LoginRequestInfoBean;
@@ -10,7 +11,6 @@ import com.fr.workspace.connect.WorkspaceClient;
 import com.fr.workspace.connect.WorkspaceConnection;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import com.fr.workspace.connect.WorkspaceConnector;
-import com.fr.workspace.server.repository.connect.RemoteNetworkRepository;
 
 import java.net.InetAddress;
 import java.util.UUID;
@@ -38,7 +38,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
         FineWorkspaceHttpClient client = FineWorkspaceHttpClient.create("Http-Client", connectionInfo);
         LoginResponseInfoBean bean;
         try {
-             bean = RemoteNetworkRepository.getInstance().login(createLoginBean(connectionInfo));
+             bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo));
         } catch (Exception e) {
             client.closePool();
             throw e;
@@ -51,7 +51,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
     public WorkspaceClient connect(WorkspaceConnectionInfo connectionInfo) throws Exception {
         FineWorkspaceHttpClient client = FineWorkspaceHttpClient.create("Http-Client", connectionInfo);
         try {
-            LoginResponseInfoBean bean = RemoteNetworkRepository.getInstance().login(createLoginBean(connectionInfo));
+            LoginResponseInfoBean bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo));
             WorkspaceConnection connection = new WorkspaceConnection(
                     UUID.randomUUID().toString(),
                     connectionInfo.getUserName(),

designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java

@@ -39,7 +39,7 @@ import com.fr.workspace.pool.WorkRPCType;
 import com.fr.workspace.resource.WorkResource;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 import com.fr.workspace.server.repository.compatible.register.CompatibleRegister;
-import com.fr.workspace.server.repository.connect.RemoteNetworkRepository;
+import com.fanruan.workplace.network.RemoteNetworkRepository;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import com.fr.workspace.server.repository.resource.PublicResourceRepository;
 import com.fr.workspace.server.repository.resource.WorkResourceRepository;