Skip to content

Commit 806447a

Browse files
committed
issue binarywang#39 企业号添加oauth2的支持
1 parent 0d6712f commit 806447a

11 files changed

Lines changed: 206 additions & 48 deletions

File tree

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpConfigStorage.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public interface WxCpConfigStorage {
2727

2828
public int getExpiresIn();
2929

30+
public String getOauth2redirectUri();
31+
3032
public String getHttp_proxy_host();
3133

3234
public int getHttp_proxy_port();

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpInMemoryConfigStorage.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public class WxCpInMemoryConfigStorage implements WxCpConfigStorage {
1818
protected String agentId;
1919
protected int expiresIn;
2020

21+
protected String oauth2redirectUri;
22+
2123
protected String http_proxy_host;
2224
protected int http_proxy_port;
2325
protected String http_proxy_username;
@@ -88,6 +90,15 @@ public void setAgentId(String agentId) {
8890
this.agentId = agentId;
8991
}
9092

93+
@Override
94+
public String getOauth2redirectUri() {
95+
return this.oauth2redirectUri;
96+
}
97+
98+
public void setOauth2redirectUri(String oauth2redirectUri) {
99+
this.oauth2redirectUri = oauth2redirectUri;
100+
}
101+
91102
public String getHttp_proxy_host() {
92103
return http_proxy_host;
93104
}

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpService.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,26 @@ public WxMediaUploadResult mediaUpload(String mediaType, String fileType, InputS
274274
*/
275275
public void tagAddUsers(String tagId, List<String> userIds) throws WxErrorException;
276276

277+
/**
278+
* <pre>
279+
* 构造oauth2授权的url连接
280+
* 详情请见: http://qydev.weixin.qq.com/wiki/index.php?title=企业获取code
281+
* </pre>
282+
* @param state
283+
* @return code
284+
*/
285+
public String oauth2buildAuthorizationUrl(String state);
286+
287+
/**
288+
* <pre>
289+
* 用oauth2获取用户信息
290+
* http://qydev.weixin.qq.com/wiki/index.php?title=根据code获取成员信息
291+
* </pre>
292+
* @param code
293+
* @return [userid, deviceid]
294+
*/
295+
public String[] oauth2getUserInfo(String code) throws WxErrorException;
296+
277297
/**
278298
* 移除标签成员
279299
*

‎weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpServiceImpl.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,41 @@ public void tagRemoveUsers(String tagId, List<String> userIds) throws WxErrorExc
316316
execute(new SimplePostRequestExecutor(), url, jsonObject.toString());
317317
}
318318

319+
@Override
320+
public String oauth2buildAuthorizationUrl(String state) {
321+
String url = "https://open.weixin.qq.com/connect/oauth2/authorize?" ;
322+
url += "appid=" + wxCpConfigStorage.getCorpId();
323+
url += "&redirect_uri=" + URIUtil.encodeURIComponent(wxCpConfigStorage.getOauth2redirectUri());
324+
url += "&response_type=code";
325+
url += "&scope=snsapi_base";
326+
if (state != null) {
327+
url += "&state=" + state;
328+
}
329+
url += "#wechat_redirect";
330+
return url;
331+
}
332+
333+
@Override
334+
public String[] oauth2getUserInfo(String code) throws WxErrorException {
335+
String url = "https://qyapi.weixin.qq.com/cgi-bin/user/getuserinfo?";
336+
url += "access_token=" + wxCpConfigStorage.getAccessToken();
337+
url += "&code=" + code;
338+
url += "agendid=" + wxCpConfigStorage.getAgentId();
339+
340+
try {
341+
RequestExecutor<String, String> executor = new SimpleGetRequestExecutor();
342+
String responseText = executor.execute(getHttpclient(), httpProxy, url, null);
343+
JsonElement je = Streams.parse(new JsonReader(new StringReader(responseText)));
344+
JsonObject jo = je.getAsJsonObject();
345+
return new String[] {GsonHelper.getString(jo, "UserId"), GsonHelper.getString(jo, "DeviceId")};
346+
} catch (ClientProtocolException e) {
347+
throw new RuntimeException(e);
348+
} catch (IOException e) {
349+
throw new RuntimeException(e);
350+
}
351+
}
352+
353+
319354
public String get(String url, String queryParam) throws WxErrorException {
320355
return execute(new SimpleGetRequestExecutor(), url, queryParam);
321356
}
Lines changed: 77 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,93 @@
11
package me.chanjar.weixin.cp.demo;
22

3+
import me.chanjar.weixin.common.api.WxConsts;
4+
import me.chanjar.weixin.cp.api.*;
5+
import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
6+
import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
7+
import me.chanjar.weixin.cp.bean.WxCpXmlOutTextMessage;
38
import org.eclipse.jetty.server.Server;
49
import org.eclipse.jetty.servlet.ServletHandler;
10+
import org.eclipse.jetty.servlet.ServletHolder;
11+
12+
import javax.xml.bind.JAXBException;
13+
import java.io.InputStream;
14+
import java.util.Map;
515

6-
/**
7-
* @author Daniel Qian
8-
*/
916
public class WxCpDemoServer {
17+
18+
private static WxCpConfigStorage wxCpConfigStorage;
19+
private static WxCpService wxCpService;
20+
private static WxCpMessageRouter wxCpMessageRouter;
21+
1022
public static void main(String[] args) throws Exception {
1123
Server server = new Server(8080);
1224

1325
ServletHandler handler = new ServletHandler();
1426
server.setHandler(handler);
1527

16-
handler.addServletWithMapping(WxCpDemoServlet.class, "/*");
28+
ServletHolder endpointServletHolder = new ServletHolder(new WxCpEndpointServlet(wxCpConfigStorage, wxCpService, wxCpMessageRouter));
29+
handler.addServletWithMapping(endpointServletHolder, "/*");
30+
31+
ServletHolder oauthServletHolder = new ServletHolder(new WxCpOAuth2Servlet(wxCpService));
32+
handler.addServletWithMapping(oauthServletHolder, "/oauth2/*");
33+
1734
server.start();
1835
server.join();
1936
}
37+
38+
private static void init() {
39+
try {
40+
InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml");
41+
WxCpDemoInMemoryConfigStorage config = WxCpDemoInMemoryConfigStorage.fromXml(is1);
42+
43+
wxCpConfigStorage = config;
44+
wxCpService = new WxCpServiceImpl();
45+
wxCpService.setWxCpConfigStorage(config);
46+
47+
WxCpMessageHandler handler = new WxCpMessageHandler() {
48+
@Override
49+
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context,
50+
WxCpService wxCpService) {
51+
WxCpXmlOutTextMessage m = WxCpXmlOutMessage
52+
.TEXT()
53+
.content("测试加密消息")
54+
.fromUser(wxMessage.getToUserName())
55+
.toUser(wxMessage.getFromUserName())
56+
.build();
57+
return m;
58+
}
59+
};
60+
61+
WxCpMessageHandler oauth2handler = new WxCpMessageHandler() {
62+
@Override
63+
public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context,
64+
WxCpService wxCpService) {
65+
String href = "<a href=\"" + wxCpService.oauth2buildAuthorizationUrl(null)
66+
+ "\">测试oauth2</a>";
67+
return WxCpXmlOutMessage
68+
.TEXT()
69+
.content(href)
70+
.fromUser(wxMessage.getToUserName())
71+
.toUser(wxMessage.getFromUserName()).build();
72+
}
73+
};
74+
75+
wxCpMessageRouter = new WxCpMessageRouter(wxCpService);
76+
wxCpMessageRouter
77+
.rule()
78+
.async(false)
79+
.content("哈哈") // 拦截内容为“哈哈”的消息
80+
.handler(handler)
81+
.end()
82+
.rule()
83+
.async(false)
84+
.content("oauth")
85+
.handler(oauth2handler)
86+
.end()
87+
;
88+
89+
} catch (JAXBException e) {
90+
throw new RuntimeException(e);
91+
}
92+
}
2093
}

weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpDemoServlet.java renamed to weixin-java-cp/src/test/java/me/chanjar/weixin/cp/demo/WxCpEndpointServlet.java

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,49 +19,21 @@
1919
/**
2020
* @author Daniel Qian
2121
*/
22-
public class WxCpDemoServlet extends HttpServlet {
22+
public class WxCpEndpointServlet extends HttpServlet {
2323

2424
protected WxCpConfigStorage wxCpConfigStorage;
2525
protected WxCpService wxCpService;
2626
protected WxCpMessageRouter wxCpMessageRouter;
2727

28-
@Override public void init() throws ServletException {
29-
//
30-
super.init();
31-
try {
32-
InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml");
33-
WxCpDemoInMemoryConfigStorage config = WxCpDemoInMemoryConfigStorage.fromXml(is1);
34-
35-
wxCpConfigStorage = config;
36-
wxCpService = new WxCpServiceImpl();
37-
wxCpService.setWxCpConfigStorage(config);
38-
39-
WxCpMessageHandler handler = new WxCpMessageHandler() {
40-
@Override public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage, Map<String, Object> context, WxCpService wxCpService) {
41-
WxCpXmlOutTextMessage m = WxCpXmlOutMessage
42-
.TEXT()
43-
.content("测试加密消息")
44-
.fromUser(wxMessage.getToUserName())
45-
.toUser(wxMessage.getFromUserName())
46-
.build();
47-
return m;
48-
}
49-
};
50-
51-
wxCpMessageRouter = new WxCpMessageRouter(wxCpService);
52-
wxCpMessageRouter
53-
.rule()
54-
.async(false)
55-
.content("哈哈") // 拦截内容为“哈哈”的消息
56-
.handler(handler)
57-
.end();
58-
59-
} catch (JAXBException e) {
60-
throw new RuntimeException(e);
61-
}
28+
public WxCpEndpointServlet(WxCpConfigStorage wxCpConfigStorage, WxCpService wxCpService,
29+
WxCpMessageRouter wxCpMessageRouter) {
30+
this.wxCpConfigStorage = wxCpConfigStorage;
31+
this.wxCpService = wxCpService;
32+
this.wxCpMessageRouter = wxCpMessageRouter;
6233
}
6334

64-
@Override protected void service(HttpServletRequest request, HttpServletResponse response)
35+
@Override
36+
protected void service(HttpServletRequest request, HttpServletResponse response)
6537
throws ServletException, IOException {
6638

6739
response.setContentType("text/html;charset=utf-8");
@@ -85,7 +57,8 @@ public class WxCpDemoServlet extends HttpServlet {
8557
return;
8658
}
8759

88-
WxCpXmlMessage inMessage = WxCpXmlMessage.fromEncryptedXml(request.getInputStream(), wxCpConfigStorage, timestamp, nonce, msgSignature);
60+
WxCpXmlMessage inMessage = WxCpXmlMessage
61+
.fromEncryptedXml(request.getInputStream(), wxCpConfigStorage, timestamp, nonce, msgSignature);
8962
WxCpXmlOutMessage outMessage = wxCpMessageRouter.route(inMessage);
9063
if (outMessage != null) {
9164
response.getWriter().write(outMessage.toEncryptedXml(wxCpConfigStorage));
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
package me.chanjar.weixin.cp.demo;
2+
3+
import me.chanjar.weixin.common.exception.WxErrorException;
4+
import me.chanjar.weixin.cp.api.WxCpService;
5+
6+
import javax.servlet.ServletException;
7+
import javax.servlet.http.HttpServlet;
8+
import javax.servlet.http.HttpServletRequest;
9+
import javax.servlet.http.HttpServletResponse;
10+
import java.io.IOException;
11+
import java.util.Arrays;
12+
13+
/**
14+
* Created by qianjia on 14/11/28.
15+
*/
16+
public class WxCpOAuth2Servlet extends HttpServlet {
17+
18+
protected WxCpService wxCpService;
19+
20+
public WxCpOAuth2Servlet(WxCpService wxCpService) {
21+
this.wxCpService = wxCpService;
22+
}
23+
24+
@Override protected void service(HttpServletRequest request, HttpServletResponse response)
25+
throws ServletException, IOException {
26+
27+
response.setContentType("text/html;charset=utf-8");
28+
response.setStatus(HttpServletResponse.SC_OK);
29+
30+
String code = request.getParameter("code");
31+
try {
32+
response.getWriter().println("<h1>code</h1>");
33+
response.getWriter().println(code);
34+
35+
String[] res = wxCpService.oauth2getUserInfo(code);
36+
response.getWriter().println("<h1>result</h1>");
37+
response.getWriter().println(Arrays.toString(res));
38+
} catch (WxErrorException e) {
39+
e.printStackTrace();
40+
}
41+
42+
response.getWriter().flush();
43+
response.getWriter().close();
44+
45+
}
46+
47+
48+
}

‎weixin-java-cp/src/test/resources/test-config.sample.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@
99
<userId>企业号通讯录里的某个userid</userId>
1010
<departmentId>企业号通讯录的某个部门id</departmentId>
1111
<tagId>企业号通讯录里的某个tagid</tagId>
12+
<oauth2redirectUri>网页授权获取用户信息回调地址</oauth2redirectUri>
1213
</xml>

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpInMemoryConfigStorage.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ public class WxMpInMemoryConfigStorage implements WxMpConfigStorage {
1616
protected String aesKey;
1717
protected int expiresIn;
1818

19+
protected String oauth2redirectUri;
20+
1921
protected String http_proxy_host;
2022
protected int http_proxy_port;
2123
protected String http_proxy_username;
2224
protected String http_proxy_password;
23-
protected String oauth2redirectUri;
2425

2526
public void updateAccessToken(WxAccessToken accessToken) {
2627
updateAccessToken(accessToken.getAccessToken(), accessToken.getExpiresIn());

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/WxMpDemoServer.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
import java.io.InputStream;
1717
import java.util.Map;
1818

19-
/**
20-
* @author Daniel Qian
21-
*/
2219
public class WxMpDemoServer {
2320

2421
private static WxMpConfigStorage wxMpConfigStorage;

0 commit comments

Comments
 (0)