From 96f65a379c05f261bbc57f8d9998614a536b5881 Mon Sep 17 00:00:00 2001
From: oldwu <2676831402@qq.com>
Date: Fri, 8 Dec 2023 08:58:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=8E=9F=E7=A5=9E?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E9=97=AE=E9=A2=98=20Closes=20#105?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../miyoushe/sign/gs/GenShinSignMiHoYo.java   | 23 ++++++++++++-------
 .../com/miyoushe/sign/gs/MiHoYoConfig.java    | 10 ++++----
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/miyoushe/sign/gs/GenShinSignMiHoYo.java b/src/main/java/com/miyoushe/sign/gs/GenShinSignMiHoYo.java
index e8a05a31..595f7170 100644
--- a/src/main/java/com/miyoushe/sign/gs/GenShinSignMiHoYo.java
+++ b/src/main/java/com/miyoushe/sign/gs/GenShinSignMiHoYo.java
@@ -7,14 +7,12 @@
 import com.miyoushe.sign.constant.MihayouConstants;
 import com.miyoushe.sign.gs.pojo.Award;
 import com.miyoushe.util.HttpUtils;
+import org.apache.http.Header;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Author ponking
@@ -37,6 +35,19 @@ public void setUid(String uid) {
         this.uid = uid;
     }
 
+    @Override
+    public Header[] getHeaders(String dsType) {
+        return new HeaderBuilder.Builder().addAll(getBasicHeaders())
+                .add("x-rpc-device_id", UUID.randomUUID().toString().replace("-", "").toUpperCase())
+                .add("Content-Type", "application/json;charset=UTF-8")
+                .add("x-rpc-client_type", getClientType())
+                .add("x-rpc-app_version", getAppVersion())
+                .add("x-rpc-signgame", "hk4e")
+                .add("Origin", MiHoYoConfig.NEW_SIGN_ORIGIN)
+                .add("Referer", MiHoYoConfig.NEW_SIGN_ORIGIN)
+                .add("DS", getDS()).build();
+    }
+
     @Override
     public List<Map<String, Object>> doSign() {
         List<Map<String, Object>> uid = getUid();
@@ -141,10 +152,6 @@ public List<Map<String, Object>> getUid() {
      * @return
      */
     public Award getAwardInfo(int day) {
-        Map<String, String> data = new HashMap<>();
-
-        data.put("act_id", MiHoYoConfig.ACT_ID);
-        data.put("region", MiHoYoConfig.REGION);
 
         JSONObject awardResult = HttpUtils.doGet(MiHoYoConfig.AWARD_URL, getHeaders(""));
         JSONArray jsonArray = awardResult.getJSONObject("data").getJSONArray("awards");
diff --git a/src/main/java/com/miyoushe/sign/gs/MiHoYoConfig.java b/src/main/java/com/miyoushe/sign/gs/MiHoYoConfig.java
index 3f52ccdc..069c4e39 100644
--- a/src/main/java/com/miyoushe/sign/gs/MiHoYoConfig.java
+++ b/src/main/java/com/miyoushe/sign/gs/MiHoYoConfig.java
@@ -10,10 +10,12 @@ public class MiHoYoConfig {
     /**
      * genshin
      **/
-    public static final String ACT_ID = "e202009291139501"; // 切勿乱修改
+    public static final String ACT_ID = "e202311201442471"; // 切勿乱修改
 
     public static final String APP_VERSION = "2.3.0"; // 切勿乱修改
 
+    public static final String NEW_SIGN_ORIGIN = "https://act.mihoyo.com/";
+
     /**
      * Android 2
      */
@@ -27,13 +29,13 @@ public class MiHoYoConfig {
 
     public static final String REFERER_URL = String.format("https://webstatic.mihoyo.com/bbs/event/signin-ys/index.html?bbs_auth_required=%s&act_id=%s&utm_source=%s&utm_medium=%s&utm_campaign=%s", true, ACT_ID, "bbs", "mys", "icon");
 
-    public static final String AWARD_URL = String.format("https://api-takumi.mihoyo.com/event/bbs_sign_reward/home?act_id=%s", ACT_ID);
+    public static final String AWARD_URL = String.format("https://api-takumi.mihoyo.com/event/luna/home?act_id=%s", ACT_ID);
 
     public static final String ROLE_URL = String.format("https://api-takumi.mihoyo.com/binding/api/getUserGameRolesByCookie?game_biz=%s", "hk4e_cn");
 
-    public static final String INFO_URL = "https://api-takumi.mihoyo.com/event/bbs_sign_reward/info";
+    public static final String INFO_URL = "https://api-takumi.mihoyo.com/event/luna/info";
 
-    public static final String SIGN_URL = "https://api-takumi.mihoyo.com/event/bbs_sign_reward/sign";
+    public static final String SIGN_URL = "https://api-takumi.mihoyo.com/event/luna/sign";
 
     public static final String USER_AGENT = String.format("Mozilla/5.0 (iPhone; CPU iPhone OS 14_0_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/%s", APP_VERSION);