Merge pull request #1 from odirus/master

解决 webpush 域名变化的问题

Author: hellokaton

src/main/java/me/biezhi/weixin/App.java

@@ -2,6 +2,8 @@
 
 import java.awt.EventQueue;
 import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 
@@ -16,6 +18,7 @@
 import blade.kit.logging.Logger;
 import blade.kit.logging.LoggerFactory;
 import me.biezhi.weixin.util.CookieUtil;
+import me.biezhi.weixin.util.JSUtil;
 import me.biezhi.weixin.util.Matchers;
 
 /**
@@ -63,7 +66,7 @@ public String getUUID() {
 
 		String res = request.body();
 		request.disconnect();
-		
+
 		if(StringKit.isNotBlank(res)){
 			String code = Matchers.match("window.QRLogin.code = (\\d+);", res);
 			if(null != code){
@@ -92,7 +95,7 @@ public void showQrCode() {
 				"t", "webwx", 
 				"_" , DateKit.getCurrentUnixTime())
 				.receive(output);
-		
+
 		if(null != output && output.exists() && output.isFile()){
 			EventQueue.invokeLater(new Runnable() {
 				public void run() {
@@ -122,7 +125,7 @@ public String waitForLogin(){
 
 		String res = request.body();
 		request.disconnect();
-		
+
 		if(null == res){
 			LOGGER.info("[*] 扫描二维码验证失败");
 			return "";
@@ -139,6 +142,17 @@ public String waitForLogin(){
 			} else if(code.equals("200")){
 				LOGGER.info("[*] 正在登录...");
 				String pm = Matchers.match("window.redirect_uri=\"(\\S+?)\";", res);
+
+				String redirectHost = "wx.qq.com";
+				try {
+					URL pmURL = new URL(pm);
+					redirectHost = pmURL.getHost();
+				} catch (MalformedURLException e) {
+					e.printStackTrace();
+				}
+				String pushServer = JSUtil.getPushServer(redirectHost);
+				webpush_url = "https://" + pushServer + "/cgi-bin/mmwebwx-bin";
+
 				this.redirect_uri = pm + "&fun=new";
 				LOGGER.info("[*] redirect_uri=%s", this.redirect_uri);
 				this.base_uri = this.redirect_uri.substring(0, this.redirect_uri.lastIndexOf("/"));
@@ -167,7 +181,7 @@ public boolean login(){
 
 		String res = request.body();
 		this.cookie = CookieUtil.getCookie(request);
-		
+
 		request.disconnect();
 
 		if(StringKit.isBlank(res)){
@@ -268,7 +282,7 @@ public boolean wxStatusNotify (){
 		LOGGER.info("[*] " + request);
 		String res = request.body();
 		request.disconnect();
-		
+
 		if(StringKit.isBlank(res)){
 			return false;
 		}
@@ -303,7 +317,7 @@ public boolean getContact(){
 		LOGGER.info("[*] " + request);
 		String res = request.body();
 		request.disconnect();
-		
+
 		if(StringKit.isBlank(res)){
 			return false;
 		}
@@ -371,7 +385,7 @@ public int[] syncCheck(){
 		LOGGER.info("[*] " + request);
 		String res = request.body();
 		request.disconnect();
-		
+
 		if(StringKit.isBlank(res)){
 			return arr;
 		}
@@ -580,6 +594,9 @@ public void run() {
 	}
 
 	public static void main(String[] args) throws InterruptedException {
+
+		System.out.println(JSUtil.getPushServer("wx.qq.com"));
+
 		App app = new App();
 		String uuid = app.getUUID();
 		if(null == uuid){

src/main/java/me/biezhi/weixin/util/JSUtil.java

@@ -0,0 +1,37 @@
+package me.biezhi.weixin.util;
+
+import blade.kit.logging.Logger;
+import blade.kit.logging.LoggerFactory;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+public class JSUtil {
+    private static final Logger LOGGER = LoggerFactory.getLogger(JSUtil.class);
+
+    private static String eval(String script) {
+        ScriptEngineManager sem = new ScriptEngineManager();
+        ScriptEngine se = sem.getEngineByName("javascript");
+        String res = "";
+
+        try {
+            res = String.valueOf(se.eval(script));
+        } catch (ScriptException e) {
+            e.printStackTrace();
+        }
+
+        return res;
+    }
+
+    public static String getPushServer(String host) {
+        String pushServer = JSUtil.eval("  var e = '" + host + "',\n" +
+                "            t = 'weixin.qq.com',\n" +
+                "            o = 'file.wx.qq.com',\n" +
+                "            n = 'webpush.weixin.qq.com';\n" +
+                "        e.indexOf('wx2.qq.com') > -1 ? (t = 'weixin.qq.com', o = 'file2.wx.qq.com', n = 'webpush2.weixin.qq.com') : e.indexOf('qq.com') > -1 ? (t = 'weixin.qq.com', o = 'file.wx.qq.com', n = 'webpush.weixin.qq.com') : e.indexOf('web1.wechat.com') > -1 ? (t = 'wechat.com', o = 'file1.wechat.com', n = 'webpush1.wechat.com') : e.indexOf('web2.wechat.com') > -1 ? (t = 'wechat.com', o = 'file2.wechat.com', n = 'webpush2.wechat.com') : e.indexOf('wechat.com') > -1 ? (t = 'wechat.com', o = 'file.wechat.com', n = 'webpush.wechat.com') : e.indexOf('web1.wechatapp.com') > -1 ? (t = 'wechatapp.com', o = 'file1.wechatapp.com', n = 'webpush1.wechatapp.com') : (t = 'wechatapp.com', o = 'file.wechatapp.com', n = 'webpush.wechatapp.com');");
+
+
+        return pushServer;
+    }
+}