Merge pull request #8979 in DESIGN/design from bugfix/11.0 to feature/x

* commit 'e5e4b822addddd4343218437fc8bca1a3bb904ef':
  REPORT-71790 配置也置为false
  REPORT-71790 【win11适配】FR11启动失败，报错npe

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -2220,7 +2220,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         writer.attr("layoutTemplateStyle", this.getLayoutTemplateStyle());
         writer.attr("showServerDatasetAuthTip", this.isShowServerDatasetAuthTip());
         writer.attr("useOptimizedUPM4Adapter", this.isUseOptimizedUPM4Adapter());
-        writer.attr("propertiesUsable", this.isPropertiesUsable());
+        writer.attr("propertiesUsable", false);
         writer.end();
     }
 

designer-realize/src/main/java/com/fr/start/module/DesignerStartup.java

@@ -158,26 +158,26 @@ public class DesignerStartup extends Activator {
 
     private void registerDaoSelector() {
         // 注入设计器db cache 是否可用
-        DesignerWorkspaceInfo info = WorkspaceUtils.getWorkspaceInfo();
-        if (info.getType() == DesignerWorkspaceType.Remote) {
-            DaoSelectorFactory.registerDaoSelector(() -> false);
-        } else {
-            String webInfPath = WorkspaceUtils.getWorkspaceInfo().getPath();
-            String dbConfigPath = StableUtils.pathJoin(webInfPath, ProjectConstants.CONFIG_DIRECTORY,
-                                                       EncryptionConstants.PROPERTY_NAME);
-            String entityPath = generatePath(webInfPath, PropertiesConstants.ENTITY_PROP);
-            String xmlEntityPath = generatePath(webInfPath, PropertiesConstants.XML_ENTITY_PROP);
-            String classNamePath = generatePath(webInfPath, PropertiesConstants.CLASS_NAME_PROP);
-            // 校验 平台迁移文件/缓存文件
-            boolean existPropCache = new File(entityPath).exists() && new File(xmlEntityPath).exists() && new File(classNamePath).exists();
-            DaoSelectorFactory.registerDaoSelector(() -> DesignerEnvManager.getEnvManager().isPropertiesUsable()
-                    && OptimizeUtil.isOpen()
-                    && existPropCache
-                    // demo启动时 前后目录可能会不一致 造成读取缓存失败
-                    && !startupArgsValue.getValue().isDemo()
-                    && !new File(dbConfigPath).exists());
-
-        }
+        DaoSelectorFactory.registerDaoSelector(() -> false);
+//        DesignerWorkspaceInfo info = WorkspaceUtils.getWorkspaceInfo();
+//        if (info.getType() == DesignerWorkspaceType.Remote) {
+//        } else {
+//            String webInfPath = WorkspaceUtils.getWorkspaceInfo().getPath();
+//            String dbConfigPath = StableUtils.pathJoin(webInfPath, ProjectConstants.CONFIG_DIRECTORY,
+//                                                       EncryptionConstants.PROPERTY_NAME);
+//            String entityPath = generatePath(webInfPath, PropertiesConstants.ENTITY_PROP);
+//            String xmlEntityPath = generatePath(webInfPath, PropertiesConstants.XML_ENTITY_PROP);
+//            String classNamePath = generatePath(webInfPath, PropertiesConstants.CLASS_NAME_PROP);
+//            // 校验 平台迁移文件/缓存文件
+//            boolean existPropCache = new File(entityPath).exists() && new File(xmlEntityPath).exists() && new File(classNamePath).exists();
+//            DaoSelectorFactory.registerDaoSelector(() -> DesignerEnvManager.getEnvManager().isPropertiesUsable()
+//                    && OptimizeUtil.isOpen()
+//                    && existPropCache
+//                    // demo启动时 前后目录可能会不一致 造成读取缓存失败
+//                    && !startupArgsValue.getValue().isDemo()
+//                    && !new File(dbConfigPath).exists());
+//
+//        }
     }
 
     private String generatePath(String webInfPath, String name) {