Fix the api & help to prevent captcha

zvyap · Aug 31, 2023 · 6bb0978 · 6bb0978
1 parent 531671f
commit 6bb0978
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/src/main/java/com/zvyap/hoyoapi/response/HoyoDailyCheckInInfoResponse.java b/src/main/java/com/zvyap/hoyoapi/response/HoyoDailyCheckInInfoResponse.java
@@ -47,15 +47,22 @@ public static class Data{
 		@JsonProperty("first_bind")
 		private boolean isFirstBind;
 
-		public boolean isSub(){
+		@JsonProperty("month_last_day")
+		private boolean isMonthLastDay;
+
+		public boolean isMonthLastDay() {
+			return isMonthLastDay;
+		}
+
+		public boolean isSub() {
 			return isSub;
 		}
 
-		public String getToday(){
+		public String getToday() {
 			return today;
 		}
 
-		public int getShortSignDay(){
+		public int getShortSignDay() {
 			return shortSignDay;
 		}
 
@@ -82,15 +89,16 @@ public int getTotalSignDay(){
 		@Override
 		 public String toString(){
 			return
-				"Data{" +
-				"is_sub = '" + isSub + '\'' +
-				",today = '" + today + '\'' +
-				",short_sign_day = '" + shortSignDay + '\'' +
-				",sign_cnt_missed = '" + signCntMissed + '\'' +
-				",region = '" + region + '\'' +
-				",is_sign = '" + isSign + '\'' +
-				",total_sign_day = '" + totalSignDay + '\'' +
-				"}";
+					"Data{" +
+							"is_sub = '" + isSub + '\'' +
+							",today = '" + today + '\'' +
+							",short_sign_day = '" + shortSignDay + '\'' +
+							",sign_cnt_missed = '" + signCntMissed + '\'' +
+							",region = '" + region + '\'' +
+							",is_sign = '" + isSign + '\'' +
+							",total_sign_day = '" + totalSignDay + '\'' +
+							",month_last_day = '" + isMonthLastDay + '\'' +
+							"}";
 			}
 	}
 }
diff --git a/src/main/java/com/zvyap/hoyoapi/response/HoyoDailyCheckInSignResponse.java b/src/main/java/com/zvyap/hoyoapi/response/HoyoDailyCheckInSignResponse.java
@@ -12,16 +12,20 @@ public Data getData(){
 	}
 
 	@Override
- 	public String toString(){
-		return 
-			"HoyoDailyCheckInSignResponse{" + 
-			"data = '" + data + '\'' + 
-			",message = '" + message + '\'' + 
-			",retcode = '" + retcode + '\'' + 
-			"}";
-		}
+	public String toString() {
+		return
+				"HoyoDailyCheckInSignResponse{" +
+						"data = '" + data + '\'' +
+						",message = '" + message + '\'' +
+						",retcode = '" + retcode + '\'' +
+						"}";
+	}
+
+	public boolean isCaptcha() {
+		return isSuccess() ? getData().isRisk() : false;
+	}
 
-	public static class Data{
+	public static class Data {
 
 		@JsonProperty("gt_result")
 		private GtResult gtResult;

diff --git a/src/main/java/com/zvyap/hoyoapi/util/JsonUtils.java b/src/main/java/com/zvyap/hoyoapi/util/JsonUtils.java
@@ -1,6 +1,7 @@
 package com.zvyap.hoyoapi.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -9,6 +10,10 @@
 public class JsonUtils {
     public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
+    static {
+        OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
     @NotNull
     public static ObjectMapper getObjectMapper() {
         return OBJECT_MAPPER;