yexuejc007/wechat4j
2
0
Fork 0
mirror of https://gitee.com/hotlcc/wechat4j.git synced 2025-06-08 11:34:07 +08:00
Code Issues Releases Wiki Activity

提交代码

Browse Source
This commit is contained in:
hotlcc 2018-07-25 20:33:31 +08:00
parent 7ec5dbfce3
commit 342a8ed5c9
3 changed files with 132 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
src/main/java/com/hotlcc/wechat4j/Wechat.java
View File

@ -55,19 +55,21 @@ public class Wechat {
private volatile String passTicket; private volatile String passTicket;
private volatile String skey; private volatile String skey;
private volatile String wxuin; private volatile String wxuin;
//url版本号
private volatile String urlVersion;
//用户数据 //用户数据
private volatile UserInfo loginUser; private volatile UserInfo loginUser;
private final Lock loginUserLock = new ReentrantLock(); private final Lock loginUserLock = new ReentrantLock();
private volatile JSONObject SyncKey; private volatile JSONObject syncKey;
private final Lock SyncKeyLock = new ReentrantLock(); private final Lock syncKeyLock = new ReentrantLock();
private volatile List<UserInfo> ContactList; private volatile List<UserInfo> contactList;
private final Lock ContactListLock = new ReentrantLock(); private final Lock contactListLock = new ReentrantLock();
//在线状态 //在线状态
private volatile boolean isOnline = false; private volatile boolean isOnline = false;
private final Lock isOnlineLock = new ReentrantLock(); private final Lock isOnlineLock = new ReentrantLock();
//同步监听器 //同步监听器
private volatile SyncMonitor syncMonitor; private volatile SyncMonitor syncMonitor;
//退出事件处理器 //退出事件处理器
private List<ExitEventHandler> exitEventHandlers; private List<ExitEventHandler> exitEventHandlers;
//接收消息处理器 //接收消息处理器
@ -274,13 +276,12 @@ public class Wechat {
* *
* @return * @return
*/ */
private String waitForConfirm(PrintStream ps, String uuid) { private JSONObject waitForConfirm(PrintStream ps, String uuid) {
ps.print("等待手机端扫码..."); ps.print("等待手机端扫码...");
ps.flush(); ps.flush();
String code = null;
boolean flag = false; boolean flag = false;
while (!"200".equals(code)) { while (true) {
JSONObject result = webWeixinApi.getRedirectUri(httpClient, LoginTipEnum.TIP_0, uuid); JSONObject result = webWeixinApi.getRedirectUri(httpClient, LoginTipEnum.TIP_0, uuid);
if (result == null) { if (result == null) {
ps.println("\t失败：出现异常"); ps.println("\t失败：出现异常");
@ -288,7 +289,7 @@ public class Wechat {
return null; return null;
} }
code = result.getString("code"); String code = result.getString("code");
if ("408".equals(code)) { if ("408".equals(code)) {
ps.print("."); ps.print(".");
ps.flush(); ps.flush();
@ -306,15 +307,13 @@ public class Wechat {
} }
continue; continue;
} else if ("200".equals(code)) { } else if ("200".equals(code)) {
String redirectUri = result.getString("redirectUri");
ps.println("\t成功，认证完成"); ps.println("\t成功，认证完成");
ps.flush(); ps.flush();
return redirectUri; return result;
} else { } else {
return null; return null;
} }
} }
return null;
} }
/** /**
@ -360,7 +359,7 @@ public class Wechat {
ps.print("尝试push方式获取uuid..."); ps.print("尝试push方式获取uuid...");
ps.flush(); ps.flush();
JSONObject result = webWeixinApi.pushLogin(httpClient, wxuin); JSONObject result = webWeixinApi.pushLogin(httpClient, urlVersion, wxuin);
if (result == null) { if (result == null) {
ps.println("\t失败：出现异常"); ps.println("\t失败：出现异常");
ps.flush(); ps.flush();
@ -393,7 +392,7 @@ public class Wechat {
* @return * @return
*/ */
private boolean wxInit() { private boolean wxInit() {
JSONObject result = webWeixinApi.webWeixinInit(httpClient, passTicket, new BaseRequest(wxsid, skey, wxuin)); JSONObject result = webWeixinApi.webWeixinInit(httpClient, urlVersion, passTicket, new BaseRequest(wxsid, skey, wxuin));
if (result == null) { if (result == null) {
return false; return false;
} }
@ -409,7 +408,7 @@ public class Wechat {
} }
loginUser = UserInfo.valueOf(result.getJSONObject("User")); loginUser = UserInfo.valueOf(result.getJSONObject("User"));
SyncKey = result.getJSONObject("SyncKey"); syncKey = result.getJSONObject("SyncKey");
return true; return true;
} }
@ -457,7 +456,7 @@ public class Wechat {
*/ */
private boolean statusNotify(int time) { private boolean statusNotify(int time) {
for (int i = 0; i < time; i++) { for (int i = 0; i < time; i++) {
JSONObject result = webWeixinApi.statusNotify(httpClient, passTicket, new BaseRequest(wxsid, skey, wxuin), getLoginUserName(false)); JSONObject result = webWeixinApi.statusNotify(httpClient, urlVersion, passTicket, new BaseRequest(wxsid, skey, wxuin), getLoginUserName(false));
if (result == null) { if (result == null) {
continue; continue;
} }
@ -481,7 +480,7 @@ public class Wechat {
/** /**
* 自动登录 * 自动登录
*/ */
public boolean autoLogin(OutputStream os) { public boolean autoLogin(OutputStream os, boolean tryPushLogin) {
// 0、获取消息打印流 // 0、获取消息打印流
PrintStream ps = null; PrintStream ps = null;
if (os != null) { if (os != null) {
@ -502,7 +501,7 @@ public class Wechat {
// 2、登录 // 2、登录
// 2.1、获取uuid // 2.1、获取uuid
String uuid = null; String uuid = null;
if (StringUtil.isNotEmpty(wxuin)) { if (tryPushLogin && StringUtil.isNotEmpty(wxuin)) {
uuid = getWxUuid(ps, wxuin); uuid = getWxUuid(ps, wxuin);
} }
if (StringUtil.isEmpty(uuid)) { if (StringUtil.isEmpty(uuid)) {
@ -520,14 +519,15 @@ public class Wechat {
return false; return false;
} }
// 2.3、等待确认 // 2.3、等待确认
String redirectUri = waitForConfirm(ps, uuid); result = waitForConfirm(ps, uuid);
if (StringUtil.isEmpty(redirectUri)) { if (result == null) {
ps.println("手机端认证失败，登录不成功"); ps.println("手机端认证失败，登录不成功");
ps.flush(); ps.flush();
return false; return false;
} }
urlVersion = result.getString("urlVersion");
// 2.4、获取登录认证码 // 2.4、获取登录认证码
if (!getLoginCode(ps, redirectUri)) { if (!getLoginCode(ps, result.getString("redirectUri"))) {
ps.println("无法获取登录认证码，登录不成功"); ps.println("无法获取登录认证码，登录不成功");
ps.flush(); ps.flush();
return false; return false;
@ -562,23 +562,57 @@ public class Wechat {
* @return * @return
*/ */
public boolean autoLogin() { public boolean autoLogin() {
return autoLogin(null); return autoLogin(null, false);
} }
/** /**
* 退出登录 * 退出登录
*/ */
public void logout() { public void logout(boolean clearAllLoginInfo) {
try { try {
isOnlineLock.lock(); isOnlineLock.lock();
webWeixinApi.logout(httpClient, new BaseRequest(wxsid, skey, wxuin)); webWeixinApi.logout(httpClient, urlVersion, new BaseRequest(wxsid, skey, wxuin));
isOnline = false; isOnline = false;
if (clearAllLoginInfo) {
clearAllLoginInfo();
}
} finally { } finally {
isOnlineLock.unlock(); isOnlineLock.unlock();
} }
} }
public void logout() {
logout(true);
}
/**
* 清除全部登录信息
*/
private void clearAllLoginInfo() {
try {
loginUserLock.lock();
syncKeyLock.lock();
contactListLock.lock();
wxsid = null;
passTicket = null;
skey = null;
urlVersion = null;
loginUser = null;
syncKey = null;
if (contactList != null) {
contactList.clear();
contactList = null;
}
} finally {
loginUserLock.unlock();
syncKeyLock.unlock();
contactListLock.unlock();
}
}
/** /**
* 判断在线状态 * 判断在线状态
* *
@ -607,7 +641,7 @@ public class Wechat {
try { try {
//API调用异常导致退出 //API调用异常导致退出
JSONObject result = webWeixinApi.syncCheck(httpClient, new BaseRequest(wxsid, skey, wxuin), getSyncKeyList(false)); JSONObject result = webWeixinApi.syncCheck(httpClient, urlVersion, new BaseRequest(wxsid, skey, wxuin), getSyncKeyList(false));
logger.debug("微信同步监听心跳返回数据：{}", result); logger.debug("微信同步监听心跳返回数据：{}", result);
if (result == null) { if (result == null) {
throw new RuntimeException("微信API调用异常"); throw new RuntimeException("微信API调用异常");
@ -738,7 +772,7 @@ public class Wechat {
*/ */
private void webWxSync() { private void webWxSync() {
try { try {
JSONObject result = webWeixinApi.webWxSync(httpClient, passTicket, new BaseRequest(wxsid, skey, wxuin), SyncKey); JSONObject result = webWeixinApi.webWxSync(httpClient, urlVersion, passTicket, new BaseRequest(wxsid, skey, wxuin), syncKey);
if (result == null) { if (result == null) {
logger.error("从服务端同步新数据异常"); logger.error("从服务端同步新数据异常");
return; return;
@ -762,10 +796,10 @@ public class Wechat {
//更新SyncKey //更新SyncKey
try { try {
SyncKeyLock.lock(); syncKeyLock.lock();
SyncKey = result.getJSONObject("SyncKey"); syncKey = result.getJSONObject("SyncKey");
} finally { } finally {
SyncKeyLock.unlock(); syncKeyLock.unlock();
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("Execute webWxSync error.", e); logger.error("Execute webWxSync error.", e);
@ -834,7 +868,7 @@ public class Wechat {
*/ */
public UserInfo getLoginUser(boolean update) { public UserInfo getLoginUser(boolean update) {
if (loginUser == null || update) { if (loginUser == null || update) {
JSONObject result = webWeixinApi.webWeixinInit(httpClient, passTicket, new BaseRequest(wxsid, skey, wxuin)); JSONObject result = webWeixinApi.webWeixinInit(httpClient, urlVersion, passTicket, new BaseRequest(wxsid, skey, wxuin));
if (result == null) { if (result == null) {
return loginUser; return loginUser;
} }
@ -896,34 +930,34 @@ public class Wechat {
* @return * @return
*/ */
private JSONObject getSyncKey(boolean update) { private JSONObject getSyncKey(boolean update) {
if (SyncKey == null || update) { if (syncKey == null || update) {
JSONObject result = webWeixinApi.webWeixinInit(httpClient, passTicket, new BaseRequest(wxsid, skey, wxuin)); JSONObject result = webWeixinApi.webWeixinInit(httpClient, urlVersion, passTicket, new BaseRequest(wxsid, skey, wxuin));
if (result == null) { if (result == null) {
return SyncKey; return syncKey;
} }
JSONObject BaseResponse = result.getJSONObject("BaseResponse"); JSONObject BaseResponse = result.getJSONObject("BaseResponse");
if (result == null) { if (result == null) {
return SyncKey; return syncKey;
} }
int Ret = BaseResponse.getIntValue("Ret"); int Ret = BaseResponse.getIntValue("Ret");
if (Ret != 0) { if (Ret != 0) {
return SyncKey; return syncKey;
} }
try { try {
SyncKeyLock.lock(); syncKeyLock.lock();
if (SyncKey == null || update) { if (syncKey == null || update) {
SyncKey = result.getJSONObject("SyncKey"); syncKey = result.getJSONObject("SyncKey");
} }
} finally { } finally {
SyncKeyLock.unlock(); syncKeyLock.unlock();
} }
return SyncKey; return syncKey;
} }
return SyncKey; return syncKey;
} }
/** /**
@ -947,34 +981,34 @@ public class Wechat {
* @return * @return
*/ */
public List<UserInfo> getContactList(boolean update) { public List<UserInfo> getContactList(boolean update) {
if (ContactList == null || update) { if (contactList == null || update) {
JSONObject result = webWeixinApi.getContact(httpClient, passTicket, skey); JSONObject result = webWeixinApi.getContact(httpClient, urlVersion, passTicket, skey);
if (result == null) { if (result == null) {
return ContactList; return contactList;
} }
JSONObject BaseResponse = result.getJSONObject("BaseResponse"); JSONObject BaseResponse = result.getJSONObject("BaseResponse");
if (BaseResponse == null) { if (BaseResponse == null) {
return ContactList; return contactList;
} }
String Ret = BaseResponse.getString("Ret"); String Ret = BaseResponse.getString("Ret");
if (!"0".equals(Ret)) { if (!"0".equals(Ret)) {
return ContactList; return contactList;
} }
try { try {
ContactListLock.lock(); contactListLock.lock();
if (ContactList == null || update) { if (contactList == null || update) {
ContactList = UserInfo.valueOf(result.getJSONArray("MemberList")); contactList = UserInfo.valueOf(result.getJSONArray("MemberList"));
} }
} finally { } finally {
ContactListLock.unlock(); contactListLock.unlock();
} }
return ContactList; return contactList;
} }
return ContactList; return contactList;
} }
/** /**
@ -1089,7 +1123,7 @@ public class Wechat {
} }
message.setType(MsgTypeEnum.TEXT_MSG.getCode()); message.setType(MsgTypeEnum.TEXT_MSG.getCode());
JSONObject result = webWeixinApi.sendMsg(httpClient, passTicket, baseRequest, message); JSONObject result = webWeixinApi.sendMsg(httpClient, urlVersion, passTicket, baseRequest, message);
return result; return result;
} }
@ -1152,7 +1186,7 @@ public class Wechat {
BaseRequest baseRequest = new BaseRequest(wxsid, skey, wxuin); BaseRequest baseRequest = new BaseRequest(wxsid, skey, wxuin);
String dataTicket = getCookieValue("webwx_data_ticket"); String dataTicket = getCookieValue("webwx_data_ticket");
JSONObject result = webWeixinApi.uploadMedia(httpClient, passTicket, baseRequest, loginUserName, toUserName, dataTicket, image); JSONObject result = webWeixinApi.uploadMedia(httpClient, urlVersion, passTicket, baseRequest, loginUserName, toUserName, dataTicket, image);
return result; return result;
} }
} }

33
src/main/java/com/hotlcc/wechat4j/api/WebWeixinApi.java
View File

@ -48,6 +48,7 @@ public class WebWeixinApi {
private static Pattern PATTERN_UUID_2 = Pattern.compile("window.QRLogin.code = (\\d+); window.QRLogin.uuid = \"(\\S+?)\";"); private static Pattern PATTERN_UUID_2 = Pattern.compile("window.QRLogin.code = (\\d+); window.QRLogin.uuid = \"(\\S+?)\";");
private static Pattern PATTERN_REDIRECT_URI_1 = Pattern.compile("window.code=(\\d+);"); private static Pattern PATTERN_REDIRECT_URI_1 = Pattern.compile("window.code=(\\d+);");
private static Pattern PATTERN_REDIRECT_URI_2 = Pattern.compile("window.code=(\\d+);\\s*window.redirect_uri=\"(\\S+?)\";"); private static Pattern PATTERN_REDIRECT_URI_2 = Pattern.compile("window.code=(\\d+);\\s*window.redirect_uri=\"(\\S+?)\";");
private static Pattern PATTERN_REDIRECT_URI_3 = Pattern.compile("http(s*)://wx(\\d*)\\.qq\\.com\\/");
/** /**
* 获取微信uuid * 获取微信uuid
@ -184,8 +185,16 @@ public class WebWeixinApi {
if (!matcher.find()) { if (!matcher.find()) {
throw new RuntimeException("没有匹配到跳转uri"); throw new RuntimeException("没有匹配到跳转uri");
} }
String redirectUri = matcher.group(2);
result.put("msg", "手机确认成功"); result.put("msg", "手机确认成功");
result.put("redirectUri", matcher.group(2)); result.put("redirectUri", redirectUri);
matcher = PATTERN_REDIRECT_URI_3.matcher(redirectUri);
if (!matcher.find()) {
throw new RuntimeException("从跳转uri中没有匹配到url版本号");
}
String urlVersion = matcher.group(2);
result.put("urlVersion", urlVersion);
} else { } else {
throw new RuntimeException("返回code错误"); throw new RuntimeException("返回code错误");
} }
@ -233,6 +242,7 @@ public class WebWeixinApi {
* 退出登录 * 退出登录
*/ */
public void logout(HttpClient httpClient, public void logout(HttpClient httpClient,
String urlVersion,
BaseRequest BaseRequest) { BaseRequest BaseRequest) {
try { try {
List<NameValuePair> pairList = new ArrayList<>(); List<NameValuePair> pairList = new ArrayList<>();
@ -242,6 +252,7 @@ public class WebWeixinApi {
//分两步进行 //分两步进行
for (int i = 0; i <= 1; i++) { for (int i = 0; i <= 1; i++) {
String url = new ST(PropertiesUtil.getProperty("webwx-url.logout_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.logout_url"))
.add("urlVersion", urlVersion)
.add("type", i) .add("type", i)
.add("skey", StringUtil.encodeURL(BaseRequest.getSkey(), Consts.UTF_8.name())) .add("skey", StringUtil.encodeURL(BaseRequest.getSkey(), Consts.UTF_8.name()))
.render(); .render();
@ -263,10 +274,12 @@ public class WebWeixinApi {
* push登录 * push登录
*/ */
public JSONObject pushLogin(HttpClient httpClient, public JSONObject pushLogin(HttpClient httpClient,
String urlVersion,
String wxuin) { String wxuin) {
try { try {
long millis = System.currentTimeMillis(); long millis = System.currentTimeMillis();
String url = new ST(PropertiesUtil.getProperty("webwx-url.pushlogin_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.pushlogin_url"))
.add("urlVersion", urlVersion)
.add("uin", wxuin) .add("uin", wxuin)
.render(); .render();
@ -293,10 +306,12 @@ public class WebWeixinApi {
* 获取初始化数据 * 获取初始化数据
*/ */
public JSONObject webWeixinInit(HttpClient httpClient, public JSONObject webWeixinInit(HttpClient httpClient,
String urlVersion,
String passticket, String passticket,
BaseRequest BaseRequest) { BaseRequest BaseRequest) {
try { try {
String url = new ST(PropertiesUtil.getProperty("webwx-url.webwxinit_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.webwxinit_url"))
.add("urlVersion", urlVersion)
.add("pass_ticket", passticket) .add("pass_ticket", passticket)
.add("r", System.currentTimeMillis() / 1252L) .add("r", System.currentTimeMillis() / 1252L)
.render(); .render();
@ -331,11 +346,13 @@ public class WebWeixinApi {
* @return * @return
*/ */
public JSONObject statusNotify(HttpClient httpClient, public JSONObject statusNotify(HttpClient httpClient,
String urlVersion,
String passticket, String passticket,
BaseRequest BaseRequest, BaseRequest BaseRequest,
String loginUserName) { String loginUserName) {
try { try {
String url = new ST(PropertiesUtil.getProperty("webwx-url.statusnotify_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.statusnotify_url"))
.add("urlVersion", urlVersion)
.add("pass_ticket", passticket) .add("pass_ticket", passticket)
.render(); .render();
@ -371,11 +388,13 @@ public class WebWeixinApi {
* 服务端状态同步心跳 * 服务端状态同步心跳
*/ */
public JSONObject syncCheck(HttpClient httpClient, public JSONObject syncCheck(HttpClient httpClient,
String urlVersion,
BaseRequest BaseRequest, BaseRequest BaseRequest,
JSONArray SyncKeyList) { JSONArray SyncKeyList) {
try { try {
long millis = System.currentTimeMillis(); long millis = System.currentTimeMillis();
String url = new ST(PropertiesUtil.getProperty("webwx-url.synccheck_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.synccheck_url"))
.add("urlVersion", urlVersion)
.add("r", millis) .add("r", millis)
.add("skey", StringUtil.encodeURL(BaseRequest.getSkey(), Consts.UTF_8.name())) .add("skey", StringUtil.encodeURL(BaseRequest.getSkey(), Consts.UTF_8.name()))
.add("sid", BaseRequest.getSid()) .add("sid", BaseRequest.getSid())
@ -421,10 +440,12 @@ public class WebWeixinApi {
* 获取全部联系人列表 * 获取全部联系人列表
*/ */
public JSONObject getContact(HttpClient httpClient, public JSONObject getContact(HttpClient httpClient,
String urlVersion,
String passticket, String passticket,
String skey) { String skey) {
try { try {
String url = new ST(PropertiesUtil.getProperty("webwx-url.getcontact_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.getcontact_url"))
.add("urlVersion", urlVersion)
.add("pass_ticket", StringUtil.encodeURL(passticket, Consts.UTF_8.name())) .add("pass_ticket", StringUtil.encodeURL(passticket, Consts.UTF_8.name()))
.add("r", System.currentTimeMillis()) .add("r", System.currentTimeMillis())
.add("skey", StringUtil.encodeURL(skey, Consts.UTF_8.name())) .add("skey", StringUtil.encodeURL(skey, Consts.UTF_8.name()))
@ -452,11 +473,13 @@ public class WebWeixinApi {
* 批量获取指定用户信息 * 批量获取指定用户信息
*/ */
public JSONObject batchGetContact(HttpClient httpClient, public JSONObject batchGetContact(HttpClient httpClient,
String urlVersion,
String passticket, String passticket,
BaseRequest BaseRequest, BaseRequest BaseRequest,
JSONArray batchContactList) { JSONArray batchContactList) {
try { try {
String url = new ST(PropertiesUtil.getProperty("webwx-url.batchgetcontact_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.batchgetcontact_url"))
.add("urlVersion", urlVersion)
.add("pass_ticket", StringUtil.encodeURL(passticket, Consts.UTF_8.name())) .add("pass_ticket", StringUtil.encodeURL(passticket, Consts.UTF_8.name()))
.add("r", System.currentTimeMillis()) .add("r", System.currentTimeMillis())
.render(); .render();
@ -491,11 +514,13 @@ public class WebWeixinApi {
* 从服务端同步新数据 * 从服务端同步新数据
*/ */
public JSONObject webWxSync(HttpClient httpClient, public JSONObject webWxSync(HttpClient httpClient,
String urlVersion,
String passticket, String passticket,
BaseRequest BaseRequest, BaseRequest BaseRequest,
JSONObject SyncKey) { JSONObject SyncKey) {
try { try {
String url = new ST(PropertiesUtil.getProperty("webwx-url.webwxsync_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.webwxsync_url"))
.add("urlVersion", urlVersion)
.add("skey", BaseRequest.getSkey()) .add("skey", BaseRequest.getSkey())
.add("sid", BaseRequest.getSid()) .add("sid", BaseRequest.getSid())
.add("pass_ticket", passticket) .add("pass_ticket", passticket)
@ -530,11 +555,13 @@ public class WebWeixinApi {
* 发送消息 * 发送消息
*/ */
public JSONObject sendMsg(HttpClient httpClient, public JSONObject sendMsg(HttpClient httpClient,
String urlVersion,
String passticket, String passticket,
BaseRequest baseRequest, BaseRequest baseRequest,
WxMessage message) { WxMessage message) {
try { try {
String url = new ST(PropertiesUtil.getProperty("webwx-url.webwxsendmsg_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.webwxsendmsg_url"))
.add("urlVersion", urlVersion)
.add("pass_ticket", passticket) .add("pass_ticket", passticket)
.render(); .render();
@ -572,6 +599,7 @@ public class WebWeixinApi {
* @return * @return
*/ */
public JSONObject uploadMedia(HttpClient httpClient, public JSONObject uploadMedia(HttpClient httpClient,
String urlVersion,
String passticket, String passticket,
BaseRequest BaseRequest, BaseRequest BaseRequest,
String FromUserName, String FromUserName,
@ -582,6 +610,7 @@ public class WebWeixinApi {
ContentType contentType) { ContentType contentType) {
try { try {
String url = new ST(PropertiesUtil.getProperty("webwx-url.uploadmedia_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.uploadmedia_url"))
.add("urlVersion", urlVersion)
.render(); .render();
HttpPost httpPost = new HttpPost(url); HttpPost httpPost = new HttpPost(url);
@ -640,6 +669,7 @@ public class WebWeixinApi {
* @return * @return
*/ */
public JSONObject uploadMedia(HttpClient httpClient, public JSONObject uploadMedia(HttpClient httpClient,
String urlVersion,
String passticket, String passticket,
BaseRequest baseRequest, BaseRequest baseRequest,
String fromUserName, String fromUserName,
@ -648,6 +678,7 @@ public class WebWeixinApi {
File file) { File file) {
try { try {
String url = new ST(PropertiesUtil.getProperty("webwx-url.uploadmedia_url")) String url = new ST(PropertiesUtil.getProperty("webwx-url.uploadmedia_url"))
.add("urlVersion", urlVersion)
.render(); .render();
HttpPost httpPost = new HttpPost(url); HttpPost httpPost = new HttpPost(url);

24
src/main/resources/config/webwx-url.properties
View File

@ -1,32 +1,32 @@
# 1、登录 # 1、登录
## 1.1、获取微信uuid ## 1.1、获取微信uuid
webwx-url.uuid_url=https://login.wx2.qq.com/jslogin?appid=<appid>&redirect_uri=https%3A%2F%2Fwx2.qq.com%2Fcgi-bin%2Fmmwebwx-bin%2Fwebwxnewloginpage&fun=new&lang=zh_CN&_=<_> webwx-url.uuid_url=https://login.wx.qq.com/jslogin?appid=<appid>&fun=new&lang=zh_CN&_=<_>
## 1.2、获取二维码 ## 1.2、获取二维码
webwx-url.qrcode_url=https://login.weixin.qq.com/qrcode/<uuid> webwx-url.qrcode_url=https://login.weixin.qq.com/qrcode/<uuid>
## 1.3、等待扫码登录并获取跳转url ## 1.3、等待扫码登录并获取跳转url
webwx-url.redirect_uri=https://login.wx2.qq.com/cgi-bin/mmwebwx-bin/login?loginicon=true&uuid=<uuid>&tip=<tip>&r=<r>&_=<_> webwx-url.redirect_uri=https://login.wx.qq.com/cgi-bin/mmwebwx-bin/login?loginicon=true&uuid=<uuid>&tip=<tip>&r=<r>&_=<_>
## 1.4、获取登录认证码 ## 1.4、获取登录认证码
webwx-url.newlogin_url=<redirectUri>&fun=new&version=v2 webwx-url.newlogin_url=<redirectUri>&fun=new&version=v2
## 1.5、退出登录 ## 1.5、退出登录
webwx-url.logout_url=https://wx2.qq.com/cgi-bin/mmwebwx-bin/webwxlogout?redirect=1&type=<type>&skey=<skey> webwx-url.logout_url=https://wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxlogout?redirect=1&type=<type>&skey=<skey>
## 1.6、push登录 ## 1.6、push登录
webwx-url.pushlogin_url=https://wx2.qq.com/cgi-bin/mmwebwx-bin/webwxpushloginurl?uin=<uin> webwx-url.pushlogin_url=https://wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxpushloginurl?uin=<uin>
# 2、数据同步 # 2、数据同步
## 2.1、页面初始化 ## 2.1、页面初始化
webwx-url.webwxinit_url=https://wx2.qq.com/cgi-bin/mmwebwx-bin/webwxinit?r=<r>&lang=zh_CN&pass_ticket=<pass_ticket> webwx-url.webwxinit_url=https://wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxinit?r=<r>&lang=zh_CN&pass_ticket=<pass_ticket>
## 2.2、开启消息状态通知 ## 2.2、开启消息状态通知
webwx-url.statusnotify_url=https://wx2.qq.com/cgi-bin/mmwebwx-bin/webwxstatusnotify?lang=zh_CN&pass_ticket=<pass_ticket> webwx-url.statusnotify_url=https://wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxstatusnotify?lang=zh_CN&pass_ticket=<pass_ticket>
## 2.3、服务端状态同步 ## 2.3、服务端状态同步
webwx-url.synccheck_url=https://webpush.wx2.qq.com/cgi-bin/mmwebwx-bin/synccheck?r=<r>&skey=<skey>&sid=<sid>&uin=<uin>&deviceid=<deviceid>&synckey=<synckey>&_=<_> webwx-url.synccheck_url=https://webpush.wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/synccheck?r=<r>&skey=<skey>&sid=<sid>&uin=<uin>&deviceid=<deviceid>&synckey=<synckey>&_=<_>
# 3、联系人管理 # 3、联系人管理
## 3.1、获取全部联系人列表 ## 3.1、获取全部联系人列表
webwx-url.getcontact_url=https://wx2.qq.com/cgi-bin/mmwebwx-bin/webwxgetcontact?lang=zh_CN&pass_ticket=<pass_ticket>&r=<r>&seq=0&skey=<skey> webwx-url.getcontact_url=https://wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxgetcontact?lang=zh_CN&pass_ticket=<pass_ticket>&r=<r>&seq=0&skey=<skey>
## 3.2、批量获取指定联系人列表 ## 3.2、批量获取指定联系人列表
webwx-url.batchgetcontact_url=https://wx2.qq.com/cgi-bin/mmwebwx-bin/webwxbatchgetcontact?type=ex&r=<r>&lang=zh_CN&pass_ticket=<pass_ticket> webwx-url.batchgetcontact_url=https://wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxbatchgetcontact?type=ex&r=<r>&lang=zh_CN&pass_ticket=<pass_ticket>
# 4、收发消息 # 4、收发消息
## 4.1、从服务端拉取新消息 ## 4.1、从服务端拉取新消息
webwx-url.webwxsync_url=https://wx2.qq.com/cgi-bin/mmwebwx-bin/webwxsync?sid=<sid>&skey=<skey>&pass_ticket=<pass_ticket> webwx-url.webwxsync_url=https://wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxsync?sid=<sid>&skey=<skey>&pass_ticket=<pass_ticket>
## 4.2、发送消息 ## 4.2、发送消息
webwx-url.webwxsendmsg_url=https://wx2.qq.com/cgi-bin/mmwebwx-bin/webwxsendmsg?pass_ticket=<pass_ticket> webwx-url.webwxsendmsg_url=https://wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxsendmsg?pass_ticket=<pass_ticket>
## 4.3、上传媒体文件 ## 4.3、上传媒体文件
webwx-url.uploadmedia_url=https://file.wx2.qq.com/cgi-bin/mmwebwx-bin/webwxuploadmedia?f=json webwx-url.uploadmedia_url=https://file.wx<urlVersion>.qq.com/cgi-bin/mmwebwx-bin/webwxuploadmedia?f=json