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

* commit 'e6114482c67077cf26eb3bc57747629e9d0f91ec':
  REPORT-71790 操作系统为Cp1252编码 读取中文乱码

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

@@ -2240,7 +2240,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", false);
+        writer.attr("propertiesUsable", this.isPropertiesUsable());
         writer.end();
     }
 

designer-base/src/main/java/com/fr/exit/ConfigToPropMigrator.java

@@ -10,6 +10,8 @@ import com.fr.workspace.WorkContext;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.nio.charset.StandardCharsets;
 import java.sql.Blob;
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -62,9 +64,9 @@ public class ConfigToPropMigrator {
             initDirectory();
 
             try (Connection c = DriverManager.getConnection(url);
-                 FileOutputStream entityOut = new FileOutputStream(PropertiesConstants.ENTITY_PROP_PATH);
-                 FileOutputStream classHelperOut = new FileOutputStream(PropertiesConstants.CLASS_NAME_PROP_PATH);
-                 FileOutputStream xmlEntityOut = new FileOutputStream(PropertiesConstants.XML_ENTITY_PROP_PATH)) {
+                 OutputStreamWriter xmlEntityOut = new OutputStreamWriter(new FileOutputStream(PropertiesConstants.XML_ENTITY_PROP_PATH), StandardCharsets.UTF_8);
+                 OutputStreamWriter entityOut = new OutputStreamWriter(new FileOutputStream(PropertiesConstants.ENTITY_PROP_PATH), StandardCharsets.UTF_8);
+                 OutputStreamWriter classHelperOut = new OutputStreamWriter(new FileOutputStream(PropertiesConstants.CLASS_NAME_PROP_PATH), StandardCharsets.UTF_8)) {
 
                 processClassOrEntity(c, new Properties(), SELECT_FOR_ENTITY, entityOut);
                 processClassOrEntity(c, new Properties(), SELECT_FOR_CLASSNAME, classHelperOut);
@@ -84,7 +86,7 @@ public class ConfigToPropMigrator {
         }
     }
 
-    private void processClassOrEntity(Connection c, Properties map, String sql, FileOutputStream outputStream) throws SQLException, IOException {
+    private void processClassOrEntity(Connection c, Properties map, String sql, OutputStreamWriter writer) throws SQLException, IOException {
         PreparedStatement query = c.prepareStatement(sql);
         ResultSet resultSet =  query.executeQuery();
         while (resultSet.next()) {
@@ -94,19 +96,19 @@ public class ConfigToPropMigrator {
                 map.setProperty(id, value);
             }
         }
-        map.store(outputStream, null);
+        map.store(writer, null);
     }
 
-    private void processXmlEntity(Connection c, Properties map, FileOutputStream outputStream) throws SQLException, IOException {
+    private void processXmlEntity(Connection c, Properties map, OutputStreamWriter writer) throws SQLException, IOException {
         PreparedStatement query = c.prepareStatement(SELECT_FOR_XML_ENTITY);
         ResultSet resultSet =  query.executeQuery();
         while (resultSet.next()) {
             String id = resultSet.getString(1);
             Blob value = resultSet.getBlob(2);
             byte[] bytes = value.getBytes(1L, (int) value.length());
-            map.setProperty(id, new String(bytes));
+            map.setProperty(id, new String(bytes, StandardCharsets.UTF_8));
         }
-        map.store(outputStream, null);
+        map.store(writer, null);
     }
 
     public void deletePropertiesCache() {

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 是否可用
-        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());
-//
-//        }
+        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());
+
+        }
     }
 
     private String generatePath(String webInfPath, String name) {