Browse Source

Merge pull request #1432 in DESIGN/design from ~MAKSIM/design:feature/10.0 to feature/10.0

* commit 'ba69ff6c5e77de63e0967b0453f7cd298226b8a5':
  去掉是否连接弹出框
persist/11.0
Maksim 4 years ago
parent
commit
cb17acb69b
  1. 21
      designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

21
designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@ -113,11 +113,6 @@ public class EnvChangeEntrance {
});
return false;
}
// 如果版本不一致,且确认 不继续 连接,这里返回 false.
if (!versionCheckAndConfirm(selectedEnv)) {
return false;
}
WorkContext.switchTo(workspace, new WorkContextCallback() {
@Override
@ -137,6 +132,8 @@ public class EnvChangeEntrance {
template.refreshToolArea();
}
//是否需要做服务校验
if(needCheckBranch(selectedEnv)) {
String localBranch;
String remoteBranch;
localBranch = GeneralUtils.readFullBuildNO();
@ -163,7 +160,7 @@ public class EnvChangeEntrance {
CheckServiceDialog dialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), areaText, localBranch, remoteBranch);
dialog.setVisible(true);
}
}
} catch (WorkspaceAuthException | RegistEditionException e) {
// String title = Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed");
// String title = Toolkit.i18nText("Fine-Design_Basic_Lic_Does_Not_Support_Remote");
@ -196,6 +193,7 @@ public class EnvChangeEntrance {
}
/**
* 这个功能留着可能会加回来先做注释处理
* 切换远程环境之前进行版本检测当版本不一致的时候提示
* 当用户确认选择 ok 才继续
*
@ -239,6 +237,17 @@ public class EnvChangeEntrance {
return true;
}
/**
* 判断是否需要做版本验证判断依据为
* 1选择的环境为远程环境
* 2一个月内不弹出是否勾选这里预留还未实际增加
* @param selectedEnv 选择的环境
* @return
*/
private boolean needCheckBranch(DesignerWorkspaceInfo selectedEnv){
return selectedEnv.getType() == DesignerWorkspaceType.Remote;
}
public Set<Class> getNoExistServiceSet(WorkspaceConnectionInfo info){
Set<Class> noExistServiceSet = new HashSet<Class>();
Set<Class> remoteServiceSet = new HashSet<Class>();

Loading…
Cancel
Save