From 4fb2712a8961c42951a76f78f1f7751b77679079 Mon Sep 17 00:00:00 2001 From: HongchengQ <121159914+HongchengQ@users.noreply.github.com> Date: Sat, 13 Dec 2025 22:46:34 +0800 Subject: [PATCH] Fix Android-CN -1 error --- .../nebula/server/routes/UserLoginHandler.java | 5 +++++ .../routes/entity/ChinaUserLoginEntity.java | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/emu/nebula/server/routes/UserLoginHandler.java b/src/main/java/emu/nebula/server/routes/UserLoginHandler.java index f8442a9..98939ff 100644 --- a/src/main/java/emu/nebula/server/routes/UserLoginHandler.java +++ b/src/main/java/emu/nebula/server/routes/UserLoginHandler.java @@ -71,6 +71,8 @@ public class UserLoginHandler implements Handler { response.Data.Yostar = new ChinaUserLoginEntity.LoginYostarJson(); response.Data.Identity = new ChinaUserLoginEntity.IdentityJson(); response.Data.TaptapProfile = null; + response.Data.Destroy = new ChinaUserLoginEntity.DestroyJson(); + response.Data.YostarDestroy = new ChinaUserLoginEntity.YostarDestroyJson(); response.Data.User.ID = Long.parseLong(account.getUid()); response.Data.User.PID = "NEBULA"; @@ -94,6 +96,9 @@ public class UserLoginHandler implements Handler { response.Data.Identity.BirthDate = ""; response.Data.Identity.State = 1; + response.Data.Destroy.DestroyAt = 0; + response.Data.YostarDestroy.DestroyAt = 0; + var key = new ChinaUserLoginEntity.UserKeyJson(); key.Type = "mobile"; key.NickName = account.getEmail(); diff --git a/src/main/java/emu/nebula/server/routes/entity/ChinaUserLoginEntity.java b/src/main/java/emu/nebula/server/routes/entity/ChinaUserLoginEntity.java index d871dd2..81f20d7 100644 --- a/src/main/java/emu/nebula/server/routes/entity/ChinaUserLoginEntity.java +++ b/src/main/java/emu/nebula/server/routes/entity/ChinaUserLoginEntity.java @@ -6,11 +6,8 @@ public class ChinaUserLoginEntity { public int Code; public UserDetailJson Data; public String Msg; - - public static class UserDetailJson { - public Object Destroy; - public Object YostarDestroy; + public static class UserDetailJson { public boolean IsNew; public boolean IsTestAccount; public List Keys; @@ -18,6 +15,8 @@ public class ChinaUserLoginEntity { public LoginYostarJson Yostar; public Object TaptapProfile; public IdentityJson Identity; + public DestroyJson Destroy; + public YostarDestroyJson YostarDestroy; } public static class UserJson { @@ -28,7 +27,7 @@ public class ChinaUserLoginEntity { public String RegChannel; public int DestroyState; } - + public static class UserKeyJson { public String Type; public String NickName; @@ -53,4 +52,12 @@ public class ChinaUserLoginEntity { public String BirthDate; public int State; } + + public static class DestroyJson { + public int DestroyAt; + } + + public static class YostarDestroyJson { + public int DestroyAt; + } }