Skip to content

Commit 5d95f37

Browse files
binarywangbinarywang
committed
fix some format
2 parents 8970b2c + d49c3dc commit 5d95f37

File tree

4 files changed

+24
-28
lines changed

4 files changed

+24
-28
lines changed

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/ApiTestModule.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public void configure(Binder binder) {
3131
}
3232
}
3333

34+
@SuppressWarnings("unchecked")
3435
public static <T> T fromXml(Class<T> clazz, InputStream is) {
3536
XStream xstream = XStreamInitializer.getInstance();
3637
xstream.alias("xml", clazz);

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpServiceImplTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package me.chanjar.weixin.mp.api.impl;
22

3+
import org.testng.Assert;
34
import org.testng.annotations.Guice;
45
import org.testng.annotations.Test;
56

@@ -9,8 +10,6 @@
910
import me.chanjar.weixin.mp.api.ApiTestModule;
1011
import me.chanjar.weixin.mp.api.ApiTestModule.WxXmlMpInMemoryConfigStorage;
1112

12-
import org.testng.Assert;
13-
1413
@Test
1514
@Guice(modules = ApiTestModule.class)
1615
public class WxMpServiceImplTest {
@@ -110,11 +109,9 @@ public void testOauth2buildAuthorizationUrl() {
110109

111110
@Test
112111
public void testBuildQrConnectUrl() {
113-
String qrConnectUrl = this.wxService
114-
.buildQrConnectUrl(
115-
((WxXmlMpInMemoryConfigStorage) this.wxService
116-
.getWxMpConfigStorage()).getOauth2redirectUri(),
117-
WxConsts.QRCONNECT_SCOPE_SNSAPI_LOGIN, null);
112+
String qrconnectRedirectUrl = ((WxXmlMpInMemoryConfigStorage) this.wxService.getWxMpConfigStorage()).getQrconnectRedirectUrl();
113+
String qrConnectUrl = this.wxService.buildQrConnectUrl(qrconnectRedirectUrl,
114+
WxConsts.QRCONNECT_SCOPE_SNSAPI_LOGIN, null);
118115
Assert.assertNotNull(qrConnectUrl);
119116
System.out.println(qrConnectUrl);
120117
}

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,25 @@
11
package me.chanjar.weixin.mp.demo;
22

3+
import java.io.IOException;
4+
5+
import javax.servlet.ServletException;
6+
import javax.servlet.http.HttpServlet;
7+
import javax.servlet.http.HttpServletRequest;
8+
import javax.servlet.http.HttpServletResponse;
9+
310
import me.chanjar.weixin.common.util.StringUtils;
411
import me.chanjar.weixin.mp.api.WxMpConfigStorage;
512
import me.chanjar.weixin.mp.api.WxMpMessageRouter;
613
import me.chanjar.weixin.mp.api.WxMpService;
714
import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
815
import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
916

10-
import javax.servlet.ServletException;
11-
import javax.servlet.http.HttpServlet;
12-
import javax.servlet.http.HttpServletRequest;
13-
import javax.servlet.http.HttpServletResponse;
14-
import java.io.IOException;
15-
1617
/**
1718
* @author Daniel Qian
1819
*/
1920
public class WxMpEndpointServlet extends HttpServlet {
20-
21-
/**
22-
*
23-
*/
2421
private static final long serialVersionUID = 1L;
22+
2523
protected WxMpConfigStorage wxMpConfigStorage;
2624
protected WxMpService wxMpService;
2725
protected WxMpMessageRouter wxMpMessageRouter;
@@ -33,7 +31,8 @@ public WxMpEndpointServlet(WxMpConfigStorage wxMpConfigStorage, WxMpService wxMp
3331
this.wxMpMessageRouter = wxMpMessageRouter;
3432
}
3533

36-
@Override protected void service(HttpServletRequest request, HttpServletResponse response)
34+
@Override
35+
protected void service(HttpServletRequest request, HttpServletResponse response)
3736
throws ServletException, IOException {
3837

3938
response.setContentType("text/html;charset=utf-8");

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
package me.chanjar.weixin.mp.demo;
22

3-
import me.chanjar.weixin.common.exception.WxErrorException;
4-
import me.chanjar.weixin.mp.api.WxMpService;
5-
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
6-
import me.chanjar.weixin.mp.bean.result.WxMpUser;
3+
import java.io.IOException;
74

85
import javax.servlet.ServletException;
96
import javax.servlet.http.HttpServlet;
107
import javax.servlet.http.HttpServletRequest;
118
import javax.servlet.http.HttpServletResponse;
12-
import java.io.IOException;
139

14-
public class WxMpOAuth2Servlet extends HttpServlet {
10+
import me.chanjar.weixin.common.exception.WxErrorException;
11+
import me.chanjar.weixin.mp.api.WxMpService;
12+
import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
13+
import me.chanjar.weixin.mp.bean.result.WxMpUser;
1514

16-
/**
17-
*
18-
*/
15+
public class WxMpOAuth2Servlet extends HttpServlet {
1916
private static final long serialVersionUID = 1L;
17+
2018
protected WxMpService wxMpService;
2119

2220
public WxMpOAuth2Servlet(WxMpService wxMpService) {
2321
this.wxMpService = wxMpService;
2422
}
2523

26-
@Override protected void service(HttpServletRequest request, HttpServletResponse response)
24+
@Override
25+
protected void service(HttpServletRequest request, HttpServletResponse response)
2726
throws ServletException, IOException {
2827

2928
response.setContentType("text/html;charset=utf-8");

0 commit comments

Comments
 (0)