REPORT-22779 更新升级后重启失败

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

@@ -1,17 +1,15 @@
 package com.fr.design;
 
-import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.os.impl.RestartAction;
+import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.os.OperatingSystem;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.os.support.OSBasedAction;
 import com.fr.stable.os.support.OSSupportCenter;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -19,8 +17,6 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
@@ -33,8 +29,7 @@ public class RestartHelper {
 
     public static final String RECORD_FILE = StableUtils.pathJoin(StableUtils.getInstallHome(), "delete.properties");
     public static final String MOVE_FILE = StableUtils.pathJoin(StableUtils.getInstallHome(), "move.properties");
-
+    private static   OSBasedAction osBasedAction;
-
     /**
      * 把要删除的文件都记录到delete.properties中
      *
@@ -171,11 +166,10 @@ public class RestartHelper {
             }catch (Exception e){
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
-            OSBasedAction osBasedAction = OSSupportCenter.getAction(RestartAction.class);
             osBasedAction.execute(filesToBeDelete);
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        } finally {
+        }finally {
             try {
                 if (null != randomAccessFile) {
                     randomAccessFile.close();
@@ -185,41 +179,12 @@ public class RestartHelper {
             }
             DesignerContext.getDesignerFrame().exit();
         }
-    }
 
- /*   private static void restartInMacOS(String installHome, String[] filesToBeDelete) throws Exception {
-        ProcessBuilder builder = new ProcessBuilder();
-        List<String> commands = new ArrayList<String>();
-        commands.add("open");
-        commands.add(installHome + File.separator + "bin" + File.separator + "restart.app");
-        if (ArrayUtils.isNotEmpty(filesToBeDelete)) {
-            commands.add("--args");
-            commands.add(StableUtils.join(filesToBeDelete, "+"));
-        }
-        builder.command(commands);
-        builder.start();
     }
-
+    /**
-    private static void restartInWindows(String installHome, String[] filesToBeDelete) throws Exception {
+     * 提前初始化重启动作
-        ProcessBuilder builder = new ProcessBuilder();
+     */
-        List<String> commands = new ArrayList<String>();
+    public static void initRestartAction(){
-        commands.add(installHome + File.separator + "bin" + File.separator + "restart.exe");
+        osBasedAction = OSSupportCenter.getAction(RestartAction.class);
-        if (ArrayUtils.isNotEmpty(filesToBeDelete)) {
-            commands.add(StableUtils.join(filesToBeDelete, "+"));
-        }
-        builder.command(commands);
-        builder.start();
     }
-
-    private static void restartInLinux(String installHome, String[] filesToBeDelete) throws Exception {
-        ProcessBuilder builder = new ProcessBuilder();
-        List<String> commands = new ArrayList<String>();
-        //现在先写的是restart.sh
-        commands.add(installHome + File.separator + "bin" + File.separator + "restart.sh");
-        if (ArrayUtils.isNotEmpty(filesToBeDelete)) {
-            commands.add(StableUtils.join(filesToBeDelete, "+"));
-        }
-        builder.command(commands);
-        builder.start();
-    }*/
 }

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

@@ -11,6 +11,7 @@ import com.fr.config.MarketConfig;
 import com.fr.decision.update.backup.RecoverManager;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.RestartHelper;
 import com.fr.design.actions.NewFormAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.insert.cell.BiasCellAction;
@@ -55,6 +56,7 @@ import com.fr.design.mainframe.form.FormReportComponentComposite;
 import com.fr.design.mainframe.loghandler.DesignerLogAppender;
 import com.fr.design.mainframe.socketio.DesignerSocketIO;
 import com.fr.design.module.DesignModuleFactory;
+import com.fr.design.os.impl.RestartAction;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.parameter.FormParameterReader;
 import com.fr.design.parameter.ParameterPropertyPane;
@@ -136,9 +138,11 @@ public class DesignerActivator extends Activator {
                 UserInfoPane.getInstance().updateBBSUserInfo();
             }
         }, SupportOSImpl.USERINFOPANE);
+
         storePassport();
         AlphaFineHelper.switchConfig4Locale();
         RecoverManager.register(new RecoverForDesigner());
+        RestartHelper.initRestartAction();
     }
 
     @Override