Browse Source

REPORT-133424 【fr-fbp回归】打开模板A,切换环境,模板A的锁定状态不会解除

fbp/release
Destiny.Lin 2 months ago
parent
commit
ed60afc13f
  1. 26
      designer-base/src/main/java/com/fr/design/backup/EnvBackupHelper.java

26
designer-base/src/main/java/com/fr/design/backup/EnvBackupHelper.java

@ -4,11 +4,13 @@ import com.fanruan.carina.Carina;
import com.fanruan.config.realm.ConfigRepositoryFactory; import com.fanruan.config.realm.ConfigRepositoryFactory;
import com.fanruan.config.realm.local.LocalConfigRepositoryBuilder; import com.fanruan.config.realm.local.LocalConfigRepositoryBuilder;
import com.fr.design.ConfigHelper; import com.fr.design.ConfigHelper;
import com.fr.design.env.RemoteWorkspace;
import com.fr.design.mem.MemConfigBackupManager; import com.fr.design.mem.MemConfigBackupManager;
import com.fr.design.mem.MemConfigRepositoryBuilder; import com.fr.design.mem.MemConfigRepositoryBuilder;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import com.fr.workspace.Workspace; import com.fr.workspace.Workspace;
import com.fr.workspace.server.repository.connect.FineWorkspaceHttpClient;
import java.util.Properties; import java.util.Properties;
@ -42,11 +44,13 @@ public class EnvBackupHelper {
FineLoggerFactory.getLogger().info("[EnvBackup] 1.back start..."); FineLoggerFactory.getLogger().info("[EnvBackup] 1.back start...");
this.swtiching = true; this.swtiching = true;
local = WorkContext.getCurrent().isLocal(); local = WorkContext.getCurrent().isLocal();
origin = WorkContext.getCurrent();
if (local) { if (local) {
properties = ConfigHelper.getEnvProperties(); properties = ConfigHelper.getEnvProperties();
path = ConfigHelper.getEnvPropertiesPath(); path = ConfigHelper.getEnvPropertiesPath();
} else {
closeEnv();
} }
origin = WorkContext.getCurrent();
} }
/** /**
@ -107,10 +111,30 @@ public class EnvBackupHelper {
} else { } else {
// 如果是远程,则新环境的配置全部弃用,直接走老的 // 如果是远程,则新环境的配置全部弃用,直接走老的
MemConfigBackupManager.getInstance().failed(); MemConfigBackupManager.getInstance().failed();
rollbackEnv();
} }
} }
/**
* 关闭环境
*/
public void closeEnv() {
// 如果原来是远程,要先发请求告诉原来的环境我这边要断开
if (origin instanceof RemoteWorkspace) {
origin.close();
}
}
/**
* 重新进入老环境
*/
public void rollbackEnv() {
if (origin instanceof RemoteWorkspace && ((RemoteWorkspace) origin).getClient() instanceof FineWorkspaceHttpClient) {
((FineWorkspaceHttpClient) ((RemoteWorkspace) origin).getClient()).startHeartBeat();
}
}
public boolean isSwtiching() { public boolean isSwtiching() {
return swtiching; return swtiching;
} }

Loading…
Cancel
Save