From 479b0e80bae1132086ae3873bdc291c40fe85e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 10 Oct 2024 19:24:30 +0800 Subject: [PATCH 01/12] =?UTF-8?q?REPORT-135889=20fix=EF=BC=9A=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E5=A4=B1=E8=B4=A5=E5=A0=86=E6=A0=88=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/dialog/UIDetailErrorLinkDialog.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDetailErrorLinkDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDetailErrorLinkDialog.java index ebacf24d5d..67b7ffeda8 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDetailErrorLinkDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/UIDetailErrorLinkDialog.java @@ -5,6 +5,7 @@ import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIStyle; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.base.GraphHelper; +import com.fr.design.border.FineBorderFactory; import com.fr.design.dialog.link.MessageWithLink; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; @@ -14,7 +15,6 @@ import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.DesignUtils; import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.general.IOUtils; import com.fr.stable.StringUtils; import java.awt.BorderLayout; import java.awt.Color; @@ -30,7 +30,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.io.PrintWriter; import java.io.StringWriter; -import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.SwingUtilities; @@ -179,9 +178,11 @@ public class UIDetailErrorLinkDialog extends UIDialog { public StackPane(String stack) { setLayout(new BorderLayout()); UITextArea textArea = new UITextArea(); + textArea.setBorder(null); textArea.setEditable(false); textArea.setText(stack); UIScrollPane scrollPane = new UIScrollPane(textArea); + scrollPane.setBorder(FineBorderFactory.createWrappedRoundBorder()); add(scrollPane); // 滚动条默认在顶部 SwingUtilities.invokeLater(new Runnable() { From 497f41fa69437842b8f2e5e8dd65233eefecc598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 10 Oct 2024 19:25:16 +0800 Subject: [PATCH 02/12] =?UTF-8?q?REPORT-136077=20fix=EF=BC=9A=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E9=9D=A2=E6=9D=BF=E5=85=BC=E5=AE=B9=E6=97=A7=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/mainframe/EastRegionContainerPane.java | 1 + 1 file changed, 1 insertion(+) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java index f462c018d4..d46bfdd8ac 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java @@ -1041,6 +1041,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { button.setIcon(new LazyIcon(getBtnIconId(), ICON_WIDTH)); button.setDisabledIcon(new LazyIcon(btnIconName + ICON_SUFFIX_DISABLED, ICON_WIDTH)); } else { + iconSuffix = ICON_SUFFIX_NORMAL_DEPRECATED; button.setIcon(IconUtils.readIcon(getBtnIconUrl())); button.setDisabledIcon(IconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED_DEPRECATED)); } From 51bfec255c83f56de09ae10ccdbc81ecaf581dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Thu, 10 Oct 2024 19:25:57 +0800 Subject: [PATCH 03/12] =?UTF-8?q?REPORT-136650=20fix=EF=BC=9A=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E8=87=AA=E9=80=82=E5=BA=94=E6=8C=89=E9=92=AE=E4=BA=A4?= =?UTF-8?q?=E4=BA=92=E5=BC=82=E5=B8=B8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/widget/ui/ButtonGroupDictPane.java | 58 ++++++------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java index 752b6e44c8..14d9be0450 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/ButtonGroupDictPane.java @@ -1,8 +1,9 @@ package com.fr.design.widget.ui; +import com.fine.swing.ui.layout.Row; +import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.data.Dictionary; -import com.fr.design.gui.core.ReactiveCardPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ispinner.UIBasicSpinner; @@ -11,11 +12,8 @@ import com.fr.design.mainframe.widget.accessibles.AccessibleDictionaryEditor; import com.fr.design.widget.FRWidgetFactory; import com.fr.form.ui.ButtonGroup; -import javax.swing.BorderFactory; import javax.swing.JPanel; import javax.swing.SpinnerNumberModel; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import static com.fine.swing.ui.layout.Layouts.cell; import static com.fine.swing.ui.layout.Layouts.column; @@ -29,7 +27,7 @@ public class ButtonGroupDictPane extends JPanel { private UICheckBox adaptiveCheckbox; private UILabel columnLabel; private AccessibleDictionaryEditor dictPane; - private ReactiveCardPane reactiveCardPane; + private Row showColumn; public ButtonGroupDictPane() { @@ -41,51 +39,29 @@ public class ButtonGroupDictPane extends JPanel { */ public void initComponents() { dictPane = new AccessibleDictionaryEditor(); - this.setLayout(FRGUIPaneFactory.createBorderLayout()); - adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true); - adaptiveCheckbox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - adaptiveCheckbox.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - boolean selected = adaptiveCheckbox.isSelected(); - if (selected) { - reactiveCardPane.select("adaptive").populate(); - } else { - reactiveCardPane.select("inadaptive").populate(); - } - } - }); UILabel dictLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")); this.columnLabel = FRWidgetFactory.createLineWrapLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Button_Group_Display_Columns") + ":", dictLabel.getPreferredSize().width); columnSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, 0, Integer.MAX_VALUE, 1)); - - reactiveCardPane = ReactiveCardPane.create() - .addSupplier("adaptive", () -> column( - 10, - row(cell(dictLabel).weight(LEFT_WEIGHT), cell(dictPane).weight(RIGHT_WEIGHT)), - row(cell(adaptiveCheckbox)), - row(cell(columnLabel).weight(LEFT_WEIGHT), cell(columnSpinner).weight(RIGHT_WEIGHT)) - ).getComponent() - ).addSupplier("inadaptive", () -> column( - 10, - row(cell(dictLabel).weight(LEFT_WEIGHT), cell(dictPane).weight(RIGHT_WEIGHT)), - row(cell(adaptiveCheckbox)) - ).getComponent()); - - reactiveCardPane.select("inadaptive").populate(); - this.add(reactiveCardPane); - + showColumn = row(cell(columnLabel).weight(LEFT_WEIGHT), cell(columnSpinner).weight(RIGHT_WEIGHT)).getComponent(); + this.setLayout(FRGUIPaneFactory.createBorderLayout()); + adaptiveCheckbox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Adaptive"), true); + adaptiveCheckbox.setBorder(new ScaledEmptyBorder(0, 0, 0, 0)); + adaptiveCheckbox.addActionListener(e -> { + boolean selected = adaptiveCheckbox.isSelected(); + showColumn.setVisible(!selected); + }); + this.add(column(10, + row(cell(dictLabel).weight(LEFT_WEIGHT), cell(dictPane).weight(RIGHT_WEIGHT)), + row(cell(adaptiveCheckbox)), + cell(showColumn) + ).getComponent()); } public void populate(ButtonGroup buttonGroup) { dictPane.setValue(buttonGroup.getDictionary()); adaptiveCheckbox.setSelected(buttonGroup.isAdaptive()); boolean selected = adaptiveCheckbox.isSelected(); - if (selected) { - reactiveCardPane.select("adaptive").populate(); - } else { - reactiveCardPane.select("inadaptive").populate(); - } + showColumn.setVisible(!selected); columnSpinner.setValue(buttonGroup.getColumnsInRow()); } From b2f1965056968a49cf230b857cb8388460300976 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 11 Oct 2024 11:47:54 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1,=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/start/DesignLauncher.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/start/DesignLauncher.java b/designer-realize/src/main/java/com/fr/start/DesignLauncher.java index 4dbc59f4ed..b62d546972 100644 --- a/designer-realize/src/main/java/com/fr/start/DesignLauncher.java +++ b/designer-realize/src/main/java/com/fr/start/DesignLauncher.java @@ -34,6 +34,11 @@ public class DesignLauncher extends XmlCarinaLauncher { return context; } + @Override + protected void initEncryption() throws CarinaException { + + } + @Override protected void initTenant() throws CarinaException { } @@ -41,7 +46,7 @@ public class DesignLauncher extends XmlCarinaLauncher { @Override protected void initServiceDiscovery() throws CarinaException { try { - Carina.properties(DiscoveryProperties.class).setServer("local"); + Carina.properties(DiscoveryProperties.class).setType("local"); // 服务发现初始化 DiscoveryFactory.initialize(); } catch (Exception e) { From 068b68d647910df9f956eae8bac0125c4548a600 Mon Sep 17 00:00:00 2001 From: vito Date: Fri, 11 Oct 2024 16:45:11 +0800 Subject: [PATCH 05/12] =?UTF-8?q?REPORT-136934=20=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E4=B8=8B=E5=8F=8C=E5=87=BB=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/file/TemplateTreePane.java | 44 ++++++++++++------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java index 262da62117..2971f38e22 100644 --- a/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java +++ b/designer-base/src/main/java/com/fr/design/file/TemplateTreePane.java @@ -37,11 +37,17 @@ import com.fr.workspace.base.UserInfo; import com.fr.workspace.server.repository.vcs.VcsRepository; import org.jetbrains.annotations.Nullable; -import javax.swing.*; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; +import javax.swing.SwingWorker; +import javax.swing.ToolTipManager; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Desktop; +import java.awt.Dimension; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.awt.event.MouseAdapter; @@ -53,8 +59,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Enumeration; import java.util.Objects; -import java.util.Observable; -import java.util.Observer; import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -88,12 +92,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { ToolTipManager.sharedInstance().registerComponent(reportletsTree); - FileLockStateObservable.getInstance().addObserver(new Observer() { - @Override - public void update(Observable o, Object arg) { - TemplateTreePane.this.refresh(); - } - }); + FileLockStateObservable.getInstance().addObserver((o, arg) -> TemplateTreePane.this.refresh()); /* * Tree.MouseAdapter @@ -102,6 +101,9 @@ public class TemplateTreePane extends JPanel implements FileOperations { @Override public void mousePressed(MouseEvent evt) { + if (isDirectorySelection()) { + return; + } if (evt.getClickCount() == 2) { DesignCacheManager.processByCacheTableData(() -> openFile()); } @@ -157,6 +159,16 @@ public class TemplateTreePane extends JPanel implements FileOperations { }); } + /** + * 选中的是否目录 + * + * @return 是否目录 + */ + private boolean isDirectorySelection() { + FileNode fileNode = reportletsTree.getSelectedFileNode(); + return fileNode != null && fileNode.isDirectory(); + } + public TemplateFileTree getTemplateFileTree() { return this.reportletsTree; } @@ -256,7 +268,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { } @Nullable - private JTemplate getOpenedTemplate(String path) { + private JTemplate getOpenedTemplate(String path) { for (JTemplate template : HistoryTemplateListCache.getInstance().getHistoryList()) { if (ComparatorUtils.equals(template.getEditingFILE().getPath(), path)) { return template; @@ -380,7 +392,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { TreePath[] paths = reportletsTree.getSelectionPaths(); if (paths == null) { reportletsTree.refresh(); - } else { + } else { for (TreePath path : Objects.requireNonNull(reportletsTree.getSelectionPaths())) { reportletsTree.refreshParent(path); } @@ -389,7 +401,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { } private void deleteNodes(Collection nodes) { - new SwingWorker(){ + new SwingWorker() { @Override protected Boolean doInBackground() throws Exception { boolean success = true; @@ -415,6 +427,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { } return success; } + @Override protected void done() { try { @@ -518,6 +531,7 @@ public class TemplateTreePane extends JPanel implements FileOperations { } return false; } + public void setToolbarStateChangeListener(FileToolbarStateChangeListener listener) { this.toolBarStateChangeListener = listener; } @@ -526,8 +540,8 @@ public class TemplateTreePane extends JPanel implements FileOperations { /** * 仅支持在拥有完整权限的文件夹下进行新建和重命名操作，那么是可以看到改文件夹下所有文件的。 * - * @param newName 原名 - * @param suffix 后缀名 + * @param newName 原名 + * @param suffix 后缀名 * @param baseOnSelf 检验目录时，是基于自身目录的子节点还是基于父目录的子节点进行校验 * @return 是否有重名的 */ From 22fc1b376995191406b56a0e756067de711fdc09 Mon Sep 17 00:00:00 2001 From: vito Date: Fri, 11 Oct 2024 17:29:28 +0800 Subject: [PATCH 06/12] =?UTF-8?q?REPORT-135687=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=201.=20=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=8F=B7?= =?UTF-8?q?=202.=20=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= =?UTF-8?q?=203.=20=E6=B7=BB=E5=8A=A0=E6=BB=9A=E5=8A=A8=E4=BF=9D=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debug/RemoteDesignNetWorkTablePane.java | 45 +++++++++++++++---- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java index 21cb2ab049..8fd082209a 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java @@ -4,6 +4,7 @@ import com.fanruan.workplace.http.debug.RequestInfo; import com.fine.theme.icon.LazyIcon; import com.formdev.flatlaf.util.ScaledEmptyBorder; import com.fr.design.gui.ibutton.UIButton; +import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.event.Event; import com.fr.event.EventDispatcher; import com.fr.event.Listener; @@ -34,18 +35,22 @@ import static com.fanruan.workplace.http.debug.RemoteDesignDebugEvent.REMOTE_HTT */ public class RemoteDesignNetWorkTablePane extends JPanel { private static final int K = 1024; + private static final int MS = 1000; private static final int TWO = 2; private JTable uiTable; private DefaultTableModel model; + private int count = 0; + private boolean scrollRectToVisible = false; private final Listener remoteDesignDebugListener = new Listener() { @Override public void on(Event event, RequestInfo requestInfo) { model.addRow(new Object[]{ - requestInfo.getStatus(), + count++, dateFormat(requestInfo.getDate()), requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1), - requestInfo.getConsume() + "ms", + requestInfo.getStatus(), + simpleTime(requestInfo.getConsume()), simpleSize(requestInfo.getRequestSize()), simpleSize(requestInfo.getResponseSize()), requestInfo.getSendBody(), @@ -69,9 +74,10 @@ public class RemoteDesignNetWorkTablePane extends JPanel { private void initTable() { model = new DefaultTableModel(); - model.addColumn("status"); + model.addColumn("No."); model.addColumn("time"); model.addColumn("path"); + model.addColumn("status"); model.addColumn("cost"); model.addColumn("request size"); model.addColumn("response size"); @@ -86,7 +92,8 @@ public class RemoteDesignNetWorkTablePane extends JPanel { jToolBar.setBorder(new EmptyBorder(5, 0, 10, 0)); UIButton run = new UIButton(new LazyIcon("run")); UIButton forbid = new UIButton(new LazyIcon("forbid")); - UIButton refresh = new UIButton(new LazyIcon("remove")); + UIButton remove = new UIButton(new LazyIcon("remove")); + UIToggleButton refresh = new UIToggleButton(new LazyIcon("refresh")); run.setEnabled(false); run.setToolTipText("Start Record"); run.addActionListener(e -> { @@ -100,10 +107,16 @@ public class RemoteDesignNetWorkTablePane extends JPanel { run.setEnabled(true); forbid.setEnabled(false); }); - refresh.setToolTipText("Clear Records"); - refresh.addActionListener(e -> model.setRowCount(0)); + remove.setToolTipText("Clear Records"); + remove.addActionListener(e -> { + model.setRowCount(0); + count = 0; + }); + refresh.setToolTipText("Always Scroll To Visible"); + refresh.addActionListener(e -> scrollRectToVisible = !scrollRectToVisible); jToolBar.add(run); jToolBar.add(forbid); + jToolBar.add(remove); jToolBar.add(refresh); add(jToolBar, BorderLayout.NORTH); } @@ -120,20 +133,23 @@ public class RemoteDesignNetWorkTablePane extends JPanel { EventDispatcher.listen(REMOTE_HTTP_REQUEST, remoteDesignDebugListener); } - private static void adjustColumnWidths(JTable table) { + private void adjustColumnWidths(JTable table) { + int row = table.getRowCount() - 1; + // 从最后一行来调整大小 for (int column = 0; column < table.getColumnCount() - TWO; column++) { TableColumn tableColumn = table.getColumnModel().getColumn(column); int preferredWidth = 20; int maxWidth = tableColumn.getMaxWidth(); tableColumn.setMinWidth(0); - // 从最后一行来调整大小 - int row = table.getRowCount() - 1; TableCellRenderer cellRenderer = table.getCellRenderer(row, column); Component component = table.prepareRenderer(cellRenderer, row, column); int width = component.getPreferredSize().width + table.getIntercellSpacing().width; preferredWidth = Math.max(preferredWidth, Math.min(width, maxWidth)); tableColumn.setPreferredWidth(preferredWidth); } + if (scrollRectToVisible) { + table.scrollRectToVisible(table.getCellRect(row, 0, true)); + } } private static String dateFormat(Date date) { @@ -141,6 +157,17 @@ public class RemoteDesignNetWorkTablePane extends JPanel { return dateFormat.format(date); } + private static String simpleTime(long time) { + if (time < 0) { + return time + ""; + } else if (time < MS) { + return time + " ms"; + } else { + DecimalFormat df = new DecimalFormat("#.0"); + return df.format((float) time / MS) + " s"; + } + } + private static String simpleSize(long bytes) { if (bytes < 0) { return bytes + ""; From ad45176383b919cdae1e013223a8f4cf2639adf0 Mon Sep 17 00:00:00 2001 From: vito Date: Fri, 11 Oct 2024 20:32:55 +0800 Subject: [PATCH 07/12] =?UTF-8?q?REPORT-135687=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=201.=20=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E6=94=AF=E6=8C=81=EF=BC=8C=E5=BA=8F=E5=8F=B7=EF=BC=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E5=A4=A7=E5=B0=8F=E6=8E=92=E5=BA=8F=202.=20?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=BC=82=E6=AD=A5=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/debug/RemoteDesignNetWorkHelper.java | 83 +++++++++++++++++++ .../debug/RemoteDesignNetWorkTablePane.java | 67 +++++---------- .../RemoteDesignNetWorkTableRowSorter.java | 32 +++++++ 3 files changed, 137 insertions(+), 45 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java create mode 100644 designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java new file mode 100644 index 0000000000..ba08291379 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkHelper.java @@ -0,0 +1,83 @@ +package com.fr.design.remote.ui.debug; + +import com.fr.stable.StringUtils; + +import java.text.DecimalFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * 帮助类 + * + * @author vito + * @since 11.0 + * Created on 2024/10/11 + */ +public class RemoteDesignNetWorkHelper { + private static final int UNIT = 1000; + private static final int UNIT_BYTES = 1024; + private static final String SECOND = "s"; + private static final int K = 1024; + private static final int MS = 1000; + + static String dateFormat(Date date) { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + return dateFormat.format(date); + } + + static String simpleTime(long time) { + if (time < 0) { + return time + ""; + } else if (time < MS) { + return time + " ms"; + } else { + DecimalFormat df = new DecimalFormat("#.0"); + return df.format((float) time / MS) + " s"; + } + } + + static String simpleSize(long bytes) { + if (bytes < 0) { + return bytes + ""; + } else if (bytes < K) { + return bytes + " B"; + } else { + DecimalFormat df = new DecimalFormat("#.00"); + return df.format((float) bytes / K) + " K"; + } + } + + static long parseCostToMS(String timeStr) { + String[] split = timeStr.split(" "); + if (split.length > 1) { + double number = Double.parseDouble(split[0]); + String unit = split[1].toLowerCase(); + + if (StringUtils.equals(unit, SECOND)) { + return (long) (number * UNIT); + } + return (long) number; + } + return 0; + } + + static long parseSizeToBytes(String sizeStr) { + String[] split = sizeStr.split(" "); + if (split.length > 1) { + double number = Double.parseDouble(split[0]); + String unit = split[1].toUpperCase(); + + switch (unit) { + case "K": + return (long) (number * UNIT_BYTES); + case "M": + return (long) (number * UNIT_BYTES * UNIT_BYTES); + case "G": + return (long) (number * UNIT_BYTES * UNIT_BYTES * UNIT_BYTES); + default: + return (long) number; + } + } + return 0; + } +} diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java index 8fd082209a..c29633aa5c 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTablePane.java @@ -14,17 +14,19 @@ import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTable; import javax.swing.JToolBar; +import javax.swing.SwingUtilities; import javax.swing.border.EmptyBorder; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumn; import java.awt.BorderLayout; import java.awt.Component; -import java.text.DecimalFormat; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.util.concurrent.atomic.AtomicLong; import static com.fanruan.workplace.http.debug.RemoteDesignDebugEvent.REMOTE_HTTP_REQUEST; +import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.dateFormat; +import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.simpleSize; +import static com.fr.design.remote.ui.debug.RemoteDesignNetWorkHelper.simpleTime; /** * 远程设计网络调试面板 @@ -34,29 +36,29 @@ import static com.fanruan.workplace.http.debug.RemoteDesignDebugEvent.REMOTE_HTT * Created on 2024/9/24 */ public class RemoteDesignNetWorkTablePane extends JPanel { - private static final int K = 1024; - private static final int MS = 1000; private static final int TWO = 2; private JTable uiTable; private DefaultTableModel model; - private int count = 0; + private final AtomicLong count = new AtomicLong(0); private boolean scrollRectToVisible = false; private final Listener remoteDesignDebugListener = new Listener() { @Override public void on(Event event, RequestInfo requestInfo) { - model.addRow(new Object[]{ - count++, - dateFormat(requestInfo.getDate()), - requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1), - requestInfo.getStatus(), - simpleTime(requestInfo.getConsume()), - simpleSize(requestInfo.getRequestSize()), - simpleSize(requestInfo.getResponseSize()), - requestInfo.getSendBody(), - requestInfo.getReturnBody(), + SwingUtilities.invokeLater(() -> { + model.addRow(new Object[]{ + count.incrementAndGet(), + dateFormat(requestInfo.getDate()), + requestInfo.getPath().substring(WorkContext.getCurrent().getPath().length() - 1), + requestInfo.getStatus(), + simpleTime(requestInfo.getConsume()), + simpleSize(requestInfo.getRequestSize()), + simpleSize(requestInfo.getResponseSize()), + requestInfo.getSendBody(), + requestInfo.getReturnBody(), + }); + adjustColumnWidths(uiTable); }); - adjustColumnWidths(uiTable); } }; @@ -84,6 +86,7 @@ public class RemoteDesignNetWorkTablePane extends JPanel { model.addColumn("request"); model.addColumn("response"); uiTable = new JTable(model); + uiTable.setRowSorter(new RemoteDesignNetWorkTableRowSorter(model)); add(new JScrollPane(uiTable), BorderLayout.CENTER); } @@ -110,10 +113,10 @@ public class RemoteDesignNetWorkTablePane extends JPanel { remove.setToolTipText("Clear Records"); remove.addActionListener(e -> { model.setRowCount(0); - count = 0; + count.set(0); }); refresh.setToolTipText("Always Scroll To Visible"); - refresh.addActionListener(e -> scrollRectToVisible = !scrollRectToVisible); + refresh.addChangeListener(e -> scrollRectToVisible = !scrollRectToVisible); jToolBar.add(run); jToolBar.add(forbid); jToolBar.add(remove); @@ -152,31 +155,5 @@ public class RemoteDesignNetWorkTablePane extends JPanel { } } - private static String dateFormat(Date date) { - SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - return dateFormat.format(date); - } - - private static String simpleTime(long time) { - if (time < 0) { - return time + ""; - } else if (time < MS) { - return time + " ms"; - } else { - DecimalFormat df = new DecimalFormat("#.0"); - return df.format((float) time / MS) + " s"; - } - } - - private static String simpleSize(long bytes) { - if (bytes < 0) { - return bytes + ""; - } else if (bytes < K) { - return bytes + " B"; - } else { - DecimalFormat df = new DecimalFormat("#.00"); - return df.format((float) bytes / K) + " K"; - } - } } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java new file mode 100644 index 0000000000..231acc72c7 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/remote/ui/debug/RemoteDesignNetWorkTableRowSorter.java @@ -0,0 +1,32 @@ +package com.fr.design.remote.ui.debug; + +import javax.swing.table.DefaultTableModel; +import javax.swing.table.TableRowSorter; +import java.util.Comparator; + +/** + * 行排序器 + * + * @author vito + * @since 11.0 + * Created on 2024/10/11 + */ +public class RemoteDesignNetWorkTableRowSorter extends TableRowSorter { + + public RemoteDesignNetWorkTableRowSorter(DefaultTableModel model) { + super(model); + setComparator(0, (Comparator) Long::compareTo); + setComparator(4, Comparator.comparingLong(RemoteDesignNetWorkHelper::parseCostToMS)); + setComparator(5, Comparator.comparingLong(RemoteDesignNetWorkHelper::parseSizeToBytes)); + setComparator(6, Comparator.comparingLong(RemoteDesignNetWorkHelper::parseSizeToBytes)); + } + + @Override + public boolean isSortable(int column) { + return column == 0 + || column == 4 + || column == 5 + || column == 6; + } + +} From 748dadd13889cc4bd152634585615dff252d1cc5 Mon Sep 17 00:00:00 2001 From: lemon Date: Mon, 14 Oct 2024 16:34:09 +0800 Subject: [PATCH 08/12] =?UTF-8?q?REPORT-137164=20fix:=20=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=A2=9C=E8=89=B2=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/style/color/NewColorSelectPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index 771a07d1d2..fb3e589650 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -462,7 +462,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { int size = colors.length; for (int i = 1; i <= total; i++) { ColorCell cell = (ColorCell) this.pane.getComponent(i); - Color color = i < size ? colors[size - i - 1] : UsedColorPane.DEFAULT_COLOR; + Color color = i < size ? colors[size - i] : UsedColorPane.DEFAULT_COLOR; cell.setColor(color == null ? UsedColorPane.DEFAULT_COLOR : color); } } From 23334d53a72ab9b17890f5b08fdc7a9263a13d1e Mon Sep 17 00:00:00 2001 From: lemon Date: Mon, 14 Oct 2024 16:37:22 +0800 Subject: [PATCH 09/12] =?UTF-8?q?REPORT-137164=20fix:=20=E6=9C=80=E8=BF=91?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E9=A2=9C=E8=89=B2=E5=B1=95=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/style/color/NewColorSelectPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index fb3e589650..1e7b3394e4 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -462,7 +462,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { int size = colors.length; for (int i = 1; i <= total; i++) { ColorCell cell = (ColorCell) this.pane.getComponent(i); - Color color = i < size ? colors[size - i] : UsedColorPane.DEFAULT_COLOR; + Color color = i <= size ? colors[size - i] : UsedColorPane.DEFAULT_COLOR; cell.setColor(color == null ? UsedColorPane.DEFAULT_COLOR : color); } } From c8ffd8966f6145aa10c1dea1a019b4769d0dfa52 Mon Sep 17 00:00:00 2001 From: "Richard.Fang" Date: Mon, 14 Oct 2024 16:58:40 +0800 Subject: [PATCH 10/12] =?UTF-8?q?REPORT-137231=20fix:=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=88=90=E5=8A=9F=E5=9B=BE=E6=A0=87=E6=9C=AA?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/actions/file/export/AbstractExportAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java index f669403db5..7026a57101 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/export/AbstractExportAction.java @@ -170,7 +170,7 @@ public abstract class AbstractExportAction> extends JT this.setProgress(100); FineLoggerFactory.getLogger().info("\"" + name + "\"" + Toolkit.i18nText("Fine-Design_Report_Finish_Export") + "!"); - FineJOptionPane.showMessageDialog( + FineJOptionPane.showSuccessMessageDialog( DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Report_Exported_Successfully") + "\n" + name); From f15df7d003056c36f72057ecb1d1cd7b7c7817a8 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Mon, 14 Oct 2024 19:16:38 +0800 Subject: [PATCH 11/12] =?UTF-8?q?REPORT-137327=20=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E4=B8=8B=E5=88=87=E6=8D=A2=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E4=BC=98=E5=8C=96=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fanruan/boot/env/DesignEnvComponent.java | 4 ++ .../config/UpDataDesignerRemoteOperator.java | 51 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 designer-realize/src/main/java/com/fanruan/config/UpDataDesignerRemoteOperator.java diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java index 3605694488..a63f0486e8 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java @@ -12,6 +12,7 @@ import com.fanruan.carina.annotions.Stop; import com.fanruan.carina.annotions.Supplemental; import com.fanruan.config.ConfigProviderFactory; import com.fanruan.config.LocalConfigSource; +import com.fanruan.config.UpDataDesignerRemoteOperator; import com.fanruan.config.realm.ConfigRealm; import com.fanruan.dao.context.DBContextProvider; import com.fanruan.dao.context.DBContextStarter; @@ -51,6 +52,7 @@ import com.fr.config.holder.ConfigChangeListener; import com.fr.config.holder.ValidateConfigManger; import com.fr.config.impl.ConfConfigProviderImpl; import com.fr.config.impl.ConfigInsecurityElementProviderImpl; +import com.fr.config.utils.UpDataHelper; import com.fr.decision.service.context.ServiceContext; import com.fr.design.backup.EnvBackupHelper; import com.fr.env.detect.EnvDetectorCenter; @@ -351,6 +353,7 @@ public class DesignEnvComponent { DaoContext.setXmlEntityDao(new RemoteXmlEntityDao()); DaoContext.setClassHelperDao(new RemoteClassHelperDao()); DaoContext.setEntityDao(new RemoteEntityDao()); + UpDataHelper.getInstance().registerOperator(UpDataDesignerRemoteOperator.getInstance()); } else { //本地 TransactorFactory.setTransactor(new HibernateTransactor()); @@ -369,6 +372,7 @@ public class DesignEnvComponent { private void stopConfConfig() { + UpDataHelper.getInstance().resetOperator(); DaoContext.setClassHelperDao(null); DaoContext.setEntityDao(null); DaoContext.setXmlEntityDao(null); diff --git a/designer-realize/src/main/java/com/fanruan/config/UpDataDesignerRemoteOperator.java b/designer-realize/src/main/java/com/fanruan/config/UpDataDesignerRemoteOperator.java new file mode 100644 index 0000000000..533e28f9d4 --- /dev/null +++ b/designer-realize/src/main/java/com/fanruan/config/UpDataDesignerRemoteOperator.java @@ -0,0 +1,51 @@ +package com.fanruan.config; + +import com.fanruan.repository.ConfigRepository; +import com.fr.config.utils.ConfData; +import com.fr.config.utils.ConfigReadUtils; +import com.fr.config.utils.PrefixHandler; +import com.fr.config.utils.UpDataOperator; +import com.fr.stable.StringUtils; + +/** + * 设计器远程下获取Updata的操作类 + * + * @author Destiny.Lin + * @since 11.0 + * Created on 2024/10/14 + */ +public class UpDataDesignerRemoteOperator implements UpDataOperator { + + private static final UpDataDesignerRemoteOperator INSTANCE = new UpDataDesignerRemoteOperator(); + + /** + * 单例 + */ + public static UpDataDesignerRemoteOperator getInstance() { + return INSTANCE; + } + + @Override + public ConfData getUpData(String prefix, String tenantId) { + return ConfigRepository.getInstance().getConfigByConfigsCache(getConfigNameSpace(prefix), () -> { + ConfData data = new ConfData(); + data.setDataMap(ConfigReadUtils.getData(prefix, tenantId)); + data.setMap(ConfigReadUtils.getClassInfo(prefix, tenantId)); + return data; + }); + } + + private String getConfigNameSpace(String id) { + + if (StringUtils.isEmpty(id)) { + throw new IllegalArgumentException("id cannot be null"); + } + int length = id.length(); + for (int i = 0; i < length; i++) { + if (PrefixHandler.SEPERATOR == id.charAt(i)) { + return id.substring(0, i); + } + } + throw new IllegalArgumentException("cannot resolve namespace of " + id); + } +} From c1e283382b254f2c82084803515324eed0d21d0c Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Tue, 15 Oct 2024 09:45:43 +0800 Subject: [PATCH 12/12] =?UTF-8?q?REPORT-137327=20=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E4=B8=8B=E5=88=87=E6=8D=A2=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E5=8D=A1=E9=A1=BF=E4=BC=98=E5=8C=96=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fanruan/boot/env/DesignEnvComponent.java | 8 ++++---- ...rator.java => SetupDataDesignerRemoteOperator.java} | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) rename designer-realize/src/main/java/com/fanruan/config/{UpDataDesignerRemoteOperator.java => SetupDataDesignerRemoteOperator.java} (77%) diff --git a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java index a63f0486e8..c9c0b627d2 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java @@ -12,7 +12,7 @@ import com.fanruan.carina.annotions.Stop; import com.fanruan.carina.annotions.Supplemental; import com.fanruan.config.ConfigProviderFactory; import com.fanruan.config.LocalConfigSource; -import com.fanruan.config.UpDataDesignerRemoteOperator; +import com.fanruan.config.SetupDataDesignerRemoteOperator; import com.fanruan.config.realm.ConfigRealm; import com.fanruan.dao.context.DBContextProvider; import com.fanruan.dao.context.DBContextStarter; @@ -52,7 +52,7 @@ import com.fr.config.holder.ConfigChangeListener; import com.fr.config.holder.ValidateConfigManger; import com.fr.config.impl.ConfConfigProviderImpl; import com.fr.config.impl.ConfigInsecurityElementProviderImpl; -import com.fr.config.utils.UpDataHelper; +import com.fr.config.utils.SetupDataHelper; import com.fr.decision.service.context.ServiceContext; import com.fr.design.backup.EnvBackupHelper; import com.fr.env.detect.EnvDetectorCenter; @@ -353,7 +353,7 @@ public class DesignEnvComponent { DaoContext.setXmlEntityDao(new RemoteXmlEntityDao()); DaoContext.setClassHelperDao(new RemoteClassHelperDao()); DaoContext.setEntityDao(new RemoteEntityDao()); - UpDataHelper.getInstance().registerOperator(UpDataDesignerRemoteOperator.getInstance()); + SetupDataHelper.getInstance().registerOperator(SetupDataDesignerRemoteOperator.getInstance()); } else { //本地 TransactorFactory.setTransactor(new HibernateTransactor()); @@ -372,7 +372,7 @@ public class DesignEnvComponent { private void stopConfConfig() { - UpDataHelper.getInstance().resetOperator(); + SetupDataHelper.getInstance().resetOperator(); DaoContext.setClassHelperDao(null); DaoContext.setEntityDao(null); DaoContext.setXmlEntityDao(null); diff --git a/designer-realize/src/main/java/com/fanruan/config/UpDataDesignerRemoteOperator.java b/designer-realize/src/main/java/com/fanruan/config/SetupDataDesignerRemoteOperator.java similarity index 77% rename from designer-realize/src/main/java/com/fanruan/config/UpDataDesignerRemoteOperator.java rename to designer-realize/src/main/java/com/fanruan/config/SetupDataDesignerRemoteOperator.java index 533e28f9d4..bf5193c2ae 100644 --- a/designer-realize/src/main/java/com/fanruan/config/UpDataDesignerRemoteOperator.java +++ b/designer-realize/src/main/java/com/fanruan/config/SetupDataDesignerRemoteOperator.java @@ -4,7 +4,7 @@ import com.fanruan.repository.ConfigRepository; import com.fr.config.utils.ConfData; import com.fr.config.utils.ConfigReadUtils; import com.fr.config.utils.PrefixHandler; -import com.fr.config.utils.UpDataOperator; +import com.fr.config.utils.SetupDataOperator; import com.fr.stable.StringUtils; /** @@ -14,19 +14,19 @@ import com.fr.stable.StringUtils; * @since 11.0 * Created on 2024/10/14 */ -public class UpDataDesignerRemoteOperator implements UpDataOperator { +public class SetupDataDesignerRemoteOperator implements SetupDataOperator { - private static final UpDataDesignerRemoteOperator INSTANCE = new UpDataDesignerRemoteOperator(); + private static final SetupDataDesignerRemoteOperator INSTANCE = new SetupDataDesignerRemoteOperator(); /** * 单例 */ - public static UpDataDesignerRemoteOperator getInstance() { + public static SetupDataDesignerRemoteOperator getInstance() { return INSTANCE; } @Override - public ConfData getUpData(String prefix, String tenantId) { + public ConfData getData(String prefix, String tenantId) { return ConfigRepository.getInstance().getConfigByConfigsCache(getConfigNameSpace(prefix), () -> { ConfData data = new ConfData(); data.setDataMap(ConfigReadUtils.getData(prefix, tenantId));