Browse Source

Pull request #2777: REPORT-42604 远程对接平台密码-测试连接锁定时 无错误日志

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '593351d4e77778488baf835a7dfd8235746e8ecf':
  REPORT-42604 远程对接平台密码-测试连接锁定时 无错误日志
feature/big-screen
Hades 4 years ago
parent
commit
9fa3f949fb
  1. 1
      designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
  2. 2
      designer-base/src/main/java/com/fr/env/TestConnectionResult.java

1
designer-base/src/main/java/com/fr/env/RemoteEnvPane.java vendored

@ -600,6 +600,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
TestConnectionResult result = get(); TestConnectionResult result = get();
if (result.isVerifyResult()) { if (result.isVerifyResult()) {
dialog.dispose(); dialog.dispose();
FineLoggerFactory.getLogger().error(result.getText().replaceAll(TestConnectionResult.WRAP, StringUtils.EMPTY) + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"));
FineJOptionPane.showMessageDialog(RemoteEnvPane.this, FineJOptionPane.showMessageDialog(RemoteEnvPane.this,
new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), connection.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH), new MessageWithLink(result.getText(), Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Modify_PassWord"), connection.getUrl() + RemoteWorkspaceURL.SYSTEM_LOGIN_PATH),
Toolkit.i18nText("Fine-Design_Basic_Dialog_Message_Title"), Toolkit.i18nText("Fine-Design_Basic_Dialog_Message_Title"),

2
designer-base/src/main/java/com/fr/env/TestConnectionResult.java vendored

@ -200,6 +200,8 @@ public enum TestConnectionResult {
return false; return false;
} }
public static final String WRAP = "<br/>";
public static TestConnectionResult parse(Boolean value, WorkspaceConnectionInfo info) { public static TestConnectionResult parse(Boolean value, WorkspaceConnectionInfo info) {
if (value == null) { if (value == null) {
return AUTH_FAILED; return AUTH_FAILED;

Loading…
Cancel
Save