Merge branch 'feature/x' of https://code.fineres.com/scm/~yuan.wang/design into feature/x

designer-base/src/main/java/com/fr/design/components/notification/NotificationDialog.java

@@ -32,6 +32,7 @@ import java.awt.event.MouseEvent;
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
@@ -43,8 +44,31 @@ import java.util.stream.Collectors;
  **/
 public class NotificationDialog extends JDialog {
     
-    private Dimension contentSize = new Dimension(300, 100);
+    /**
-    private Dimension buttonDimension = new Dimension(68, 20);
+     * 通知框的内部高度
+     */
+    private static final int CONTENT_INNER_HEIGHT = 60;
+    /**
+     * 通知框如果出现滚动条后的内部宽度
+     */
+    private static final int CONTENT_SCROLL_WIDTH = 280;
+    
+    private static final int CONTENT_WIDTH = 300;
+    private static final int CONTENT_HEIGHT = 100;
+    /**
+     * 通知框的外部宽高
+     */
+    private static final Dimension CONTENT_SIZE = new Dimension(CONTENT_WIDTH, CONTENT_HEIGHT);
+    private static final Dimension BUTTON_DIMENSION = new Dimension(68, 20);
+    
+    /**
+     * 标记 LABEL， 没有作用
+     */
+    private static final UILabel SIGN_LABEL = new UILabel("#");
+    /**
+     * 确认一个 LABEL 的宽高
+     */
+    private static final Dimension SIGN_LABEL_DIMENSION = SIGN_LABEL.getPreferredSize();
     
     private NotificationDialogProperties properties;
     
@@ -151,15 +175,30 @@ public class NotificationDialog extends JDialog {
                     }
                     return new UILabel(LinkStrUtils.generateHtmlTag(messageModel.format()));
                 })
+                .collect(Collectors.toList());
+    
+        // 当高度 大于 60 时，就会出现滚动条。
+        // 当出现滚动条时，需要将内部的宽度限制为 280， 否则会展示不出来
+        Function<Double, Integer> calStandardWidth = height -> height > CONTENT_INNER_HEIGHT ? CONTENT_SCROLL_WIDTH : CONTENT_WIDTH;
+    
+        int widthUnit = messageComponents.stream()
+                .map((component) -> {
+                    Dimension preferredSize = component.getPreferredSize();
+                    return preferredSize.getHeight();
+                })
+                .reduce(Double::sum)
+                .map(calStandardWidth)
+                .orElse(CONTENT_WIDTH);
+    
+        messageComponents = messageComponents.stream()
                 .peek((component) -> {
                     Dimension preferredSize = component.getPreferredSize();
                     double componentWidth = preferredSize.getWidth();
                     double componentHeight = preferredSize.getHeight();
-                    double widthFactor = Math.ceil(componentWidth / 300);
+                    double heightFactor = Math.ceil(componentHeight / SIGN_LABEL_DIMENSION.getHeight());
-                    double heightFactor = Math.ceil(componentHeight / 15);
+                    double widthFactor = Math.ceil(componentWidth / widthUnit);
-                    int realHeight = (int) (heightFactor + widthFactor - 1) * 15;
+                    int realHeight =  (int)Math.ceil(heightFactor + widthFactor - 1) * (int)(Math.ceil(SIGN_LABEL_DIMENSION.getHeight()));
-                    component.setPreferredSize(new Dimension(300, realHeight));
+                    component.setPreferredSize(new Dimension(widthUnit, realHeight));
-                    
                 })
                 .collect(Collectors.toList());
     
@@ -171,7 +210,7 @@ public class NotificationDialog extends JDialog {
         jScrollPane.setBorder(BorderFactory.createEmptyBorder());
         
         centerPanel.add(jScrollPane, BorderLayout.CENTER);
-        centerPanel.setPreferredSize(contentSize);
+        centerPanel.setPreferredSize(CONTENT_SIZE);
     
         contentPanel.add(centerPanel, BorderLayout.CENTER);
         
@@ -240,7 +279,7 @@ public class NotificationDialog extends JDialog {
             NotificationAction action = currentModel.getAction();
             if (action != null) {
                 UIButton actionButton = new UIButton(action.name());
-                actionButton.setPreferredSize(buttonDimension);
+                actionButton.setPreferredSize(BUTTON_DIMENSION);
                 actionButton.addActionListener(new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent e) {
@@ -251,7 +290,7 @@ public class NotificationDialog extends JDialog {
             }
     
             UIButton knowButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Know"));
-            knowButton.setPreferredSize(buttonDimension);
+            knowButton.setPreferredSize(BUTTON_DIMENSION);
             knowButton.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {

designer-base/src/main/java/com/fr/env/detect/EnvDetectorCenter.java

@@ -18,6 +18,7 @@ import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
 import com.fr.event.Null;
 import com.fr.start.server.EmbedServerEvent;
+import com.fr.task.Once;
 import com.fr.update.delay.DelayHelper;
 import com.fr.workspace.Workspace;
 import com.fr.workspace.WorkspaceEvent;
@@ -72,6 +73,14 @@ public class EnvDetectorCenter {
         }
     };
     
+    private final Once launchOnce = new Once(() -> {
+        
+        // 添加启动完成监听
+        EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, START_UP_COMPLETE_LISTENER);
+        // 切换完成后的监听
+        EventDispatcher.listen(WorkspaceEvent.AfterSwitch, AFTER_SWITCH_LISTENER);
+    });
+    
     private final AtomicReference<DetectorProcess> PROCESS = new AtomicReference<>();
     
     public static EnvDetectorCenter getInstance() {
@@ -96,6 +105,7 @@ public class EnvDetectorCenter {
         // 默认是启动
         PROCESS.set(DetectorProcess.DESIGN_LAUNCH);
     
+        launchOnce.run();
         listen();
     }
 
@@ -189,12 +199,6 @@ public class EnvDetectorCenter {
     
     private void listen() {
         
-        // 添加启动完成监听
-        EventDispatcher.listen(DesignerLaunchStatus.STARTUP_COMPLETE, START_UP_COMPLETE_LISTENER);
-        
-        // 切换完成后的监听
-        EventDispatcher.listen(WorkspaceEvent.AfterSwitch, AFTER_SWITCH_LISTENER);
-        
         // 内置服务器监听
         EventDispatcher.listen(EmbedServerEvent.BeforeStart, BEFORE_START_LISTENER);
         EventDispatcher.listen(EmbedServerEvent.AfterStart, AFTER_START_LISTENER);
@@ -202,8 +206,6 @@ public class EnvDetectorCenter {
     
     private void stopListen() {
     
-        EventDispatcher.stopListen(START_UP_COMPLETE_LISTENER);
-        EventDispatcher.stopListen(AFTER_SWITCH_LISTENER);
         EventDispatcher.stopListen(BEFORE_START_LISTENER);
         EventDispatcher.stopListen(AFTER_START_LISTENER);
     }

designer-base/src/main/java/com/fr/env/detect/base/DetectorConstants.java

@@ -8,4 +8,11 @@ public class DetectorConstants {
     public static final String JAR_HELP_LINK = "https://help.fanruan.com/finereport/doc-view-4700.html?source=3";
     
     public static final String FINE_DB_HELP_LINK = "https://help.fanruan.com/finereport/doc-view-4701.html?source=3";
+    
+    public static final String SEPARATOR = "、";
+    public static final String BR_TAG = "<br/>";
+    
+    public static final String WEB_LIB_PATH = "%FR_HOME%\\webapps\\webroot\\WEB-INF\\lib:";
+    
+    public static final String FR_HOME_LIB = "%FR_HOME%\\lib:";
 }

designer-base/src/main/java/com/fr/env/detect/base/DetectorUtil.java

@@ -1,6 +1,7 @@
 package com.fr.env.detect.base;
 
 import com.fr.base.function.ThrowableRunnable;
+import com.fr.common.util.Collections;
 import com.fr.design.components.notification.NotificationAction;
 import com.fr.design.components.notification.NotificationMessage;
 import com.fr.design.components.notification.NotificationModel;
@@ -14,7 +15,7 @@ import com.fr.env.detect.bean.ExceptionTips;
 import com.fr.env.detect.bean.Message;
 import com.fr.env.detect.bean.SolutionAction;
 import com.fr.general.build.BuildInfo;
-import com.fr.stable.StringUtils;
+import com.fr.third.org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.JComponent;
@@ -22,9 +23,15 @@ import java.awt.Desktop;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
 
+import static com.fr.env.detect.base.DetectorConstants.BR_TAG;
+import static com.fr.env.detect.base.DetectorConstants.FR_HOME_LIB;
+import static com.fr.env.detect.base.DetectorConstants.SEPARATOR;
+import static com.fr.env.detect.base.DetectorConstants.WEB_LIB_PATH;
+
 /**
  * created by Harrison on 2022/05/25
  **/
@@ -124,4 +131,37 @@ public class DetectorUtil {
         }
         return new UILabel(LinkStrUtils.generateHtmlTag(message.get()));
     }
+    
+    /**
+     * 将 lib 转化成合适的格式
+     * %FR_HOME%/lib
+     * %FR_HOME%/webapps/webroot/WEB-INF/lib
+     *
+     * @param libMap jar 路径, key为前缀
+     * @return 信息
+     */
+    public static String concatLibFormatMsg(Map<String, List<String>> libMap) {
+        
+        String webLibPath = WEB_LIB_PATH;
+        String homeLibPath = FR_HOME_LIB;
+        
+        StringBuilder sb = new StringBuilder();
+        
+        List<String> homeLibs = libMap.get(homeLibPath);
+        if (!Collections.isEmpty(homeLibs)) {
+            sb.append(homeLibPath);
+            sb.append(StringUtils.join(homeLibs, SEPARATOR));
+        }
+        
+        List<String> webLibs = libMap.get(webLibPath);
+        if (!Collections.isEmpty(webLibs)) {
+            if (sb.length() != 0) {
+                sb.append(BR_TAG);
+            }
+            sb.append(webLibPath);
+            sb.append(StringUtils.join(webLibs, SEPARATOR));
+        }
+        return sb.toString();
+    }
+
 }

designer-base/src/main/java/com/fr/env/detect/impl/JarInconsistentDetector.java

@@ -114,7 +114,11 @@ public class JarInconsistentDetector extends AbstractExceptionDetector {
         
         // 获取所有的不一致的 build
         List<BuildInfo> inConsistentInfos = buildInfos.stream()
-                .filter((e) -> !StringUtils.equals(designerBuild.get(), e.getGroupBuild()))
+                .filter((e) -> {
+                    // 不为空，且不相等
+                    return StringUtils.isNotEmpty(e.getGroupBuild())
+                            && !StringUtils.equals(designerBuild.get(), e.getGroupBuild());
+                })
                 .collect(Collectors.toList());
         
         // 没有直接返回
@@ -141,8 +145,11 @@ public class JarInconsistentDetector extends AbstractExceptionDetector {
         for (BuildInfo localInfo : localInfos) {
             String jar = localInfo.getJar();
             String groupContent = localInfo.getGroupBuild();
+            // 不一致的 JAR 检测，忽视缺少的情况
+            if (StringUtils.isNotEmpty(groupContent)) {
                 localMap.put(jar, groupContent);
             }
+        }
         return localMap;
     }
     

designer-base/src/main/java/com/fr/env/detect/impl/JarLackDetector.java

@@ -12,6 +12,7 @@ import com.fr.env.detect.bean.ExceptionSolution;
 import com.fr.env.detect.bean.ExceptionTips;
 import com.fr.env.detect.bean.Message;
 import com.fr.general.build.BuildInfo;
+import com.fr.general.build.BuildInfoManager;
 import com.fr.general.build.BuildInfoOperator;
 import com.fr.general.build.impl.BuildInfoOperatorImpl;
 import com.fr.third.guava.collect.Lists;
@@ -22,18 +23,18 @@ import org.jetbrains.annotations.NotNull;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import static com.fr.env.detect.base.DetectorConstants.FR_HOME_LIB;
+import static com.fr.env.detect.base.DetectorConstants.WEB_LIB_PATH;
+
 /**
  * created by Harrison on 2022/05/24
  **/
 public class JarLackDetector extends AbstractExceptionDetector {
     
-    public static final String SEPARATOR = "、";
-    public static final String BR_TAG = "<br/>";
-    public static final String WEB_LIB_PATH = "%FR_HOME%\\webapps\\webroot\\WEB-INF\\lib:";
-    public static final String FR_HOME_LIB = "%FR_HOME%\\lib:";
-    
     public JarLackDetector() {
         
         super(DetectorType.LACK_OF_JAR);
@@ -42,17 +43,40 @@ public class JarLackDetector extends AbstractExceptionDetector {
     @Override
     public DetectorResult detect() {
     
-        // 不支持远程
+        List<BuildInfo> lackInfos;
+    
+        // 远程
         if (!WorkContext.getCurrent().isLocal()) {
-            return DetectorResult.normal(type());
+            // 检测有哪些 JAR 包， 当前是否缺少对应的 JAR 包
-        }
+            BuildInfoOperator buildInfoOperator = WorkContext.getCurrent().get(BuildInfoOperator.class);
+            // 远程情况
+            List<BuildInfo> remoteInfos = buildInfoOperator.getBuildInfos();
+            // 本地情况
+            List<BuildInfo> localInfos = BuildInfoManager.getInstance().getInfos();
+    
+            Set<String> remoteSet = remoteInfos.stream()
+                    .filter(this::isExistInfo)
+                    .map(BuildInfo::getJar)
+                    .collect(Collectors.toSet());
+    
+            Predicate<BuildInfo> remoteNotContains = (e) -> !remoteSet.contains(e.getJar());
+    
+            lackInfos = localInfos.stream()
+                    .filter(this::isExistInfo)
+                    // 不是设计器的 JAR
+                    .filter((e) -> !DetectorUtil.isDesignerJar(e))
+                    .filter(remoteNotContains)
+                    .collect(Collectors.toList());
     
+        } else {
+            // 本地
             // 检测有哪些 JAR 包， 当前是否缺少对应的 JAR 包
             BuildInfoOperator buildInfoOperator = new BuildInfoOperatorImpl();
             List<BuildInfo> buildInfos = buildInfoOperator.getBuildInfos();
-        List<BuildInfo> lackInfos = buildInfos.stream()
+            lackInfos = buildInfos.stream()
                     .filter(this::isLackInfo)
                     .collect(Collectors.toList());
+        }
     
         if (Collections.isEmpty(lackInfos)) {
             return DetectorResult.normal(type());
@@ -77,40 +101,24 @@ public class JarLackDetector extends AbstractExceptionDetector {
         return ExceptionLog.create(Toolkit.i18nText(type().getLogLocale()) + message);
     }
     
-    private boolean isLackInfo(BuildInfo e) {
+    private boolean isExistInfo(BuildInfo e) {
     
-        return StringUtils.isEmpty(e.getGroupBuild());
+        return !isLackInfo(e);
     }
     
-    private Message tipsMessage(List<BuildInfo> infos) {
+    private boolean isLackInfo(BuildInfo e) {
-    
-        String webLibPath = WEB_LIB_PATH;
-        String homeLibPath = FR_HOME_LIB;
-    
-        Map<String, List<String>> libMap = groupByPath(infos, homeLibPath, webLibPath);
-    
-        StringBuilder sb = new StringBuilder();
         
-        List<String> homeLibs = libMap.get(homeLibPath);
+        return StringUtils.isEmpty(e.getGroupBuild());
-        if (!Collections.isEmpty(homeLibs)) {
-            sb.append(homeLibPath);
-            sb.append(StringUtils.join(homeLibs, SEPARATOR));
     }
     
-        List<String> webLibs = libMap.get(webLibPath);
+    private Message tipsMessage(List<BuildInfo> infos) {
-        if (!Collections.isEmpty(webLibs)) {
-            if (sb.length() != 0) {
-                sb.append(BR_TAG);
-            }
-            sb.append(webLibPath);
-            sb.append(StringUtils.join(webLibs, SEPARATOR));
-        }
     
-        String mainContent = sb.toString();
+        Map<String, List<String>> libMap = groupByPath(infos, FR_HOME_LIB, WEB_LIB_PATH);
     
+        String content = DetectorUtil.concatLibFormatMsg(libMap);
         DetectorType type = this.type();
         String header = Toolkit.i18nText(type.getTipsLocale());
-        return new Message.Simple(header + mainContent);
+        return new Message.Simple(header + content);
     }
     
     @NotNull

designer-base/src/main/java/com/fr/env/detect/impl/converter/ClassConflictConvertor.java

@@ -2,6 +2,7 @@ package com.fr.env.detect.impl.converter;
 
 import com.fr.design.i18n.Toolkit;
 import com.fr.env.detect.base.DetectorConstants;
+import com.fr.env.detect.base.DetectorUtil;
 import com.fr.env.detect.bean.DetectorResult;
 import com.fr.env.detect.bean.DetectorType;
 import com.fr.env.detect.bean.ExceptionLog;
@@ -9,7 +10,6 @@ import com.fr.env.detect.bean.ExceptionSolution;
 import com.fr.env.detect.bean.ExceptionTips;
 import com.fr.env.detect.thowable.ThrowableConverter;
 import com.fr.stable.resource.ResourceLoader;
-import com.fr.third.org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import javax.el.MethodNotFoundException;
@@ -41,6 +41,8 @@ public class ClassConflictConvertor implements ThrowableConverter {
      */
     private static final Pattern JAR_NAME_PATTERN = Pattern.compile("([\\w+-\\.]*\\.jar)");
     
+    private static final String WEB_INF_STRING = "WEB-INF";
+    
     private final Map<Class<?>, ClassNameConverter> throwableMap = new HashMap<>();
     
     public ClassConflictConvertor() {
@@ -83,6 +85,10 @@ public class ClassConflictConvertor implements ThrowableConverter {
             sign = sign.getCause();
         }
     
+        Map<String, List<String>> libMap = new HashMap<>();
+        libMap.put(DetectorConstants.FR_HOME_LIB, new ArrayList<>());
+        libMap.put(DetectorConstants.WEB_LIB_PATH, new ArrayList<>());
+        
         Set<String> allPath = new HashSet<>();
         for (String className : classNames) {
             String classFile = convertClass2Path(className);
@@ -98,12 +104,14 @@ public class ClassConflictConvertor implements ThrowableConverter {
                     Matcher matcher = JAR_NAME_PATTERN.matcher(url.getFile());
                     if (matcher.find()) {
                         String jar = matcher.group();
-                        allPath.add(jar);
+                        List<String> libPath = null;
+                        if (file.contains(WEB_INF_STRING)) {
+                            libPath = libMap.get(DetectorConstants.WEB_LIB_PATH);
                         } else {
-                        boolean containsClasses = file.contains(CLASSES);
+                            libPath = libMap.get(DetectorConstants.FR_HOME_LIB);
-                        if (containsClasses) {
-                            allPath.add(CLASSES);
                         }
+                        libPath.add(jar);
+                        allPath.add(jar);
                     }
                 }
             } catch (IOException ignore) {
@@ -115,7 +123,7 @@ public class ClassConflictConvertor implements ThrowableConverter {
             return null;
         }
     
-        String msg = StringUtils.join(allPath, SEPARATOR);
+        String msg = DetectorUtil.concatLibFormatMsg(libMap);
     
         DetectorType type = DetectorType.JAR_CONFLICT;
         return DetectorResult.exception(type,

designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java

@@ -54,9 +54,11 @@ public class EnvDetectorDialog extends JDialog {
     private static final ImageIcon LOADING_ICON = getLoadingIcon();
     public static final int TIMEOUT = 1000;
     
-    private JPanel body;
+    private final JPanel body;
     
     private final JPanel headerPanel;
+    private UIButton detectButton;
+    private JPanel resultSummaryPane;
     
     private final TablePanel tablePanel;
     
@@ -128,7 +130,7 @@ public class EnvDetectorDialog extends JDialog {
         
         JPanel headerPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         headerPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 12, 0));
-        UIButton detectButton = new UIButton(buttonStatus.getDesc()) {
+        this.detectButton = new UIButton(buttonStatus.getDesc()) {
             @Override
             public ButtonUI getUI() {
                 
@@ -152,7 +154,7 @@ public class EnvDetectorDialog extends JDialog {
         detectButton.setForeground(Color.WHITE);
         detectButton.addActionListener(event -> {
             if (buttonStatus.isNotExecuting()) {
-                startDetecting(detectButton);
+                startDetecting();
             } else {
                 stopDetecting(detectButton);
             }
@@ -165,7 +167,7 @@ public class EnvDetectorDialog extends JDialog {
         return headerPanel;
     }
     
-    private void startDetecting(UIButton detectButton) {
+    private void startDetecting() {
     
         // 重新检测的时候需要处理一些逻辑
         if (buttonStatus == EnvDetectorButtonStatus.A_NEW) {
@@ -173,7 +175,7 @@ public class EnvDetectorDialog extends JDialog {
         }
         // 执行前
         buttonStatus = buttonStatus.next();
-        UIUtil.invokeLaterIfNeeded(() -> detectButton.setText(buttonStatus.getDesc()));
+        UIUtil.invokeLaterIfNeeded(EnvDetectorDialog.this::refreshHeaderPanel);
         detectWorker = new SwingWorker<Void, Void>() {
             
             @Override
@@ -218,7 +220,7 @@ public class EnvDetectorDialog extends JDialog {
                 if (buttonStatus.isExecuting()) {
                     // 执行结束
                     buttonStatus = EnvDetectorButtonStatus.A_NEW;
-                    UIUtil.invokeLaterIfNeeded(() -> detectButton.setText(buttonStatus.getDesc()));
+                    UIUtil.invokeLaterIfNeeded(EnvDetectorDialog.this::refreshHeaderPanel);
                 }
             }
         };
@@ -251,6 +253,42 @@ public class EnvDetectorDialog extends JDialog {
         });
     }
     
+    private void updateHeaderPanel() {
+    
+        // 刷新按钮
+        detectButton.setText(buttonStatus.getDesc());
+        if (buttonStatus == EnvDetectorButtonStatus.A_NEW) {
+            this.resultSummaryPane = new JPanel();
+            this.resultSummaryPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
+            this.resultSummaryPane.setLayout(new BorderLayout(5, 0));
+            Boolean success = model.getResults()
+                    .map((e) -> {
+                        if (e.getStatus() == DetectorStatus.NORMAL) {
+                            return Boolean.TRUE;
+                        }
+                        return Boolean.FALSE;
+                    }).reduce((a, b) -> a && b)
+                    .orElse(Boolean.FALSE);
+        
+            if (success) {
+                resultSummaryPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Detect_Result_Label")), BorderLayout.WEST);
+                UILabel successLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Detect_Result_Success"));
+                successLabel.setForeground(Color.GREEN);
+                resultSummaryPane.add(successLabel, BorderLayout.CENTER);
+            } else {
+                resultSummaryPane.add(new UILabel(Toolkit.i18nText("Fine-Design_Basic_Exception")), BorderLayout.WEST);
+                UILabel resultLabel = new UILabel(Toolkit.i18nText("Fine-Design_Basic_Detect_Result_Error"));
+                resultLabel.setForeground(Color.RED);
+                resultSummaryPane.add(resultLabel, BorderLayout.CENTER);
+            }
+            this.headerPanel.add(BorderLayout.CENTER, resultSummaryPane);
+        } else {
+            if (resultSummaryPane != null) {
+                this.headerPanel.remove(resultSummaryPane);
+            }
+        }
+    }
+    
     /*  table */
     
     
@@ -394,6 +432,13 @@ public class EnvDetectorDialog extends JDialog {
         return tailPanel;
     }
     
+    private void refreshHeaderPanel() {
+        
+        updateHeaderPanel();
+        pack();
+        repaint();
+    }
+    
     private void refresh() {
     
         updateTable(this.tablePanel);
@@ -504,4 +549,9 @@ public class EnvDetectorDialog extends JDialog {
         
         public abstract EnvDetectorButtonStatus next();
     }
+    
+    private class EnvDetectorHeaderPanel extends JPanel {
+    
+    
+    }
 }

designer-base/src/test/java/com/fr/design/components/notification/NotificationDialogTest.java

@@ -31,7 +31,7 @@ public class NotificationDialogTest {
                     public void run(Object... args) {
                         System.out.println("1111");
                     }
-                }, new NotificationMessage.LinkMessage("1111  2222 33333333 4444 555 6666 66555 888 999 333 <br/> 3333", ""),new NotificationMessage.LinkMessage("display <a href='#'>model2</a> test", "abc"));
+                }, new NotificationMessage.LinkMessage("1111  2222 33333333 4444 555 6666 66555 888 999 333 <br/> 3333 <br /> 444 <br/> 555 <br/>", ""),new NotificationMessage.LinkMessage("display <a href='#'>model2</a> test", "abc"));
     
                 NotificationDialogProperties properties = new NotificationDialogProperties(frame, "test");
                 NotificationDialog dialog = new NotificationDialog(properties,  Lists.newArrayList(model1, model2));

designer-realize/src/main/java/com/fr/start/FineDesigner.java

@@ -1,5 +1,7 @@
 package com.fr.start;
 
+import com.fr.exit.DesignerExiter;
+import com.fr.process.engine.FineProcessUtils;
 import com.fr.process.engine.core.FineProcessEntry;
 
 /**
@@ -11,4 +13,20 @@ import com.fr.process.engine.core.FineProcessEntry;
  */
 public class FineDesigner extends FineProcessEntry {
     
+    public static void main(String[] args) {
+    
+        FineDesigner fineDesigner = new FineDesigner();
+        FineProcessUtils.run(fineDesigner, args);
+    }
+    
+    @Override
+    public void run(String[] args) {
+        
+        try {
+            super.run(args);
+        } catch (Throwable throwable) {
+            // 守护进程启动时，需要捕获异常。并且退出。
+            DesignerExiter.getInstance().exit(throwable);
+        }
+    }
 }

designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java

@@ -1,15 +1,19 @@
 package com.fr.start;
 
 import com.fr.common.report.ReportState;
+import com.fr.common.util.Collections;
 import com.fr.design.RestartHelper;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.mainframe.messagecollect.StartErrorMessageCollector;
 import com.fr.design.mainframe.messagecollect.entity.DesignerErrorMessage;
 import com.fr.env.detect.base.DetectorBridge;
 import com.fr.env.detect.bean.DetectorResult;
 import com.fr.env.detect.bean.DetectorStatus;
 import com.fr.env.detect.bean.DetectorType;
+import com.fr.env.detect.ui.DetectorErrorDialog;
 import com.fr.exit.DesignerExiter;
 import com.fr.general.IOUtils;
 import com.fr.io.utils.ResourceIOUtils;
@@ -17,14 +21,19 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.process.engine.core.CarryMessageEvent;
 import com.fr.process.engine.core.FineProcessContext;
 import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
 import com.fr.stable.lifecycle.ErrorType;
 import com.fr.stable.lifecycle.ErrorTypeHelper;
 import com.fr.stable.lifecycle.FineLifecycleFatalError;
 import com.fr.stable.project.ProjectConstants;
 
 import javax.swing.JOptionPane;
+import java.util.EnumMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @author hades
@@ -68,10 +77,30 @@ public class LifecycleFatalErrorHandler {
          * 自检测
          */
         SELF {
+            final EnumMap<DetectorType, String> solutionMap = new EnumMap<>(DetectorType.class);
+    
+            {
+                solutionMap.put(DetectorType.FINE_DB_LOCKED, "Fine-Design_Error_Finedb_Dirty_Backup_Reset");
+                solutionMap.put(DetectorType.FINE_DB_PERMISSION, "Fine-Design_Error_Finedb_Permission_Backup_Reset");
+                solutionMap.put(DetectorType.FINE_DB_DIRTY, "Fine-Design_Error_Finedb_Dirty_Backup_Reset");
+            }
+            
             @Override
             public void handle(FineLifecycleFatalError fatal) {
     
-                String showText = generateShowText(fatal);
+                Stream<DetectorResult> resultStream = DetectorBridge.getInstance().detect(fatal);
+                List<DetectorResult> results = resultStream
+                        .filter((e) -> e.getStatus() == DetectorStatus.EXCEPTION)
+                        .collect(Collectors.toList());
+
+                String showText = generateShowText(results);
+                // 如果还是异常，说明并不是 DB 的异常，抛出预期外的错误
+                if (StringUtils.isEmpty(showText)) {
+                    DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
+                    DetectorErrorDialog errorDialog = new DetectorErrorDialog(designerFrame, results);
+                    errorDialog.setVisible(true);
+                    return;
+                }
     
                 StartErrorMessageCollector.getInstance().record(DesignerErrorMessage.FINEDB_PROBLEM.getId(),
                                                                 DesignerErrorMessage.FINEDB_PROBLEM.getMessage(),
@@ -107,26 +136,23 @@ public class LifecycleFatalErrorHandler {
     
             /**
              * 生成展示信息
-             *
-             * @param fatal 异常
-             * @return 文本
              */
-            private String generateShowText(FineLifecycleFatalError fatal) {
+            private String generateShowText(List<DetectorResult> results) {
     
-                // todo 其实这里的交互还是有问题， 为什么在锁住和没权限的场景下，要重置 FineDB 呢。
+                String showText = StringUtils.EMPTY;
-                DetectorResult detectorResult = DetectorBridge.getInstance().detect(DetectorType.FINE_DB_LOCKED, fatal);
+                if (Collections.isEmpty(results)) {
-                if (detectorResult.getStatus() == DetectorStatus.EXCEPTION) {
+                    showText = Toolkit.i18nText("Fine-Design_Error_Finedb_Backup_Reset");
-                    return Toolkit.i18nText("Fine-Design_Error_Finedb_Locked_Backup_Reset");
+                } else {
+                    for (DetectorResult result : results) {
+                        DetectorType type = result.getType();
+                        String solutionLocale = solutionMap.get(type);
+                        if (StringUtils.isNotEmpty(solutionLocale)) {
+                            showText = Toolkit.i18nText(solutionLocale);
+                            break;
                         }
-                detectorResult = DetectorBridge.getInstance().detect(DetectorType.FINE_DB_PERMISSION, fatal);
-                if (detectorResult.getStatus() == DetectorStatus.EXCEPTION) {
-                    return Toolkit.i18nText("Fine-Design_Error_Finedb_Permission_Backup_Reset");
                     }
-                detectorResult = DetectorBridge.getInstance().detect(DetectorType.FINE_DB_DIRTY, fatal);
-                if (detectorResult.getStatus() == DetectorStatus.EXCEPTION) {
-                    return Toolkit.i18nText("Fine-Design_Error_Finedb_Dirty_Backup_Reset");
                 }
-                return Toolkit.i18nText("Fine-Design_Error_Finedb_Backup_Reset");
+                return showText;
             }
     
             private void afterBackupFailed() {