jackson 新的支持

PBH-BTN · Oct 7, 2024 · 284f96c · 284f96c
1 parent 8217ed8
commit 284f96c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -224,6 +224,25 @@
             <artifactId>methanol</artifactId>
             <version>1.7.0</version>
         </dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310 -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jsr310</artifactId>
+			<version>2.18.0</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jdk8 -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-jdk8</artifactId>
+			<version>2.18.0</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-guava -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.datatype</groupId>
+			<artifactId>jackson-datatype-guava</artifactId>
+			<version>2.18.0</version>
+		</dependency>
+
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>

diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/analyse/AnalyseService.java b/src/main/java/com/ghostchu/btn/sparkle/module/analyse/AnalyseService.java
@@ -60,7 +60,7 @@ public class AnalyseService {
     @Scheduled(fixedDelayString = "${analyse.overdownload.interval}")
     public void cronUntrustedIPAddresses() {
         var list = ipMerger.merge(banHistoryRepository
-                        .generateUntrustedIPAddresses(TimeUtil.toUTC(System.currentTimeMillis() - untrustedIpAddressGenerateOffset), new Timestamp(System.currentTimeMillis()), untrustedIpAddressGenerateThreshold)
+                        .generateUntrustedIPAddresses(TimeUtil.toUTC(System.currentTimeMillis() - untrustedIpAddressGenerateOffset), OffsetDateTime.now(), untrustedIpAddressGenerateThreshold)
                 .stream()
                 .map(IPUtil::toString)
                         .collect(Collectors.toList()))

diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/githuboauth/OAuthController.java b/src/main/java/com/ghostchu/btn/sparkle/module/githuboauth/OAuthController.java
@@ -27,7 +27,7 @@
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.io.IOException;
-import java.sql.Timestamp;
+import java.time.OffsetDateTime;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.UUID;
@@ -127,15 +127,15 @@ private void userLogin(GithubUserProfile profile, String emailSelected) {
         } else {
             user = new User();
             user.setEmail(emailSelected);
-            user.setRegisterAt(new Timestamp(System.currentTimeMillis()));
+            user.setRegisterAt(OffsetDateTime.now());
             user.setRandomGroup(ThreadLocalRandom.current().nextInt(9));
         }
         user.setGithubLogin(profile.getLogin());
         user.setGithubUserId(profile.getId());
         user.setAvatar(profile.getAvatarUrl());
         user.setNickname(profile.getName() == null ? profile.getLogin() : profile.getName());
-        user.setLastSeenAt(new Timestamp(System.currentTimeMillis()));
-        user.setLastAccessAt(new Timestamp(System.currentTimeMillis()));
+        user.setLastSeenAt(OffsetDateTime.now());
+        user.setLastAccessAt(OffsetDateTime.now());
         user.setBanned(false);
         user = userService.saveUser(user);
         if (user.getId() <= 0) {