冲突修复

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

@@ -1,6 +1,6 @@
 package com.fr.design.env;
 
-//import com.fr.cluster.engine.remote.ClusterOperator;
+import com.fr.cluster.engine.remote.ClusterOperator;
 import com.fr.design.i18n.Toolkit;
 import com.fr.base.operator.common.CommonOperator;
 import com.fr.rpc.ExceptionHandler;
@@ -79,13 +79,12 @@ public class RemoteWorkspace implements Workspace {
 
     @Override
     public boolean isCluster() {
-        return false;
-//        return WorkContext.getCurrent().get(ClusterOperator.class, new ExceptionHandler<Boolean>() {
-//            @Override
-//            public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
-//                return false;
-//            }
-//        }).isCluster();
+        return WorkContext.getCurrent().get(ClusterOperator.class, new ExceptionHandler<Boolean>() {
+            @Override
+            public Boolean callHandler(RPCInvokerExceptionInfo rpcInvokerExceptionInfo) {
+                return false;
+            }
+        }).isCluster();
     }
 
     @Override