Skip to content

weixin-java-pay remove dependency: joda-time #2034

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binarywang merged 1 commit into from
Mar 10, 2021
Merged

weixin-java-pay remove dependency: joda-time #2034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions weixin-java-mp/src/test/java/me/chanjar/weixin/mp/api/impl/WxMpKefuServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package me.chanjar.weixin.mp.api.impl;

import java.io.File;
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.Date;

import org.joda.time.DateTime;
import org.testng.annotations.*;

import com.google.inject.Inject;
Expand Down Expand Up @@ -169,17 +170,23 @@ public void testKfSessionGetWaitCase() throws WxErrorException {

@Test
public void testKfMsgList() throws WxErrorException {
Date startTime = DateTime.now().minusDays(1).toDate();
Date endTime = DateTime.now().minusDays(0).toDate();
// Date startTime = DateTime.now().minusDays(1).toDate();
// Date endTime = DateTime.now().minusDays(0).toDate();
Date startTime = Date.from(Instant.now().minus(1, ChronoUnit.DAYS));
Date endTime = Date.from(Instant.now());

WxMpKfMsgList result = this.wxService.getKefuService().kfMsgList(startTime, endTime, 1L, 50);
assertThat(result).isNotNull();
System.err.println(result);
}

@Test
public void testKfMsgListAll() throws WxErrorException {
Date startTime = DateTime.now().minusDays(1).toDate();
Date endTime = DateTime.now().minusDays(0).toDate();
// Date startTime = DateTime.now().minusDays(1).toDate();
// Date endTime = DateTime.now().minusDays(0).toDate();
Date startTime = Date.from(Instant.now().minus(1, ChronoUnit.DAYS));
Date endTime = Date.from(Instant.now());

WxMpKfMsgList result = this.wxService.getKefuService().kfMsgList(startTime, endTime);
assertThat(result).isNotNull();
System.err.println(result);
Expand Down
5 changes: 0 additions & 5 deletions weixin-java-pay/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

<profiles>
Expand Down
6 changes: 3 additions & 3 deletions ...pay/src/main/java/com/github/binarywang/wxpay/v3/auth/AutoUpdateCertificatesVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.util.EntityUtils;
import org.joda.time.Instant;
import org.joda.time.Minutes;
import java.time.Instant;
import java.time.temporal.ChronoUnit;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down Expand Up @@ -110,7 +110,7 @@ public boolean verify(String serialNumber, byte[] message, String signature) {
* 检查证书是否在有效期内，如果不在有效期内则进行更新
*/
private void checkAndAutoUpdateCert() {
if (instant == null || Minutes.minutesBetween(instant, Instant.now()).getMinutes() >= minutesInterval) {
if (instant == null || instant.plus(minutesInterval, ChronoUnit.MINUTES).compareTo(Instant.now()) >= 0) {
if (lock.tryLock()) {
try {
autoUpdateCert();
Expand Down