Merge pull request #181 in BA/design from ~VITO/design:master to master

* commit '6f425d379c236404bf4a2329174f3dc6afb9ce94':
  登陆username为空时的npe问题

designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java

@@ -279,23 +279,26 @@ public class BBSLoginDialog extends UIDialog {
      * @return 同上
      */
     public static boolean login(String username, String password) {
-        try {
+        if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(password)) {
-            username = URLEncoder.encode(username, EncodeConstants.ENCODING_GBK);
-        } catch (UnsupportedEncodingException e) {
-            FRLogger.getLogger().error(e.getMessage());
-        }
-        String url = SiteCenter.getInstance().acquireUrlByKind("bbs.login") + "&username=" + username + "&password=" + password;
-        HttpClient client = new HttpClient(url);
-        client.setTimeout(TIME_OUT);
-        if (client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK) {
             try {
-                String res = client.getResponseText(EncodeConstants.ENCODING_GBK);
+                username = URLEncoder.encode(username, EncodeConstants.ENCODING_GBK);
-                if (res.contains(LOGIN_SUCCESS_FLAG)) {
+                password = URLEncoder.encode(password, EncodeConstants.ENCODING_GBK);
-                    return true;
+            } catch (UnsupportedEncodingException e) {
-                }
-            } catch (Exception e) {
                 FRLogger.getLogger().error(e.getMessage());
             }
+            String url = SiteCenter.getInstance().acquireUrlByKind("bbs.login") + "&username=" + username + "&password=" + password;
+            HttpClient client = new HttpClient(url);
+            client.setTimeout(TIME_OUT);
+            if (client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK) {
+                try {
+                    String res = client.getResponseText(EncodeConstants.ENCODING_GBK);
+                    if (res.contains(LOGIN_SUCCESS_FLAG)) {
+                        return true;
+                    }
+                } catch (Exception e) {
+                    FRLogger.getLogger().error(e.getMessage());
+                }
+            }
         }
         return false;
     }