Pull request #3009: REPORT-44583 部署集成-远程-设计器和服务器在一个电脑上，远程连接失败 && REPORT-43864 单元格属性-自定义样式丢失，出现大量重复弹框

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '71646c4285253314688aefac0ff88a7a6cada6d4':
  REPORT-43864 单元格属性-自定义样式丢失，出现大量重复弹框
  REPORT-44583 部署集成-远程-设计器和服务器在一个电脑上，远程连接失败

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -25,13 +25,19 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     private static final String HOST_NAME = "127.0.0.1";
     private static final String LOCAL_HOTS_NAME = "localhost";
     private static final String QUOTATION = ":";
-    private static final String PORT = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort());
+    private static String port = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort());
 
     static {
-        FILTER_SET.add(HTTP + HOST_NAME + QUOTATION + PORT + PATH);
-        FILTER_SET.add(HTTPS + HOST_NAME + QUOTATION + PORT + PATH);
-        FILTER_SET.add(HTTP + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH);
-        FILTER_SET.add(HTTPS + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH);
+        initFilerSet(port);
+    }
+
+    private static void initFilerSet(String newPort) {
+        FILTER_SET.clear();
+        FILTER_SET.add(HTTP + HOST_NAME + QUOTATION + newPort + PATH);
+        FILTER_SET.add(HTTPS + HOST_NAME + QUOTATION + newPort + PATH);
+        FILTER_SET.add(HTTP + LOCAL_HOTS_NAME + QUOTATION + newPort + PATH);
+        FILTER_SET.add(HTTPS + LOCAL_HOTS_NAME + QUOTATION + newPort + PATH);
+        port = newPort;
     }
 
     private String name;
@@ -164,6 +170,11 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     @Override
     public boolean checkValid() {
         boolean result = false;
+        String newPort = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort());
+        if (!ComparatorUtils.equals(port, newPort)) {
+            // 使用过程中 更改了内置服务器端口 重新初始化下
+            initFilerSet(newPort);
+        }
         if (FILTER_SET.contains(connection.getUrl())) {
             FineLoggerFactory.getLogger().error("url is same with local designer");
             return result;

designer-base/src/main/java/com/fr/design/mainframe/App.java

@@ -41,4 +41,15 @@ public interface App<T extends BaseBook> extends Mutable, Aftermath {
      * @return 报表
      */
     T asIOFile(FILE tplFile);
+
+
+    /**
+     * 输出workbook等对象
+     * @param tplFile 文件
+     * @param needCheck 是否需要check
+     * @return
+     */
+   default T asIOFile(FILE tplFile, boolean needCheck) {
+       return asIOFile(tplFile);
+   }
 }

designer-base/src/main/java/com/fr/design/mainframe/JTemplateFactory.java

@@ -56,7 +56,7 @@ public final class JTemplateFactory {
             String[] defaultAppExtensions = app.defaultExtensions();
             for (String defaultAppExtension : defaultAppExtensions) {
                 if (defaultAppExtension.equalsIgnoreCase(fileExtension)) {
-                    BaseBook bb = app.asIOFile(file);
+                    BaseBook bb = app.asIOFile(file, false);
                     if (bb != null) {
                         return (T) bb;
                     }

designer-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@@ -42,7 +42,11 @@ class CptApp extends AbstractWorkBookApp {
 
     @Override
     public WorkBook asIOFile(FILE file) {
+        return asIOFile(file, true);
+    }
 
+    @Override
+    public WorkBook asIOFile(FILE file, boolean needCheck) {
         if (XMLEncryptUtils.isCptEncoded() &&
                 !XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) {
             if (!new DecodeDialog(file).isPwdRight()) {
@@ -67,7 +71,9 @@ class CptApp extends AbstractWorkBookApp {
         } catch (Exception exp) {
             FineLoggerFactory.getLogger().error(Toolkit.i18nText("Fine-Design_Report_NS_Exception_ReadError") + file, exp);
         }
+        if (needCheck) {
             checkNameStyle(namestyle);
+        }
         return tpl;
     }