Merge remote-tracking branch 'origin/fbp-1.0' into fbp-1.0

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<Class, Stub<?>> entry : HttpServiceMap.getInstance().entrySet()) {
+                Stub<?> stub = entry.getValue();
+                stub.clearProxy();
+            }
             LoginResponseInfoBean bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo));
             // 服务器如果没返回token，肯定是出问题了，直接抛出异常
             if (StringUtils.isEmpty(bean.getAccessToken())) {

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

designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java

@@ -37,12 +37,8 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
     }
 
     private void initFitAttrModel() {
-        //旧决策报表
-        fitAttrModelList.add(new FrmFitAttrModel());
         //普通报表
         fitAttrModelList.add(new CptFitAttrModel());
-        //决策报表
-        fitAttrModelList.add(new AdaptiveFrmFitAttrModel());
         Set<FitAttrModelProvider> fitAttrModelProviders = ExtraDesignClassManager.getInstance().getArray(FitAttrModelProvider.XML_TAG);
         for (FitAttrModelProvider fitAttrModelProvider : fitAttrModelProviders) {
             fitAttrModelList.add(fitAttrModelProvider);

designer-base/src/main/java/com/fr/env/RemoteWorkspaceURL.java

@@ -16,7 +16,7 @@ public class RemoteWorkspaceURL implements FCloneable {
 
     private static final String IPV6_JUDGE_SYMBOL2 = "]";
 
-    public static final String SYSTEM_LOGIN_PATH = "#management/system/login";
+    public static final String SYSTEM_LOGIN_PATH = "decision#/management/login_center";
 
     /**
      * 默认 web app name