From 2275bcfbf840cda65c04a61e3e23e9512e28621a Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Thu, 12 Dec 2024 10:47:32 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-143610=20fr=E6=97=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E6=8F=90=E7=A4=BAnpe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/env/HttpWorkspaceConnector.java | 3 ++- .../java/com/fanruan/boot/init/DesignWorkContextComponent.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) 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 47b67e6463..f8a4cc6739 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 @@ -3,6 +3,7 @@ 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.exception.RemoteServiceErrorException; import com.fanruan.workplace.http.info.Stub; import com.fanruan.workplace.network.RemoteNetworkRepository; import com.fr.decision.webservice.bean.authentication.LoginRequestInfoBean; @@ -86,7 +87,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector { client.setTimeout(timeout); try { return RemoteNetworkRepository.getInstance().testConnect(); - } catch (RemoteDesignNoAuthException e) { + } catch (RemoteDesignNoAuthException | RemoteServiceErrorException e) { throw e; } catch (Exception e) { throw new RemoteDesignConnectionException(e, StringUtils.EMPTY); diff --git a/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java b/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java index dfba3b1279..74de42cc43 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/init/DesignWorkContextComponent.java @@ -15,6 +15,7 @@ import com.fanruan.workplace.http.RepositoryManager; import com.fanruan.workplace.http.WorkspaceHeartBeatShell; import com.fanruan.workplace.http.exception.DefaultRemoteExceptionHandler; import com.fanruan.workplace.http.exception.RemoteExceptionConvert; +import com.fanruan.workplace.http.exception.RemoteServiceErrorExceptionHandler; import com.fanruan.workplace.network.RemoteNetworkRepository; import com.fanruan.workplace.standard.ServerInfo; import com.fanruan.workplace.standard.ServerInfoOperator; @@ -160,6 +161,7 @@ public class DesignWorkContextComponent { RemoteExceptionConvert.registerException(HttpConstants.LOGIN_LOCK, new RemoteDesignLoginLockHandler()); RemoteExceptionConvert.registerException(HttpConstants.TPL_HAS_BEAN_UNLOCK, new UnLockedHandler()); RemoteExceptionConvert.registerException(HttpConstants.DRIVER_NOT_EXIST, new RemoteDriverUnExistHandler()); + RemoteExceptionConvert.registerException(HttpConstants.SERVICE_ERROR, new RemoteServiceErrorExceptionHandler()); DefaultRemoteExceptionHandler.getInstance().registerMatchMsg(ERROR_CODE, new RemoteProcedureErrorHandler()); }