Browse Source

Merge pull request #1184 in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0

* commit '9b076c24ed44f4e1dfaf61ec9dfc7a82a331813d':
  REPORT-22389 jar占用还原问题
feature/big-screen
Bryant 5 years ago
parent
commit
9da26a4e23
  1. 3
      designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java

3
designer-base/src/main/java/com/fr/design/update/actions/RecoverForDesigner.java

@ -3,6 +3,7 @@ package com.fr.design.update.actions;
import com.fr.decision.update.backup.Recover; import com.fr.decision.update.backup.Recover;
import com.fr.decision.update.data.UpdateConstants; import com.fr.decision.update.data.UpdateConstants;
import com.fr.decision.update.exception.UpdateException; import com.fr.decision.update.exception.UpdateException;
import com.fr.general.CommonIOUtils;
import com.fr.general.GeneralUtils; import com.fr.general.GeneralUtils;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -24,7 +25,7 @@ public class RecoverForDesigner implements Recover {
@Override @Override
public boolean recover() { public boolean recover() {
try{ try{
IOUtils.copyFilesInDirByPath(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNERBACKUPPATH), CommonIOUtils.copyFilesInDirByPath(StableUtils.pathJoin(StableUtils.getInstallHome(), UpdateConstants.DESIGNERBACKUPPATH),
StableUtils.pathJoin(StableUtils.getInstallHome(), ProjectConstants.LIB_NAME)); StableUtils.pathJoin(StableUtils.getInstallHome(), ProjectConstants.LIB_NAME));
return true; return true;
} catch (IOException ignore) { } catch (IOException ignore) {

Loading…
Cancel
Save