Browse Source

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

* commit '43cf9677adc9f5ca8a7d9a9dce685f0d73416c7f':
  使用sitecenter替换所有url
  mac下没有encode中文名登陆不上
master
superman 8 years ago
parent
commit
2cc607e55d
  1. 117
      designer/src/com/fr/design/mainframe/bbs/BBSLoginDialog.java

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

@ -9,11 +9,9 @@ import com.fr.design.gui.ipasswordfield.UIPassWordField;
import com.fr.design.gui.itextfield.UITextField; import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.general.ComparatorUtils; import com.fr.general.*;
import com.fr.general.FRFont;
import com.fr.general.FRLogger;
import com.fr.general.Inter;
import com.fr.general.http.HttpClient; import com.fr.general.http.HttpClient;
import com.fr.stable.EncodeConstants;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import javax.swing.*; import javax.swing.*;
@ -24,8 +22,10 @@ import java.awt.event.ActionListener;
import java.awt.event.KeyAdapter; import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.awt.event.KeyListener; import java.awt.event.KeyListener;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URI; import java.net.URI;
import java.net.URLEncoder;
/** /**
* @author richie * @author richie
@ -36,12 +36,8 @@ public class BBSLoginDialog extends UIDialog {
private static final int DIALOG_WIDTH = 400; private static final int DIALOG_WIDTH = 400;
private static final int DIALOG_HEIGHT = 200; private static final int DIALOG_HEIGHT = 200;
private static final String URL = "http://bbs.finereport.com/member.php?mod=logging&action=login&loginsubmit=yes&infloat=yes&lssubmit=yes&inajax=1";
private static final String PASSWORD_RESET_URL = "http://bbs.finereport.com/portal.php?mod=topic&topicid=2";
private static final String REGISTER_URL = "http://bbs.finereport.com/member.php?mod=register";
private static final String LOGIN_SUCCESS_FLAG = "http://bbs.finereport.com"; private static final String LOGIN_SUCCESS_FLAG = "http://bbs.finereport.com";
private static final Font DEFAULT_FONT = FRFont.getInstance(FRFont.DEFAULT_FONTNAME, 0, 14); private static final Font DEFAULT_FONT = FRFont.getInstance(FRFont.DEFAULT_FONTNAME, 0, 14);
private static final String TEST_CONNECTION_URL = "http://bbs.finereport.com/member.php?mod=logging&action=login&loginsubmit=yes&infloat=yes&lssubmit=yes&inajax=1&username=test&password=123456";
private static final int TIME_OUT = 10000; private static final int TIME_OUT = 10000;
private static final int BUTTON_WIDTH = 90; private static final int BUTTON_WIDTH = 90;
@ -63,14 +59,14 @@ public class BBSLoginDialog extends UIDialog {
private BoxCenterAligmentPane registerLabel; private BoxCenterAligmentPane registerLabel;
private KeyListener keyListener = new KeyAdapter() { private KeyListener keyListener = new KeyAdapter() {
public void keyPressed(KeyEvent e){ public void keyPressed(KeyEvent e) {
int code = e.getKeyCode(); int code = e.getKeyCode();
if(KeyEvent.VK_ESCAPE == code){ if (KeyEvent.VK_ESCAPE == code) {
BBSLoginDialog.this.setVisible(false); BBSLoginDialog.this.setVisible(false);
return; return;
} }
if(KeyEvent.VK_ENTER == code){ if (KeyEvent.VK_ENTER == code) {
login(); login();
} }
} }
@ -91,27 +87,28 @@ public class BBSLoginDialog extends UIDialog {
/** /**
* 构造函数 * 构造函数
*
* @param parent 父窗口 * @param parent 父窗口
* @param userInfoLabel 登录状态label * @param userInfoLabel 登录状态label
*/ */
public BBSLoginDialog(Frame parent,UserInfoLabel userInfoLabel) { public BBSLoginDialog(Frame parent, UserInfoLabel userInfoLabel) {
super(parent); super(parent);
JPanel panel = (JPanel) getContentPane(); JPanel panel = (JPanel) getContentPane();
initComponents(panel); initComponents(panel);
this.userInfoLabel = userInfoLabel; this.userInfoLabel = userInfoLabel;
setSize(new Dimension(DIALOG_WIDTH,DIALOG_HEIGHT)); setSize(new Dimension(DIALOG_WIDTH, DIALOG_HEIGHT));
} }
private void initComponents(JPanel contentPane) { private void initComponents(JPanel contentPane) {
this.setTitle(Inter.getLocText("FR-Designer-BBSLogin_Login-Title")); this.setTitle(Inter.getLocText("FR-Designer-BBSLogin_Login-Title"));
tipLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip")); tipLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip"));
userLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Account")+":"); userLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Account") + ":");
passLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Password")+":"); passLabel = new UILabel(Inter.getLocText("FR-Designer-BBSLogin_Password") + ":");
nameField = new UITextField(); nameField = new UITextField();
passField = new UIPassWordField(); passField = new UIPassWordField();
loginButton = new UIButton(Inter.getLocText("FR-Designer-BBSLogin_Login")); loginButton = new UIButton(Inter.getLocText("FR-Designer-BBSLogin_Login"));
passwordReset = getURLActionLabel(PASSWORD_RESET_URL); passwordReset = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("bbs.reset"));
registerLabel = getURLActionLabel(REGISTER_URL); registerLabel = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("bbs.register"));
loginButton.addActionListener(new ActionListener() { loginButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent arg0) { public void actionPerformed(ActionEvent arg0) {
@ -130,7 +127,7 @@ public class BBSLoginDialog extends UIDialog {
contentPane.setLayout(new BorderLayout()); contentPane.setLayout(new BorderLayout());
JPanel mainPane = new JPanel(); JPanel mainPane = new JPanel();
mainPane.setLayout(new BorderLayout(0,V_GAP)); mainPane.setLayout(new BorderLayout(0, V_GAP));
initNorthPane(mainPane); initNorthPane(mainPane);
@ -138,81 +135,81 @@ public class BBSLoginDialog extends UIDialog {
initSouthPane(mainPane); initSouthPane(mainPane);
contentPane.add(mainPane,BorderLayout.NORTH); contentPane.add(mainPane, BorderLayout.NORTH);
this.setResizable(false); this.setResizable(false);
} }
private void login(){ private void login() {
if(nameField.getText().isEmpty()){ if (nameField.getText().isEmpty()) {
tipForUsernameEmpty(); tipForUsernameEmpty();
nameField.requestFocus(); nameField.requestFocus();
return; return;
} }
if(String.valueOf(passField.getPassword()).isEmpty()){ if (String.valueOf(passField.getPassword()).isEmpty()) {
tipForPasswordEmpty(); tipForPasswordEmpty();
passField.requestFocus(); passField.requestFocus();
return; return;
} }
if(!testConnection()){ if (!testConnection()) {
connectionFailue(); connectionFailue();
return; return;
} }
if(login(nameField.getText(),String.valueOf(passField.getPassword()))){ if (login(nameField.getText(), String.valueOf(passField.getPassword()))) {
loginSuccess(); loginSuccess();
}else{ } else {
loginFailure(); loginFailure();
} }
} }
private boolean testConnection(){ private boolean testConnection() {
HttpClient client = new HttpClient(TEST_CONNECTION_URL); HttpClient client = new HttpClient(SiteCenter.getInstance().acquireUrlByKind("bbs.test"));
return client.isServerAlive(); return client.isServerAlive();
} }
private void initNorthPane(JPanel mainPane){ private void initNorthPane(JPanel mainPane) {
JPanel northPane = new JPanel(); JPanel northPane = new JPanel();
northPane.setPreferredSize(new Dimension(DIALOG_WIDTH,NORTH_PANE_HEIGHT)); northPane.setPreferredSize(new Dimension(DIALOG_WIDTH, NORTH_PANE_HEIGHT));
northPane.add(tipLabel); northPane.add(tipLabel);
mainPane.add(northPane,BorderLayout.NORTH); mainPane.add(northPane, BorderLayout.NORTH);
} }
private void initCenterPane(JPanel mainPane){ private void initCenterPane(JPanel mainPane) {
JPanel loginPane = new JPanel(); JPanel loginPane = new JPanel();
loginPane.setLayout(new GridLayout(2,1,0,V_GAP)); loginPane.setLayout(new GridLayout(2, 1, 0, V_GAP));
JPanel namePane = new JPanel(); JPanel namePane = new JPanel();
namePane.setLayout(new FlowLayout(FlowLayout.RIGHT,FLOWLAYOUT_H_GAP,0)); namePane.setLayout(new FlowLayout(FlowLayout.RIGHT, FLOWLAYOUT_H_GAP, 0));
namePane.add(userLabel); namePane.add(userLabel);
nameField.setPreferredSize(new Dimension(FIELD_WIDTH,FIELD_HEIGHT)); nameField.setPreferredSize(new Dimension(FIELD_WIDTH, FIELD_HEIGHT));
namePane.add(nameField); namePane.add(nameField);
namePane.add(passwordReset); namePane.add(passwordReset);
loginPane.add(namePane); loginPane.add(namePane);
JPanel passPane = new JPanel(); JPanel passPane = new JPanel();
passPane.setLayout(new FlowLayout(FlowLayout.RIGHT,FLOWLAYOUT_H_GAP,0)); passPane.setLayout(new FlowLayout(FlowLayout.RIGHT, FLOWLAYOUT_H_GAP, 0));
passPane.add(passLabel); passPane.add(passLabel);
passPane.add(passField); passPane.add(passField);
passField.setPreferredSize(new Dimension(FIELD_WIDTH,FIELD_HEIGHT)); passField.setPreferredSize(new Dimension(FIELD_WIDTH, FIELD_HEIGHT));
passPane.add(registerLabel); passPane.add(registerLabel);
loginPane.add(passPane); loginPane.add(passPane);
mainPane.add(loginPane,BorderLayout.CENTER); mainPane.add(loginPane, BorderLayout.CENTER);
} }
private void initSouthPane(JPanel mainPane){ private void initSouthPane(JPanel mainPane) {
JPanel southPane = new JPanel(); JPanel southPane = new JPanel();
southPane.setLayout(new FlowLayout(FlowLayout.RIGHT,BUTTON_H_GAP,0)); southPane.setLayout(new FlowLayout(FlowLayout.RIGHT, BUTTON_H_GAP, 0));
loginButton.setPreferredSize(new Dimension(BUTTON_WIDTH,FIELD_HEIGHT)); loginButton.setPreferredSize(new Dimension(BUTTON_WIDTH, FIELD_HEIGHT));
loginButton.setFont(DEFAULT_FONT); loginButton.setFont(DEFAULT_FONT);
southPane.add(loginButton); southPane.add(loginButton);
mainPane.add(southPane,BorderLayout.SOUTH); mainPane.add(southPane, BorderLayout.SOUTH);
} }
// 登录成功 // 登录成功
private void loginSuccess(){ private void loginSuccess() {
DesignerEnvManager.getEnvManager().setBBSPassword(String.valueOf(passField.getPassword())); DesignerEnvManager.getEnvManager().setBBSPassword(String.valueOf(passField.getPassword()));
userInfoLabel.setUserName(nameField.getText()); userInfoLabel.setUserName(nameField.getText());
userInfoLabel.getUserInfoPane().markSignIn(nameField.getText()); userInfoLabel.getUserInfoPane().markSignIn(nameField.getText());
@ -221,11 +218,11 @@ public class BBSLoginDialog extends UIDialog {
} }
// 登录失败 // 登录失败
private void loginFailure(){ private void loginFailure() {
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip")); setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Login-Failure-Tip"));
} }
private void tipForUsernameEmpty(){ private void tipForUsernameEmpty() {
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip")); setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Username-Empty-Tip"));
} }
@ -233,11 +230,11 @@ public class BBSLoginDialog extends UIDialog {
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Download-Unlogin-Tip")); setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Download-Unlogin-Tip"));
} }
private void tipForPasswordEmpty(){ private void tipForPasswordEmpty() {
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Password-Empty-Tip")); setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Password-Empty-Tip"));
} }
private void setLoginFailureTxt(String errorTxt){ private void setLoginFailureTxt(String errorTxt) {
tipLabel.setText(errorTxt); tipLabel.setText(errorTxt);
tipLabel.setForeground(Color.RED); tipLabel.setForeground(Color.RED);
tipLabel.repaint(); tipLabel.repaint();
@ -245,14 +242,14 @@ public class BBSLoginDialog extends UIDialog {
} }
// 连接失败 // 连接失败
private void connectionFailue(){ private void connectionFailue() {
setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Connection-Failure")); setLoginFailureTxt(Inter.getLocText("FR-Designer-BBSLogin_Connection-Failure"));
} }
/** /**
* 清楚登录信息 * 清楚登录信息
*/ */
public void clearLoginInformation(){ public void clearLoginInformation() {
tipLabel.setText(StringUtils.EMPTY); tipLabel.setText(StringUtils.EMPTY);
nameField.setText(StringUtils.EMPTY); nameField.setText(StringUtils.EMPTY);
passField.setText(StringUtils.EMPTY); passField.setText(StringUtils.EMPTY);
@ -261,7 +258,7 @@ public class BBSLoginDialog extends UIDialog {
/** /**
* 显示登录窗口 * 显示登录窗口
*/ */
public void showWindow(){ public void showWindow() {
GUICoreUtils.centerWindow(this); GUICoreUtils.centerWindow(this);
setVisible(true); setVisible(true);
} }
@ -276,18 +273,24 @@ public class BBSLoginDialog extends UIDialog {
/** /**
* 是否登陆成功 * 是否登陆成功
*
* @param username 用户名 * @param username 用户名
* @param password 密码 * @param password 密码
* @return 同上 * @return 同上
*/ */
public static boolean login(String username,String password){ public static boolean login(String username, String password) {
String url = URL + "&username=" + username + "&password=" + password; try {
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); HttpClient client = new HttpClient(url);
client.setTimeout(TIME_OUT); client.setTimeout(TIME_OUT);
if(client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK){ if (client.getResponseCodeNoException() == HttpURLConnection.HTTP_OK) {
try { try {
String res = client.getResponseText("GBK"); String res = client.getResponseText(EncodeConstants.ENCODING_GBK);
if(res.contains(LOGIN_SUCCESS_FLAG)){ if (res.contains(LOGIN_SUCCESS_FLAG)) {
return true; return true;
} }
} catch (Exception e) { } catch (Exception e) {
@ -297,11 +300,11 @@ public class BBSLoginDialog extends UIDialog {
return false; return false;
} }
private BoxCenterAligmentPane getURLActionLabel(final String url){ private BoxCenterAligmentPane getURLActionLabel(final String url) {
ActionLabel actionLabel = new ActionLabel(url); ActionLabel actionLabel = new ActionLabel(url);
if(ComparatorUtils.equals(url, PASSWORD_RESET_URL)){ if (ComparatorUtils.equals(url, SiteCenter.getInstance().acquireUrlByKind("bbs.reset"))) {
actionLabel.setText(Inter.getLocText("FR-Designer-BBSLogin_Forgot-Password")); actionLabel.setText(Inter.getLocText("FR-Designer-BBSLogin_Forgot-Password"));
}else{ } else {
actionLabel.setText(Inter.getLocText("FR-Designer-BBSLogin_Register-Account")); actionLabel.setText(Inter.getLocText("FR-Designer-BBSLogin_Register-Account"));
} }

Loading…
Cancel
Save