Merge pull request #15794 in DESIGN/design from fbp/release to fbp/feature

* commit '7e7d993b76cd0045267d9fa2585b8b3f7f9ef372':
  REPORT-143610 fr无服务的时候，提示npe

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);

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;
@@ -162,6 +163,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());
     }