From 42dd0bd540a19610a1997a7baab639b50dc81a54 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 14 Mar 2018 09:25:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-7121=208.0=E5=86=92=E7=83=9F?= =?UTF-8?q?=EF=BC=9A=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=8A=A5=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index ced9fb0d51..ad71993af3 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -222,15 +222,15 @@ public class RemoteEnv extends AbstractEnv { private HttpClient createHttpMethod(HashMap para, boolean isSignIn) throws EnvException, UnsupportedEncodingException { String methodPath = this.path; if (!isSignIn) { - methodPath = methodPath + "?id=" + createUserID(); + return createHttpClient(para); } - return new HttpClient(methodPath, para); + return new HttpClient(methodPath, para, true); } /** * 根据nameValuePairs,也就是参数对,生成PostMethod,不同之处在于,参数拼在path后面,不是method.addParameters */ - private HttpClient createHttpMethod2(HashMap para) throws EnvException { + private HttpClient createHttpClient(HashMap para) throws EnvException { StringBuilder sb = new StringBuilder(path); sb.append('?'); @@ -314,7 +314,7 @@ public class RemoteEnv extends AbstractEnv { * @throws Exception 异常 */ private boolean postBytes2Server(byte[] bytes, HashMap para) throws Exception { - HttpClient client = createHttpMethod2(para); + HttpClient client = createHttpClient(para); client.setContent(bytes); execute4InputStream(client); @@ -1331,7 +1331,7 @@ public class RemoteEnv extends AbstractEnv { * @throws Exception 异常 */ public InputStream postBytes2ServerB(byte[] bytes, HashMap para) throws Exception { - HttpClient client = createHttpMethod2(para); + HttpClient client = createHttpClient(para); client.setContent(bytes); return execute4InputStream(client); } @@ -1577,7 +1577,7 @@ public class RemoteEnv extends AbstractEnv { } try { - HttpClient client = createHttpMethod2(out.getNameValuePairs()); + HttpClient client = createHttpClient(out.getNameValuePairs()); client.setContent(out.getOut().toByteArray()); String res = stream2String(execute4InputStream(client)); if (StringUtils.isNotEmpty(res)) { @@ -1616,7 +1616,7 @@ public class RemoteEnv extends AbstractEnv { XMLTools.writeOutputStreamXML(mgr, out); try { - HttpClient client = createHttpMethod2(out.getNameValuePairs()); + HttpClient client = createHttpClient(out.getNameValuePairs()); client.setContent(out.getOut().toByteArray()); String res = stream2String(execute4InputStream(client)); if (StringUtils.isNotEmpty(res)) { @@ -1686,7 +1686,7 @@ public class RemoteEnv extends AbstractEnv { para.put("schema", schema); para.put("tableName", tableName); - HttpClient client = createHttpMethod2(para); + HttpClient client = createHttpClient(para); InputStream input = execute4InputStream(client); if (input == null) { From b9787f29bc6c0638283cf434c26c1991eb8883e3 Mon Sep 17 00:00:00 2001 From: kerry Date: Wed, 21 Mar 2018 15:03:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-7279=20=E6=9C=8D=E5=8A=A1=E5=99=A8ja?= =?UTF-8?q?r2018.3.16=E6=9C=80=E6=96=B0=E7=9A=84=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=99=A8=E5=90=8C=E6=A0=B7=E5=8D=87=E7=BA=A73.16?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E8=BF=9C=E7=A8=8B=E8=AE=BE=E8=AE=A1=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_base/src/com/fr/env/RemoteEnv.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/designer_base/src/com/fr/env/RemoteEnv.java b/designer_base/src/com/fr/env/RemoteEnv.java index ad71993af3..45c837175b 100644 --- a/designer_base/src/com/fr/env/RemoteEnv.java +++ b/designer_base/src/com/fr/env/RemoteEnv.java @@ -159,15 +159,6 @@ public class RemoteEnv extends AbstractEnv { return password; } - // 修复密码中包含特殊字符，无法登录的问题 - private String getEncodedPassword() { - try { - return URLEncoder.encode(password, "UTF-8"); - } catch (UnsupportedEncodingException e) { - return password; - } - } - public void setPassword(String password) { this.password = password; clearUserID(); @@ -393,7 +384,7 @@ public class RemoteEnv extends AbstractEnv { para.put("op", "fr_remote_design"); para.put("cmd", "test_server_connection"); para.put("user", user); - para.put("password", getEncodedPassword()); + para.put("password", password); if (path.startsWith("https") && (!DesignerEnvManager.getEnvManager().isHttps())) { return false; @@ -516,7 +507,7 @@ public class RemoteEnv extends AbstractEnv { para.put("op", "fr_remote_design"); para.put("cmd", "r_sign_in"); para.put("user", user); - para.put("password", getEncodedPassword()); + para.put("password", password); simulaRPC(para, true); @@ -2011,7 +2002,7 @@ public class RemoteEnv extends AbstractEnv { para.put("op", "fr_remote_design"); para.put("cmd", "design_get_designer_version"); para.put("user", user); - para.put("password", getEncodedPassword()); + para.put("password", password); HttpClient client = createHttpMethod(para, true); try {