Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

使用swing代替显示二维码登录 #85

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

使用swing代替显示二维码登录 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/cn/zhouyafeng/itchat4j/Wechat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ public class Wechat {
private static final Logger LOG = LoggerFactory.getLogger(Wechat.class);
private IMsgHandlerFace msgHandler;

public Wechat(IMsgHandlerFace msgHandler, String qrPath) {
public Wechat(IMsgHandlerFace msgHandler) {
System.setProperty("jsse.enableSNIExtension", "false"); // 防止SSL错误
this.msgHandler = msgHandler;

// 登陆
LoginController login = new LoginController();
login.login(qrPath);
login.login();
}

public void start() {
Expand Down
19 changes: 8 additions & 11 deletions src/main/java/cn/zhouyafeng/itchat4j/controller/LoginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

/**
* 登陆控制器
*
*
* @author https://github.com/yaphone
* @date 创建时间：2017年5月13日 下午12:56:07
* @version 1.0
Expand All @@ -24,25 +24,22 @@ public class LoginController {
private ILoginService loginService = new LoginServiceImpl();
private static Core core = Core.getInstance();

public void login(String qrPath) {
public void login() {
if (core.isAlive()) { // 已登陆
LOG.info("itchat4j已登陆");
return;
}
while (true) {
for (int count = 0; count < 10; count++) {
LOG.info("获取UUID");
LOG.info("1. 获取微信UUID");
while (loginService.getUuid() == null) {
LOG.info("1. 获取微信UUID");
while (loginService.getUuid() == null) {
LOG.warn("1.1. 获取微信UUID失败，两秒后重新获取");
SleepUtils.sleep(2000);
}
LOG.warn("1.1. 获取微信UUID失败，两秒后重新获取");
SleepUtils.sleep(2000);
}
LOG.info("2. 获取登陆二维码图片");
if (loginService.getQR(qrPath)) {
if (loginService.getQR()) {
break;
} else if (count == 10) {
} else if (count == 9) {
LOG.error("2.2. 获取登陆二维码图片失败，系统退出");
System.exit(0);
}
Expand All @@ -51,7 +48,7 @@ public void login(String qrPath) {
if (!core.isAlive()) {
loginService.login();
core.setAlive(true);
LOG.info(("登陆成功"));
LOG.info(("4. 登陆成功"));
break;
}
LOG.info("4. 登陆超时，请重新扫描二维码图片");
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/cn/zhouyafeng/itchat4j/service/ILoginService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,9 @@ public interface ILoginService {
*
* @author https://github.com/yaphone
* @date 2017年5月13日 上午12:13:51
* @param qrPath
* @return
*/
boolean getQR(String qrPath);
boolean getQR();

/**
* web初始化
Expand Down
81 changes: 53 additions & 28 deletions src/main/java/cn/zhouyafeng/itchat4j/service/impl/LoginServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
package cn.zhouyafeng.itchat4j.service.impl;

import cn.zhouyafeng.itchat4j.utils.tools.QRCodeTools;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.RenderingHints;
import java.awt.Toolkit;
import java.awt.image.BufferedImage;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Date;
Expand All @@ -13,6 +23,10 @@
import java.util.Random;
import java.util.regex.Matcher;

import javax.imageio.ImageIO;
import javax.swing.ImageIcon;
import javax.swing.JFrame;
import javax.swing.JLabel;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
import org.apache.http.message.BasicNameValuePair;
Expand Down Expand Up @@ -44,7 +58,7 @@

/**
* 登陆服务实现类
*
*
* @author https://github.com/yaphone
* @date 创建时间：2017年5月13日 上午12:09:35
* @version 1.0
Expand All @@ -68,14 +82,15 @@ public boolean login() {
boolean isLogin = false;
// 组装参数和URL
List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
params.add(new BasicNameValuePair(LoginParaEnum.LOGIN_ICON.para(), LoginParaEnum.LOGIN_ICON.value()));
params.add(new BasicNameValuePair(LoginParaEnum.UUID.para(), core.getUuid()));
params.add(new BasicNameValuePair(LoginParaEnum.TIP.para(), LoginParaEnum.TIP.value()));

// long time = 4000;
while (!isLogin) {
// SleepUtils.sleep(time += 1000);
long millis = System.currentTimeMillis();
params.clear();
params.add(new BasicNameValuePair(LoginParaEnum.LOGIN_ICON.para(), LoginParaEnum.LOGIN_ICON.value()));
params.add(new BasicNameValuePair(LoginParaEnum.UUID.para(), core.getUuid()));
params.add(new BasicNameValuePair(LoginParaEnum.TIP.para(), LoginParaEnum.TIP.value()));
params.add(new BasicNameValuePair(LoginParaEnum.R.para(), String.valueOf(millis / 1579L)));
params.add(new BasicNameValuePair(LoginParaEnum._.para(), String.valueOf(millis)));
HttpEntity entity = httpClient.doGet(URLEnum.LOGIN_URL.getUrl(), params, true, null);
Expand All @@ -85,13 +100,21 @@ public boolean login() {
String status = checklogin(result);

if (ResultEnum.SUCCESS.getCode().equals(status)) {
QRCodeTools.dismissLoginCode();
processLoginInfo(result); // 处理结果
isLogin = true;
core.setAlive(isLogin);
break;
}
if (ResultEnum.WAIT_CONFIRM.getCode().equals(status)) {
LOG.info("请点击微信确认按钮，进行登陆");
LOG.info("3.1 请点击微信确认按钮，进行登陆");
String regEx = "window.userAvatar = 'data:img/jpg;base64,([^']+)';";
Matcher matcher = CommonTools.getMatcher(regEx, result);
if ( matcher.find() && matcher.groupCount() == 2 ) {
BasicNameValuePair pair = new BasicNameValuePair(matcher.group(1), matcher.group(2));
QRCodeTools.showLoginAvatar(pair.getValue());
}
QRCodeTools.showLoginAvatar(checkAvatar(result));
}

} catch (Exception e) {
Expand Down Expand Up @@ -129,28 +152,16 @@ public String getUuid() {
}

@Override
public boolean getQR(String qrPath) {
qrPath = qrPath + File.separator + "QR.jpg";
public boolean getQR() {
String qrUrl = URLEnum.QRCODE_URL.getUrl() + core.getUuid();
HttpEntity entity = myHttpClient.doGet(qrUrl, null, true, null);
try {
OutputStream out = new FileOutputStream(qrPath);
byte[] bytes = EntityUtils.toByteArray(entity);
out.write(bytes);
out.flush();
out.close();
try {
CommonTools.printQr(qrPath); // 打开登陆二维码图片
} catch (Exception e) {
LOG.info(e.getMessage());
}

return QRCodeTools.showLoginCode(bytes);
} catch (Exception e) {
LOG.info(e.getMessage());
return false;
}

return true;
}

@Override
Expand Down Expand Up @@ -446,12 +457,26 @@ public String checklogin(String result) {
return null;
}

/**
* 检查头像
*
* @param result
* @return
*/
public String checkAvatar(String result) {
String regEx = "window.userAvatar = 'data:img/jpg;base64,([^']+)';";
Matcher matcher = CommonTools.getMatcher(regEx, result);
if (matcher.find()) {
return matcher.group(1);
}
return null;
}

/**
* 处理登陆信息
*
* @author https://github.com/yaphone
* @date 2017年4月9日 下午12:16:26
* @param result
*/
private void processLoginInfo(String loginContent) {
String regEx = "window.redirect_uri=\"(\\S+)\";";
Expand Down Expand Up @@ -522,7 +547,7 @@ private Map<String, List<String>> getPossibleUrlMap() {
Map<String, List<String>> possibleUrlMap = new HashMap<String, List<String>>();
possibleUrlMap.put("wx.qq.com", new ArrayList<String>() {
/**
*
*
*/
private static final long serialVersionUID = 1L;

Expand All @@ -534,7 +559,7 @@ private Map<String, List<String>> getPossibleUrlMap() {

possibleUrlMap.put("wx2.qq.com", new ArrayList<String>() {
/**
*
*
*/
private static final long serialVersionUID = 1L;

Expand All @@ -545,7 +570,7 @@ private Map<String, List<String>> getPossibleUrlMap() {
});
possibleUrlMap.put("wx8.qq.com", new ArrayList<String>() {
/**
*
*
*/
private static final long serialVersionUID = 1L;

Expand All @@ -557,7 +582,7 @@ private Map<String, List<String>> getPossibleUrlMap() {

possibleUrlMap.put("web2.wechat.com", new ArrayList<String>() {
/**
*
*
*/
private static final long serialVersionUID = 1L;

Expand All @@ -568,7 +593,7 @@ private Map<String, List<String>> getPossibleUrlMap() {
});
possibleUrlMap.put("wechat.com", new ArrayList<String>() {
/**
*
*
*/
private static final long serialVersionUID = 1L;

Expand All @@ -582,7 +607,7 @@ private Map<String, List<String>> getPossibleUrlMap() {

/**
* 同步消息 sync the messages
*
*
* @author https://github.com/yaphone
* @date 2017年5月12日 上午12:24:55
* @return
Expand Down Expand Up @@ -627,11 +652,11 @@ private JSONObject webWxSync() {

/**
* 检查是否有新消息 check whether there's a message
*
*
* @author https://github.com/yaphone
* @date 2017年4月16日 上午11:11:34
* @return
*
*
*/
private Map<String, String> syncCheck() {
Map<String, String> resultMap = new HashMap<String, String>();
Expand Down
Loading