mirror of
https://gitee.com/binary/weixin-java-tools.git
synced 2026-03-10 00:13:40 +08:00
fix some warnings in test files
This commit is contained in:
@@ -30,7 +30,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
|
||||
}
|
||||
|
||||
private boolean isUserAnswering(WxMpXmlMessage message) {
|
||||
return pattern.matcher(message.getContent()).matches();
|
||||
return this.pattern.matcher(message.getContent()).matches();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -68,7 +68,7 @@ public class DemoGuessNumberHandler implements WxMpMessageHandler, WxMpMessageMa
|
||||
}
|
||||
|
||||
session.setAttribute("guessing", Boolean.TRUE);
|
||||
session.setAttribute("number", random.nextInt(100));
|
||||
session.setAttribute("number", this.random.nextInt(100));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -15,8 +15,8 @@ class WxMpDemoInMemoryConfigStorage extends WxMpInMemoryConfigStorage {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "SimpleWxConfigProvider [appId=" + appId + ", secret=" + secret + ", accessToken=" + accessToken
|
||||
+ ", expiresTime=" + expiresTime + ", token=" + token + ", aesKey=" + aesKey + "]";
|
||||
return "SimpleWxConfigProvider [appId=" + this.appId + ", secret=" + this.secret + ", accessToken=" + this.accessToken
|
||||
+ ", expiresTime=" + this.expiresTime + ", token=" + this.token + ", aesKey=" + this.aesKey + "]";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
package me.chanjar.weixin.mp.demo;
|
||||
|
||||
import me.chanjar.weixin.common.api.WxConsts;
|
||||
import me.chanjar.weixin.mp.api.*;
|
||||
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.servlet.ServletHandler;
|
||||
import org.eclipse.jetty.servlet.ServletHolder;
|
||||
|
||||
import java.io.InputStream;
|
||||
import me.chanjar.weixin.common.api.WxConsts;
|
||||
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
|
||||
import me.chanjar.weixin.mp.api.WxMpMessageHandler;
|
||||
import me.chanjar.weixin.mp.api.WxMpMessageRouter;
|
||||
import me.chanjar.weixin.mp.api.WxMpService;
|
||||
import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
|
||||
|
||||
public class WxMpDemoServer {
|
||||
|
||||
@@ -23,10 +28,13 @@ public class WxMpDemoServer {
|
||||
ServletHandler servletHandler = new ServletHandler();
|
||||
server.setHandler(servletHandler);
|
||||
|
||||
ServletHolder endpointServletHolder = new ServletHolder(new WxMpEndpointServlet(wxMpConfigStorage, wxMpService, wxMpMessageRouter));
|
||||
ServletHolder endpointServletHolder = new ServletHolder(
|
||||
new WxMpEndpointServlet(wxMpConfigStorage, wxMpService,
|
||||
wxMpMessageRouter));
|
||||
servletHandler.addServletWithMapping(endpointServletHolder, "/*");
|
||||
|
||||
ServletHolder oauthServletHolder = new ServletHolder(new WxMpOAuth2Servlet(wxMpService));
|
||||
ServletHolder oauthServletHolder = new ServletHolder(
|
||||
new WxMpOAuth2Servlet(wxMpService));
|
||||
servletHandler.addServletWithMapping(oauthServletHolder, "/oauth2/*");
|
||||
|
||||
server.start();
|
||||
@@ -34,27 +42,30 @@ public class WxMpDemoServer {
|
||||
}
|
||||
|
||||
private static void initWeixin() {
|
||||
InputStream is1 = ClassLoader.getSystemResourceAsStream("test-config.xml");
|
||||
WxMpDemoInMemoryConfigStorage config = WxMpDemoInMemoryConfigStorage.fromXml(is1);
|
||||
try (InputStream is1 = ClassLoader
|
||||
.getSystemResourceAsStream("test-config.xml")) {
|
||||
WxMpDemoInMemoryConfigStorage config = WxMpDemoInMemoryConfigStorage
|
||||
.fromXml(is1);
|
||||
|
||||
wxMpConfigStorage = config;
|
||||
wxMpService = new WxMpServiceImpl();
|
||||
wxMpService.setWxMpConfigStorage(config);
|
||||
wxMpConfigStorage = config;
|
||||
wxMpService = new WxMpServiceImpl();
|
||||
wxMpService.setWxMpConfigStorage(config);
|
||||
|
||||
WxMpMessageHandler logHandler = new DemoLogHandler();
|
||||
WxMpMessageHandler textHandler = new DemoTextHandler();
|
||||
WxMpMessageHandler imageHandler = new DemoImageHandler();
|
||||
WxMpMessageHandler oauth2handler = new DemoOAuth2Handler();
|
||||
DemoGuessNumberHandler guessNumberHandler = new DemoGuessNumberHandler();
|
||||
|
||||
wxMpMessageRouter = new WxMpMessageRouter(wxMpService);
|
||||
wxMpMessageRouter
|
||||
.rule().handler(logHandler).next()
|
||||
.rule().msgType(WxConsts.XML_MSG_TEXT).matcher(guessNumberHandler).handler(guessNumberHandler).end()
|
||||
.rule().async(false).content("哈哈").handler(textHandler).end()
|
||||
.rule().async(false).content("图片").handler(imageHandler).end()
|
||||
.rule().async(false).content("oauth").handler(oauth2handler).end()
|
||||
;
|
||||
WxMpMessageHandler logHandler = new DemoLogHandler();
|
||||
WxMpMessageHandler textHandler = new DemoTextHandler();
|
||||
WxMpMessageHandler imageHandler = new DemoImageHandler();
|
||||
WxMpMessageHandler oauth2handler = new DemoOAuth2Handler();
|
||||
DemoGuessNumberHandler guessNumberHandler = new DemoGuessNumberHandler();
|
||||
|
||||
wxMpMessageRouter = new WxMpMessageRouter(wxMpService);
|
||||
wxMpMessageRouter.rule().handler(logHandler).next().rule()
|
||||
.msgType(WxConsts.XML_MSG_TEXT).matcher(guessNumberHandler)
|
||||
.handler(guessNumberHandler).end().rule().async(false).content("哈哈")
|
||||
.handler(textHandler).end().rule().async(false).content("图片")
|
||||
.handler(imageHandler).end().rule().async(false).content("oauth")
|
||||
.handler(oauth2handler).end();
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,10 @@ import java.io.IOException;
|
||||
*/
|
||||
public class WxMpEndpointServlet extends HttpServlet {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
protected WxMpConfigStorage wxMpConfigStorage;
|
||||
protected WxMpService wxMpService;
|
||||
protected WxMpMessageRouter wxMpMessageRouter;
|
||||
@@ -39,7 +43,7 @@ public class WxMpEndpointServlet extends HttpServlet {
|
||||
String nonce = request.getParameter("nonce");
|
||||
String timestamp = request.getParameter("timestamp");
|
||||
|
||||
if (!wxMpService.checkSignature(timestamp, nonce, signature)) {
|
||||
if (!this.wxMpService.checkSignature(timestamp, nonce, signature)) {
|
||||
// 消息签名不正确,说明不是公众平台发过来的消息
|
||||
response.getWriter().println("非法请求");
|
||||
return;
|
||||
@@ -59,7 +63,7 @@ public class WxMpEndpointServlet extends HttpServlet {
|
||||
if ("raw".equals(encryptType)) {
|
||||
// 明文传输的消息
|
||||
WxMpXmlMessage inMessage = WxMpXmlMessage.fromXml(request.getInputStream());
|
||||
WxMpXmlOutMessage outMessage = wxMpMessageRouter.route(inMessage);
|
||||
WxMpXmlOutMessage outMessage = this.wxMpMessageRouter.route(inMessage);
|
||||
if (outMessage != null) {
|
||||
response.getWriter().write(outMessage.toXml());
|
||||
}
|
||||
@@ -69,9 +73,9 @@ public class WxMpEndpointServlet extends HttpServlet {
|
||||
if ("aes".equals(encryptType)) {
|
||||
// 是aes加密的消息
|
||||
String msgSignature = request.getParameter("msg_signature");
|
||||
WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(request.getInputStream(), wxMpConfigStorage, timestamp, nonce, msgSignature);
|
||||
WxMpXmlOutMessage outMessage = wxMpMessageRouter.route(inMessage);
|
||||
response.getWriter().write(outMessage.toEncryptedXml(wxMpConfigStorage));
|
||||
WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(request.getInputStream(), this.wxMpConfigStorage, timestamp, nonce, msgSignature);
|
||||
WxMpXmlOutMessage outMessage = this.wxMpMessageRouter.route(inMessage);
|
||||
response.getWriter().write(outMessage.toEncryptedXml(this.wxMpConfigStorage));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -13,6 +13,10 @@ import java.io.IOException;
|
||||
|
||||
public class WxMpOAuth2Servlet extends HttpServlet {
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
protected WxMpService wxMpService;
|
||||
|
||||
public WxMpOAuth2Servlet(WxMpService wxMpService) {
|
||||
@@ -30,15 +34,15 @@ public class WxMpOAuth2Servlet extends HttpServlet {
|
||||
response.getWriter().println("<h1>code</h1>");
|
||||
response.getWriter().println(code);
|
||||
|
||||
WxMpOAuth2AccessToken wxMpOAuth2AccessToken = wxMpService.oauth2getAccessToken(code);
|
||||
WxMpOAuth2AccessToken wxMpOAuth2AccessToken = this.wxMpService.oauth2getAccessToken(code);
|
||||
response.getWriter().println("<h1>access token</h1>");
|
||||
response.getWriter().println(wxMpOAuth2AccessToken.toString());
|
||||
|
||||
WxMpUser wxMpUser = wxMpService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
|
||||
WxMpUser wxMpUser = this.wxMpService.oauth2getUserInfo(wxMpOAuth2AccessToken, null);
|
||||
response.getWriter().println("<h1>user info</h1>");
|
||||
response.getWriter().println(wxMpUser.toString());
|
||||
|
||||
wxMpOAuth2AccessToken = wxMpService.oauth2refreshAccessToken(wxMpOAuth2AccessToken.getRefreshToken());
|
||||
wxMpOAuth2AccessToken = this.wxMpService.oauth2refreshAccessToken(wxMpOAuth2AccessToken.getRefreshToken());
|
||||
response.getWriter().println("<h1>after refresh</h1>");
|
||||
response.getWriter().println(wxMpOAuth2AccessToken.toString());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user