REPORT-139235 【fr-fbp冒烟】平台关闭权限控制，次管应该拥有所有数据连接的权限

1 month ago · 0067ec5909
6 changed files with 11 additions and 64 deletions
--- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java
@ -38,6 +38,7 @@ import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.repository.connection.ConnectionRepository;

 import javax.swing.AbstractButton;
 import javax.swing.Action;
@ -471,11 +472,11 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
                        new SwingWorker<Boolean, Void>() {
                            @Override
                            protected Boolean doInBackground() throws Exception {
-                                // 获取无权限连接名称集合
-                                Collection<String> noAuthConnections = TableDataAuthHelper.getNoAuthConnections();
+                                // 获取有权限的连接名称集合
+                                Collection<String> authConnections = ConnectionRepository.getInstance().getConnNames();
                                // 获取当前数据集对应的数据连接名称
                                String connectionName = TableDataAuthHelper.getConnectionNameByDBTableData((DBTableData) wrapper.getTableData());
-                                return !noAuthConnections.contains(connectionName);
+                                return authConnections.contains(connectionName);
                            }

                            @Override
--- a/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java
@ -1,9 +1,7 @@
 package com.fr.design.data.datapane;

-import com.fanruan.config.impl.data.ConnectionConfigProviderFactory;
 import com.fr.base.TableData;
 import com.fr.data.core.DataCoreUtils;
-import com.fr.data.core.db.DBUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.core.db.dialect.Dialect;
 import com.fr.data.core.db.dialect.DialectFactory;
@ -39,14 +37,9 @@ import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
-import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;

-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTree;
-import javax.swing.SwingWorker;
+import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.PopupMenuEvent;
@ -56,21 +49,14 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreePath;
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
+import java.awt.*;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.CancellationException;

 /**
@ -339,20 +325,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
    }

    private List<String> getHasAuthConnections() {
-        List<String> authConnections = new ArrayList<>();
-        Set<String> allConnections = new HashSet<>(ConnectionRepository.getInstance().getConnNames());
-        // 待实现
-        Collection<String> noAuthConnections = RemoteAuthorityRepository.getInstance().getNoAuthConnections();
-        if (noAuthConnections == null) {
-            return authConnections;
-        }
-
-        for (String name : allConnections) {
-            if (!noAuthConnections.contains(name)) {
-                authConnections.add(name);
-            }
-        }
-        return authConnections;
+        return ConnectionRepository.getInstance().getConnNames();
    }

    /**
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
@ -71,6 +71,7 @@ import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import org.jetbrains.annotations.NotNull;

 import javax.swing.Icon;
@ -1056,11 +1057,11 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                new SwingWorker<Boolean, Void>() {
                    @Override
                    protected Boolean doInBackground() throws Exception {
-                        // 获取无权限连接名称集合
-                        Collection<String> noAuthConnections = TableDataAuthHelper.getNoAuthConnections();
+                        // 获取有权限的连接名称集合
+                        Collection<String> authConnections = ConnectionRepository.getInstance().getConnNames();
                        // 获取当前数据集对应的数据连接名称
                        String connectionName = TableDataAuthHelper.getConnectionNameByDBTableData((DBTableData) wrapper.getTableData());
-                        return !noAuthConnections.contains(connectionName);
+                        return authConnections.contains(connectionName);
                    }

                    @Override
--- a/designer-base/src/main/java/com/fr/design/data/datapane/auth/TableDataAuthHelper.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/auth/TableDataAuthHelper.java
@ -6,11 +6,6 @@ import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
-import com.fr.workspace.server.connection.DBConnectAuth;
-import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
-
-import java.util.Collection;
-import java.util.Collections;

 /**
 * 数据连接权限相关的工具类
@ -28,16 +23,6 @@ public class TableDataAuthHelper {
        return !WorkContext.getCurrent().isLocal() && tableData instanceof DBTableData;
    }

-    /**
-     * 获取无权限数据连接集合
-     * 远程下需要调用RPC，为耗时操作，谨慎使用
-     * @return
-     */
-    public static Collection<String> getNoAuthConnections() {
-        // 获取无权限连接集合
-        Collection<String> noAuthConnections = RemoteAuthorityRepository.getInstance().getNoAuthConnections();
-        return noAuthConnections == null ? Collections.emptyList() : noAuthConnections;
-    }

    /**
     * 通过数据集获取其数据连接的名称
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionComboBoxPanel.java
@ -13,7 +13,6 @@ import com.fr.design.gui.ibutton.UILockButton;
 import com.fr.report.LockItem;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
-import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;

 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
@ -22,7 +21,6 @@ import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@ -80,19 +78,10 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
     * 刷新ComboBox.items
     */
    protected Iterator<String> items() {
-        Collection<String> noAuthConnections = RemoteAuthorityRepository.getInstance().getNoAuthConnections();
-
        nameList = new ArrayList<>();
-
-        if (noAuthConnections == null) {
-            return nameList.iterator();
-        }
        final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
        for (Map.Entry<String, Connection> connectionEntry : connectionMap.entrySet()) {
            String conName = connectionEntry.getKey();
-            if (noAuthConnections.contains(conName)) {
-                continue;
-            }
            filterConnection(connectionEntry.getValue(), conName, nameList);
        }
        return nameList.iterator();
--- a/designer-realize/src/main/java/com/fanruan/boot/env/function/app/DesignAppComponent.java
+++ b/designer-realize/src/main/java/com/fanruan/boot/env/function/app/DesignAppComponent.java
@ -10,7 +10,6 @@ import com.fr.design.mainframe.App;
 import com.fr.design.mainframe.AppGroup;
 import com.fr.design.mainframe.JTemplateFactory;
 import com.fr.nx.app.designer.CptxApp;
-import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;

 import java.util.ArrayList;
 import java.util.List;
@ -44,7 +43,6 @@ public class DesignAppComponent {
     */
    @Stop
    public void stop() {
-        RemoteAuthorityRepository.getInstance().invalidCache();
        List<App> appList = new ArrayList<>(Carina.getApplicationContext().group(AppGroup.class).getAll());
        for (App app : appList) {
            JTemplateFactory.remove(app);