Skip to content

Commit a907938

Browse files
binarywangbinarywang
committed
⬆️ 更新部分依赖jar包版本
1 parent 8805e97 commit a907938

File tree

7 files changed

+26
-27
lines changed

7 files changed

+26
-27
lines changed

‎pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116

117117
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
118118
<httpclient.version>4.5</httpclient.version>
119-
<jetty.version>9.4.17.v20190418</jetty.version>
119+
<jetty.version>9.4.28.v20200408</jetty.version>
120120
</properties>
121121

122122
<dependencyManagement>
@@ -130,13 +130,13 @@
130130
<dependency>
131131
<groupId>org.jodd</groupId>
132132
<artifactId>jodd-http</artifactId>
133-
<version>3.7.1</version>
133+
<version>5.1.4</version>
134134
<scope>provided</scope>
135135
</dependency>
136136
<dependency>
137137
<groupId>com.squareup.okhttp3</groupId>
138138
<artifactId>okhttp</artifactId>
139-
<version>3.7.0</version>
139+
<version>4.5.0</version>
140140
<scope>provided</scope>
141141
</dependency>
142142

@@ -163,7 +163,7 @@
163163
<dependency>
164164
<groupId>org.apache.commons</groupId>
165165
<artifactId>commons-lang3</artifactId>
166-
<version>3.5</version>
166+
<version>3.10</version>
167167
</dependency>
168168
<dependency>
169169
<groupId>org.slf4j</groupId>
@@ -191,31 +191,31 @@
191191
<dependency>
192192
<groupId>joda-time</groupId>
193193
<artifactId>joda-time</artifactId>
194-
<version>2.9.7</version>
194+
<version>2.10.6</version>
195195
<scope>test</scope>
196196
</dependency>
197197
<dependency>
198198
<groupId>ch.qos.logback</groupId>
199199
<artifactId>logback-classic</artifactId>
200-
<version>1.1.11</version>
200+
<version>1.2.3</version>
201201
<scope>test</scope>
202202
</dependency>
203203
<dependency>
204204
<groupId>com.google.inject</groupId>
205205
<artifactId>guice</artifactId>
206-
<version>3.0</version>
206+
<version>4.2.3</version>
207207
<scope>test</scope>
208208
</dependency>
209209
<dependency>
210210
<groupId>org.testng</groupId>
211211
<artifactId>testng</artifactId>
212-
<version>6.10</version>
212+
<version>7.1.0</version>
213213
<scope>test</scope>
214214
</dependency>
215215
<dependency>
216216
<groupId>org.mockito</groupId>
217217
<artifactId>mockito-all</artifactId>
218-
<version>1.9.5</version>
218+
<version>1.10.19</version>
219219
<scope>test</scope>
220220
</dependency>
221221
<dependency>

‎weixin-java-miniapp/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<dependency>
7575
<groupId>org.bouncycastle</groupId>
7676
<artifactId>bcpkix-jdk15on</artifactId>
77-
<version>1.59</version>
77+
<version>1.65</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.projectlombok</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void initHttp() {
4646
httpProxy = new ProxyInfo(ProxyInfo.ProxyType.HTTP, configStorage.getHttpProxyHost(), configStorage.getHttpProxyPort(), configStorage.getHttpProxyUsername(), configStorage.getHttpProxyPassword());
4747
}
4848

49-
httpClient = JoddHttp.httpConnectionProvider;
49+
httpClient = new SocketHttpConnectionProvider();
5050
}
5151

5252
@Override

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/util/requestexecuter/qrcode/QrCodeJoddHttpRequestExecutor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import jodd.http.HttpRequest;
55
import jodd.http.HttpResponse;
66
import jodd.http.ProxyInfo;
7-
import jodd.util.MimeTypes;
7+
import jodd.net.MimeTypes;
88
import jodd.util.StringPool;
99

1010
import me.chanjar.weixin.common.WxType;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ public void testGetUserInfo() throws Exception {
9595
@Test
9696
public void testUpdateUserMemberCard() throws Exception {
9797
WxMpMemberCardUpdateMessage updateMessage = new WxMpMemberCardUpdateMessage();
98-
updateMessage.setAddBounus(100);
9998
updateMessage.setBonus(1000);
10099
updateMessage.setCardId(cardId);
101100
updateMessage.setCode(code);

‎weixin-java-mp/src/test/java/me/chanjar/weixin/mp/bean/message/WxMpXmlMessageTest.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,19 @@ public void testFromXml() {
7979
assertEquals(wxMessage.getMediaId(), "media_id");
8080
assertEquals(wxMessage.getFormat(), "Format");
8181
assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
82-
assertEquals(wxMessage.getLocationX(), 23.134521d);
83-
assertEquals(wxMessage.getLocationY(), 113.358803d);
84-
assertEquals(wxMessage.getScale(), 20d);
82+
assertEquals(wxMessage.getLocationX().doubleValue(), 23.134521d);
83+
assertEquals(wxMessage.getLocationY().doubleValue(), 113.358803d);
84+
assertEquals(wxMessage.getScale().doubleValue(), 20d);
8585
assertEquals(wxMessage.getLabel(), "位置信息");
8686
assertEquals(wxMessage.getDescription(), "公众平台官网链接");
8787
assertEquals(wxMessage.getUrl(), "url");
8888
assertEquals(wxMessage.getTitle(), "公众平台官网链接");
8989
assertEquals(wxMessage.getEvent(), "subscribe");
9090
assertEquals(wxMessage.getEventKey(), "qrscene_123123");
9191
assertEquals(wxMessage.getTicket(), "TICKET");
92-
assertEquals(wxMessage.getLatitude(), 23.137466);
93-
assertEquals(wxMessage.getLongitude(), 113.352425);
94-
assertEquals(wxMessage.getPrecision(), 119.385040);
92+
assertEquals(wxMessage.getLatitude().doubleValue(), 23.137466);
93+
assertEquals(wxMessage.getLongitude().doubleValue(), 113.352425);
94+
assertEquals(wxMessage.getPrecision().doubleValue(), 119.385040);
9595
assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
9696
assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
9797
assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L));
@@ -170,19 +170,19 @@ public void testFromXml2() {
170170
assertEquals(wxMessage.getMediaId(), "media_id");
171171
assertEquals(wxMessage.getFormat(), "Format");
172172
assertEquals(wxMessage.getThumbMediaId(), "thumb_media_id");
173-
assertEquals(wxMessage.getLocationX(), 23.134521d);
174-
assertEquals(wxMessage.getLocationY(), 113.358803d);
175-
assertEquals(wxMessage.getScale(), 20d);
173+
assertEquals(wxMessage.getLocationX().doubleValue(), 23.134521d);
174+
assertEquals(wxMessage.getLocationY().doubleValue(), 113.358803d);
175+
assertEquals(wxMessage.getScale().doubleValue(), 20d);
176176
assertEquals(wxMessage.getLabel(), "位置信息");
177177
assertEquals(wxMessage.getDescription(), "公众平台官网链接");
178178
assertEquals(wxMessage.getUrl(), "url");
179179
assertEquals(wxMessage.getTitle(), "公众平台官网链接");
180180
assertEquals(wxMessage.getEvent(), "subscribe");
181181
assertEquals(wxMessage.getEventKey(), "qrscene_123123");
182182
assertEquals(wxMessage.getTicket(), "TICKET");
183-
assertEquals(wxMessage.getLatitude(), 23.137466);
184-
assertEquals(wxMessage.getLongitude(), 113.352425);
185-
assertEquals(wxMessage.getPrecision(), 119.385040);
183+
assertEquals(wxMessage.getLatitude().doubleValue(), 23.137466);
184+
assertEquals(wxMessage.getLongitude().doubleValue(), 113.352425);
185+
assertEquals(wxMessage.getPrecision().doubleValue(), 119.385040);
186186
assertEquals(wxMessage.getScanCodeInfo().getScanType(), "qrcode");
187187
assertEquals(wxMessage.getScanCodeInfo().getScanResult(), "1");
188188
assertEquals(wxMessage.getSendPicsInfo().getCount(), new Long(1L));

‎weixin-java-pay/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
<dependency>
3939
<groupId>commons-beanutils</groupId>
4040
<artifactId>commons-beanutils</artifactId>
41-
<version>1.9.3</version>
41+
<version>1.9.4</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>org.bouncycastle</groupId>
4545
<artifactId>bcpkix-jdk15on</artifactId>
46-
<version>1.59</version>
46+
<version>1.65</version>
4747
</dependency>
4848

4949
<dependency>

0 commit comments

Comments
 (0)