Merge pull request #4903 in DESIGN/design from bugfix/10.0 to release/10.0

* commit 'c762cb4e13937f40cc2619312fd6a95345618e8e': REPORT-53699 更改监听BeforeAllStop事件 REPORT-53699 启动设计器时模板提示插件未启用 REPORT-54573 设计器本地预览报错400请求头过大 REPORT-54486 数据集-数据连接中，主机名有\的情况没有适配 REPORT-54486 数据集-数据连接中，主机名有\的情况没有适配 REPORT-54349 设计器打开模板的启动画面显示中文 REPORT-54349 设计器打开模板的启动画面显示中文 REPORT-54354 去掉程序数据集的编辑功能
3 years ago · 426aac8706
7 changed files with 61 additions and 32 deletions
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/JDBCDefPane.java
@ -52,8 +52,8 @@ public class JDBCDefPane extends JPanel {
    public static final String DRIVER_TYPE = "driver_type";
    public static final String USER_NAME = "user_name";
    private static final String OTHER_DB = "Others";
-    private static final Pattern ORACLE_URL = Pattern.compile("^jdbc:oracle:thin:@[/]*([-0-9a-zA-Z_\\.]+)(:([0-9]+|port))?([:/](.*))?.*", Pattern.CASE_INSENSITIVE);
-    private static final Pattern GENERAL_URL = Pattern.compile("^jdbc:(mysql|sqlserver|db2|derby|postgresql|inceptor|inceptor2|hive2)://([-0-9a-zA-Z_\\.]+)(:([0-9]+|port))?((/|;DatabaseName=)(.*))?.*", Pattern.CASE_INSENSITIVE);
+    private static final Pattern ORACLE_URL = Pattern.compile("^jdbc:oracle:thin:@[/]*([-0-9a-zA-Z_\\.\\\\]+)(:([0-9]+|port))?([:/](.*))?.*", Pattern.CASE_INSENSITIVE);
+    private static final Pattern GENERAL_URL = Pattern.compile("^jdbc:(mysql|sqlserver|db2|derby|postgresql|inceptor|inceptor2|hive2)://([-0-9a-zA-Z_\\.\\\\]+)(:([0-9]+|port))?((/|;DatabaseName=)(.*))?.*", Pattern.CASE_INSENSITIVE);
    private static final Pattern PORT = Pattern.compile("^0$|^[1-9][\\d]*[\\d]*$");
    private static final Pattern CHAR_NEED_ESCAPE = Pattern.compile("[?|$^*\\\\\\[\\](){}.+]");
    // 编码转换.
--- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
@ -4,7 +4,6 @@ import com.fr.base.Parameter;
 import com.fr.data.impl.ClassTableData;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.design.formula.JavaEditorPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itableeditorpane.ParameterTableModel;
@ -15,14 +14,18 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.IOUtils;
-
 import com.fr.script.Calculator;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;

-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dialog;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

@ -65,30 +68,6 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
                dlg.setVisible(true);
            }
        });
-        UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
-        editButton.setPreferredSize(new Dimension(
-                editButton.getPreferredSize().width,
-                classNameTextField.getPreferredSize().height));
-        reportletNamePane.add(editButton);
-        editButton.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                final JavaEditorPane javaEditorPane = new JavaEditorPane(classNameTextField.getText(), JavaEditorPane.DEFAULT_TABLEDATA_STRING);
-                final BasicDialog dlg = javaEditorPane.showMediumWindow(SwingUtilities.getWindowAncestor(ClassTableDataPane.this),
-                        new DialogActionAdapter() {
-                            public void doOk() {
-                                classNameTextField.setText(javaEditorPane.getClassText());
-                            }
-                        });
-
-                javaEditorPane.addSaveActionListener(new ActionListener() {
-                    @Override
-                    public void actionPerformed(ActionEvent e) {
-                        dlg.doOK();
-                    }
-                });
-                dlg.setVisible(true);
-            }
-        });

        Component[][] components = {
        		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane},
--- a/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/OpenLoadingPane.java
@ -1,6 +1,7 @@
 package com.fr.design.mainframe;

 import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.i18n.Toolkit;
 import com.fr.general.IOUtils;
 import java.awt.Color;
 import java.awt.Component;
@ -17,9 +18,13 @@ import javax.swing.JPanel;
 */
 public class OpenLoadingPane extends JPanel {

-    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/loading.gif"));
+    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/openloading.png"));
+    private static final Color TIP_COLOR = new Color(108, 174, 235);
+    private static final int Y_GAP = 50;
+    private static final int X_GAP = 10;

    private UILabel loadingLabel;
+    private UILabel tipLabel;

    public OpenLoadingPane() {

@ -47,7 +52,12 @@ public class OpenLoadingPane extends JPanel {
                int loadingLabelHeight = loadingLabel.getPreferredSize().height;
                int loadingLabelX = (width - loadingLabelWidth) / 2;
                int loadingLabelY = (height - loadingLabelHeight) / 2;
+                int tipLabelWidth = tipLabel.getPreferredSize().width;
+                int tipLabelHeight = tipLabel.getPreferredSize().height;
+                int tipLabelX = (width - tipLabelWidth) / 2 + X_GAP;
+                int tipLabelY = loadingLabelY + loadingLabelHeight - Y_GAP;
                loadingLabel.setBounds(loadingLabelX, loadingLabelY, loadingLabelWidth, loadingLabelHeight);
+                tipLabel.setBounds(tipLabelX, tipLabelY, tipLabelWidth, tipLabelHeight);
            }

            @Override
@ -56,7 +66,10 @@ public class OpenLoadingPane extends JPanel {
        });
        setBackground(Color.WHITE);
        loadingLabel = new UILabel(LOADING_ICON);
+        tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Open_Template_Loading"));
+        tipLabel.setForeground(TIP_COLOR);
        add(loadingLabel);
+        add(tipLabel);

    }
 }
--- a/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
+++ b/designer-base/src/main/java/com/fr/start/server/FineEmbedServerActivator.java
@ -6,6 +6,7 @@ import com.fr.module.Activator;
 import com.fr.module.ModuleRole;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.ProductConstants;
+import com.fr.stable.StringUtils;
 import com.fr.startup.FineWebApplicationInitializer;
 import com.fr.third.springframework.web.SpringServletContainerInitializer;
 import com.fr.third.springframework.web.context.support.AnnotationConfigWebApplicationContext;
@ -26,6 +27,8 @@ import java.util.Set;
 */
 public class FineEmbedServerActivator extends Activator {

+    private static final String TOMCAT_MAX_HEADER_SIZE = "tomcat-maxHttpHeaderSize";
+
    private Tomcat tomcat;

    @Override
@ -68,6 +71,7 @@ public class FineEmbedServerActivator extends Activator {
        // 8.5.x 请求参数带特殊字符被tomcat拒绝 []|{}^\`"<>
        tomcat.getConnector().setProperty("relaxedQueryChars", "[]|{}^&#x5c;&#x60;&quot;&lt;&gt;");
        setMaxPostSize();
+        setMaxHttpHeaderSize();
        String docBase = new File(WorkContext.getCurrent().getPath()).getParent();

        //内置的上下文使用工程目录比如webroot
@ -102,6 +106,17 @@ public class FineEmbedServerActivator extends Activator {
        }
    }

+    private void setMaxHttpHeaderSize() {
+        String value = System.getProperty(TOMCAT_MAX_HEADER_SIZE);
+        if (StringUtils.isNotEmpty(value)) {
+            try {
+                tomcat.getConnector().setProperty("maxHttpHeaderSize", value);
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+    }
+

    private void stopServerActivator() {

--- a/designer-base/src/main/resources/com/fr/design/images/mainframe/openloading.png
+++ b/designer-base/src/main/resources/com/fr/design/images/mainframe/openloading.png
--- a/designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppUtils.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppUtils.java
@ -16,6 +16,10 @@ import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.control.PluginControllerHelper;
 import com.fr.plugin.manage.control.PluginExtraInfo;
 import com.fr.plugin.manage.control.PluginTask;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
+import com.fr.plugin.observer.PluginEventType;
+import com.fr.plugin.observer.PluginListenerRegistration;
 import com.fr.stable.StringUtils;
 import com.fr.stable.TemplateIOErrorContextHolder;
 import com.fr.third.guava.cache.Cache;
@ -39,6 +43,7 @@ public class DesignerAppUtils {
    private static final int DEFAULT_MAX_CACHE_SIZE = 50;
    private static final int DEFAULT_CONCURRENCY_LEVEL = 8;
    private static final long DEFAULT_EXPIRE_HOURS = 1;
+    private volatile static boolean enablePluginTipDialog = true;

    private static final Cache<String, Multimap<String, PluginMarkerAdapter>> ERROR_CACHE = CacheBuilder.newBuilder()
            .maximumSize(DEFAULT_MAX_CACHE_SIZE)
@ -46,6 +51,21 @@ public class DesignerAppUtils {
            .concurrencyLevel(DEFAULT_CONCURRENCY_LEVEL)
            .build();

+    public static void initPluginAllActiveListener() {
+        PluginListenerRegistration.getInstance().listen(PluginEventType.BeforeAllStop, new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                enablePluginTipDialog = false;
+            }
+        });
+        PluginListenerRegistration.getInstance().listen(PluginEventType.AfterAllActive, new PluginEventListener() {
+            @Override
+            public void on(PluginEvent event) {
+                enablePluginTipDialog = true;
+            }
+        });
+    }
+
    /**
     * 弹出指定的插件信息，
     * 并失效缓存
@ -77,7 +97,7 @@ public class DesignerAppUtils {
     * @return 格式化后的多行插件错误信息详情
     */
    public static String dealWithErrorDetailMultiLineAndCache(String key) {
-        if (!DesignerEnvManager.getEnvManager().isShowTemplateMissingPlugin()) {
+        if (!DesignerEnvManager.getEnvManager().isShowTemplateMissingPlugin() || !enablePluginTipDialog) {
            // 直接清空不提示
            TemplateIOErrorContextHolder.reset();
            return StringUtils.EMPTY;
--- a/designer-realize/src/main/java/com/fr/start/module/DesignerInitActivator.java
+++ b/designer-realize/src/main/java/com/fr/start/module/DesignerInitActivator.java
@ -1,6 +1,7 @@
 package com.fr.start.module;

 import com.fr.design.PluginClassRefreshManager;
+import com.fr.design.mainframe.app.DesignerAppUtils;
 import com.fr.module.Activator;
 import com.fr.start.DesignerInitial;

@ -17,6 +18,7 @@ public class DesignerInitActivator extends Activator {
    @Override
    public void start() {
        PluginClassRefreshManager.getInstance().load();
+        DesignerAppUtils.initPluginAllActiveListener();
        DesignerInitial.init(findSingleton(StartupArgs.class).get());
    }