@@ -116,7 +116,7 @@ | |||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> | ||||
<httpclient.version>4.5</httpclient.version> | <httpclient.version>4.5</httpclient.version> | ||||
<jetty.version>9.4.17.v20190418</jetty.version> | |||||
<jetty.version>9.4.28.v20200408</jetty.version> | |||||
</properties> | </properties> | ||||
<dependencyManagement> | <dependencyManagement> | ||||
@@ -130,13 +130,13 @@ | |||||
<dependency> | <dependency> | ||||
<groupId>org.jodd</groupId> | <groupId>org.jodd</groupId> | ||||
<artifactId>jodd-http</artifactId> | <artifactId>jodd-http</artifactId> | ||||
<version>3.7.1</version> | |||||
<version>5.1.4</version> | |||||
<scope>provided</scope> | <scope>provided</scope> | ||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<groupId>com.squareup.okhttp3</groupId> | <groupId>com.squareup.okhttp3</groupId> | ||||
<artifactId>okhttp</artifactId> | <artifactId>okhttp</artifactId> | ||||
<version>3.7.0</version> | |||||
<version>4.5.0</version> | |||||
<scope>provided</scope> | <scope>provided</scope> | ||||
</dependency> | </dependency> | ||||
@@ -163,7 +163,7 @@ | |||||
<dependency> | <dependency> | ||||
<groupId>org.apache.commons</groupId> | <groupId>org.apache.commons</groupId> | ||||
<artifactId>commons-lang3</artifactId> | <artifactId>commons-lang3</artifactId> | ||||
<version>3.5</version> | |||||
<version>3.10</version> | |||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<groupId>org.slf4j</groupId> | <groupId>org.slf4j</groupId> | ||||
@@ -191,31 +191,31 @@ | |||||
<dependency> | <dependency> | ||||
<groupId>joda-time</groupId> | <groupId>joda-time</groupId> | ||||
<artifactId>joda-time</artifactId> | <artifactId>joda-time</artifactId> | ||||
<version>2.9.7</version> | |||||
<version>2.10.6</version> | |||||
<scope>test</scope> | <scope>test</scope> | ||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<groupId>ch.qos.logback</groupId> | <groupId>ch.qos.logback</groupId> | ||||
<artifactId>logback-classic</artifactId> | <artifactId>logback-classic</artifactId> | ||||
<version>1.1.11</version> | |||||
<version>1.2.3</version> | |||||
<scope>test</scope> | <scope>test</scope> | ||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<groupId>com.google.inject</groupId> | <groupId>com.google.inject</groupId> | ||||
<artifactId>guice</artifactId> | <artifactId>guice</artifactId> | ||||
<version>3.0</version> | |||||
<version>4.2.3</version> | |||||
<scope>test</scope> | <scope>test</scope> | ||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<groupId>org.testng</groupId> | <groupId>org.testng</groupId> | ||||
<artifactId>testng</artifactId> | <artifactId>testng</artifactId> | ||||
<version>6.10</version> | |||||
<version>7.1.0</version> | |||||
<scope>test</scope> | <scope>test</scope> | ||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<groupId>org.mockito</groupId> | <groupId>org.mockito</groupId> | ||||
<artifactId>mockito-all</artifactId> | <artifactId>mockito-all</artifactId> | ||||
<version>1.9.5</version> | |||||
<version>1.10.19</version> | |||||
<scope>test</scope> | <scope>test</scope> | ||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
@@ -74,7 +74,7 @@ | |||||
<dependency> | <dependency> | ||||
<groupId>org.bouncycastle</groupId> | <groupId>org.bouncycastle</groupId> | ||||
<artifactId>bcpkix-jdk15on</artifactId> | <artifactId>bcpkix-jdk15on</artifactId> | ||||
<version>1.59</version> | |||||
<version>1.65</version> | |||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<groupId>org.projectlombok</groupId> | <groupId>org.projectlombok</groupId> | ||||
@@ -46,7 +46,7 @@ public class WxMpServiceJoddHttpImpl extends BaseWxMpServiceImpl<HttpConnectionP | |||||
httpProxy = new ProxyInfo(ProxyInfo.ProxyType.HTTP, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword()); | httpProxy = new ProxyInfo(ProxyInfo.ProxyType.HTTP, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword()); | ||||
} | } | ||||
httpClient = JoddHttp.httpConnectionProvider; | |||||
httpClient = new SocketHttpConnectionProvider(); | |||||
} | } | ||||
@Override | @Override | ||||
@@ -4,7 +4,7 @@ import jodd.http.HttpConnectionProvider; | |||||
import jodd.http.HttpRequest; | import jodd.http.HttpRequest; | ||||
import jodd.http.HttpResponse; | import jodd.http.HttpResponse; | ||||
import jodd.http.ProxyInfo; | import jodd.http.ProxyInfo; | ||||
import jodd.util.MimeTypes; | |||||
import jodd.net.MimeTypes; | |||||
import jodd.util.StringPool; | import jodd.util.StringPool; | ||||
import me.chanjar.weixin.common.WxType; | import me.chanjar.weixin.common.WxType; | ||||
@@ -95,7 +95,6 @@ public class WxMpMemberCardServiceImplTest { | |||||
@Test | @Test | ||||
public void testUpdateUserMemberCard() throws Exception { | public void testUpdateUserMemberCard() throws Exception { | ||||
WxMpMemberCardUpdateMessage updateMessage = new WxMpMemberCardUpdateMessage(); | WxMpMemberCardUpdateMessage updateMessage = new WxMpMemberCardUpdateMessage(); | ||||
updateMessage.setAddBounus(100); | |||||
updateMessage.setBonus(1000); | updateMessage.setBonus(1000); | ||||
updateMessage.setCardId(cardId); | updateMessage.setCardId(cardId); | ||||
updateMessage.setCode(code); | updateMessage.setCode(code); | ||||
@@ -79,9 +79,9 @@ public class WxMpXmlMessageTest { | |||||
assertEquals(wxMessage.getMediaId(), "media_id"); | assertEquals(wxMessage.getMediaId(), "media_id"); | ||||
assertEquals(wxMessage.getFormat(), "Format"); | assertEquals(wxMessage.getFormat(), "Format"); | ||||
assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id"); | assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id"); | ||||
assertEquals(wxMessage.getLocationX(), 23.134521d); | |||||
assertEquals(wxMessage.getLocationY(), 113.358803d); | |||||
assertEquals(wxMessage.getScale(), 20d); | |||||
assertEquals(wxMessage.getLocationX().doubleValue(), 23.134521d); | |||||
assertEquals(wxMessage.getLocationY().doubleValue(), 113.358803d); | |||||
assertEquals(wxMessage.getScale().doubleValue(), 20d); | |||||
assertEquals(wxMessage.getLabel(), "位置信息"); | assertEquals(wxMessage.getLabel(), "位置信息"); | ||||
assertEquals(wxMessage.getDescription(), "公众平台官网链接"); | assertEquals(wxMessage.getDescription(), "公众平台官网链接"); | ||||
assertEquals(wxMessage.getUrl(), "url"); | assertEquals(wxMessage.getUrl(), "url"); | ||||
@@ -89,9 +89,9 @@ public class WxMpXmlMessageTest { | |||||
assertEquals(wxMessage.getEvent(), "subscribe"); | assertEquals(wxMessage.getEvent(), "subscribe"); | ||||
assertEquals(wxMessage.getEventKey(), "qrscene_123123"); | assertEquals(wxMessage.getEventKey(), "qrscene_123123"); | ||||
assertEquals(wxMessage.getTicket(), "TICKET"); | assertEquals(wxMessage.getTicket(), "TICKET"); | ||||
assertEquals(wxMessage.getLatitude(), 23.137466); | |||||
assertEquals(wxMessage.getLongitude(), 113.352425); | |||||
assertEquals(wxMessage.getPrecision(), 119.385040); | |||||
assertEquals(wxMessage.getLatitude().doubleValue(), 23.137466); | |||||
assertEquals(wxMessage.getLongitude().doubleValue(), 113.352425); | |||||
assertEquals(wxMessage.getPrecision().doubleValue(), 119.385040); | |||||
assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode"); | assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode"); | ||||
assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1"); | assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1"); | ||||
assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L)); | assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L)); | ||||
@@ -170,9 +170,9 @@ public class WxMpXmlMessageTest { | |||||
assertEquals(wxMessage.getMediaId(), "media_id"); | assertEquals(wxMessage.getMediaId(), "media_id"); | ||||
assertEquals(wxMessage.getFormat(), "Format"); | assertEquals(wxMessage.getFormat(), "Format"); | ||||
assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id"); | assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id"); | ||||
assertEquals(wxMessage.getLocationX(), 23.134521d); | |||||
assertEquals(wxMessage.getLocationY(), 113.358803d); | |||||
assertEquals(wxMessage.getScale(), 20d); | |||||
assertEquals(wxMessage.getLocationX().doubleValue(), 23.134521d); | |||||
assertEquals(wxMessage.getLocationY().doubleValue(), 113.358803d); | |||||
assertEquals(wxMessage.getScale().doubleValue(), 20d); | |||||
assertEquals(wxMessage.getLabel(), "位置信息"); | assertEquals(wxMessage.getLabel(), "位置信息"); | ||||
assertEquals(wxMessage.getDescription(), "公众平台官网链接"); | assertEquals(wxMessage.getDescription(), "公众平台官网链接"); | ||||
assertEquals(wxMessage.getUrl(), "url"); | assertEquals(wxMessage.getUrl(), "url"); | ||||
@@ -180,9 +180,9 @@ public class WxMpXmlMessageTest { | |||||
assertEquals(wxMessage.getEvent(), "subscribe"); | assertEquals(wxMessage.getEvent(), "subscribe"); | ||||
assertEquals(wxMessage.getEventKey(), "qrscene_123123"); | assertEquals(wxMessage.getEventKey(), "qrscene_123123"); | ||||
assertEquals(wxMessage.getTicket(), "TICKET"); | assertEquals(wxMessage.getTicket(), "TICKET"); | ||||
assertEquals(wxMessage.getLatitude(), 23.137466); | |||||
assertEquals(wxMessage.getLongitude(), 113.352425); | |||||
assertEquals(wxMessage.getPrecision(), 119.385040); | |||||
assertEquals(wxMessage.getLatitude().doubleValue(), 23.137466); | |||||
assertEquals(wxMessage.getLongitude().doubleValue(), 113.352425); | |||||
assertEquals(wxMessage.getPrecision().doubleValue(), 119.385040); | |||||
assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode"); | assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode"); | ||||
assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1"); | assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1"); | ||||
assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L)); | assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L)); | ||||
@@ -38,12 +38,12 @@ | |||||
<dependency> | <dependency> | ||||
<groupId>commons-beanutils</groupId> | <groupId>commons-beanutils</groupId> | ||||
<artifactId>commons-beanutils</artifactId> | <artifactId>commons-beanutils</artifactId> | ||||
<version>1.9.3</version> | |||||
<version>1.9.4</version> | |||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||
<groupId>org.bouncycastle</groupId> | <groupId>org.bouncycastle</groupId> | ||||
<artifactId>bcpkix-jdk15on</artifactId> | <artifactId>bcpkix-jdk15on</artifactId> | ||||
<version>1.59</version> | |||||
<version>1.65</version> | |||||
</dependency> | </dependency> | ||||
<dependency> | <dependency> | ||||