Browse Source

Merge pull request #1775 in BA/design from ~PAUL/design:8.0 to 8.0

* commit '242cc63c0befc0769abfffa805927bc00766aba8':
  REPORT-7279 服务器jar2018.3.16最新的,设计器同样升级3.16后,远程设计连接失败
  REPORT-7121 8.0冒烟:远程设计报找不到模板
stable20180411_162301
superman 7 years ago
parent
commit
ef8517f2f5
  1. 15
      designer_base/src/com/fr/env/RemoteEnv.java

15
designer_base/src/com/fr/env/RemoteEnv.java vendored

@ -159,15 +159,6 @@ public class RemoteEnv extends AbstractEnv {
return password; return password;
} }
// 修复密码中包含特殊字符,无法登录的问题
private String getEncodedPassword() {
try {
return URLEncoder.encode(password, "UTF-8");
} catch (UnsupportedEncodingException e) {
return password;
}
}
public void setPassword(String password) { public void setPassword(String password) {
this.password = password; this.password = password;
clearUserID(); clearUserID();
@ -393,7 +384,7 @@ public class RemoteEnv extends AbstractEnv {
para.put("op", "fr_remote_design"); para.put("op", "fr_remote_design");
para.put("cmd", "test_server_connection"); para.put("cmd", "test_server_connection");
para.put("user", user); para.put("user", user);
para.put("password", getEncodedPassword()); para.put("password", password);
if (path.startsWith("https") && (!DesignerEnvManager.getEnvManager().isHttps())) { if (path.startsWith("https") && (!DesignerEnvManager.getEnvManager().isHttps())) {
return false; return false;
@ -516,7 +507,7 @@ public class RemoteEnv extends AbstractEnv {
para.put("op", "fr_remote_design"); para.put("op", "fr_remote_design");
para.put("cmd", "r_sign_in"); para.put("cmd", "r_sign_in");
para.put("user", user); para.put("user", user);
para.put("password", getEncodedPassword()); para.put("password", password);
simulaRPC(para, true); simulaRPC(para, true);
@ -2011,7 +2002,7 @@ public class RemoteEnv extends AbstractEnv {
para.put("op", "fr_remote_design"); para.put("op", "fr_remote_design");
para.put("cmd", "design_get_designer_version"); para.put("cmd", "design_get_designer_version");
para.put("user", user); para.put("user", user);
para.put("password", getEncodedPassword()); para.put("password", password);
HttpClient client = createHttpMethod(para, true); HttpClient client = createHttpMethod(para, true);
try { try {

Loading…
Cancel
Save