From 6a8017f376cff8037f9d48fc7d1e21b49e1f0d95 Mon Sep 17 00:00:00 2001
From: amizing25 <85472093+amizing25@users.noreply.github.com>
Date: Fri, 29 Nov 2024 12:31:53 +0700
Subject: [PATCH] fix: Fixed account error when login

---
 README.md                                     | 12 ++++--------
 sdk_server/controllers/dispatch_controller.py | 18 ++++++++----------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 900e511..369507f 100644
--- a/README.md
+++ b/README.md
@@ -44,12 +44,6 @@ Download resources & proto from [MikuBH3-Res](https://github.com/MikuLeaks/MikuB
 - Extract the `Proxy.zip` file anywhere you want.
 - Run `Sparkle-Proxy.exe` as administrator and open the game.
 
-## Connecting with the client (DLL method)
-
-- Download prebuild patch from [BH3-Patch](https://github.com/MikuLeaks/MikuBH3-PATCH/releases)
-- Extract the `BH3-Patch-Win64.zip` file into your game folder, where the game’s main executable (`BH3.exe`) is located.
-- Run `bh3-launcher.exe` as administrator.
-
 ## Usage/Examples
 
 To run the project use cmd or vscode and run
@@ -57,17 +51,19 @@ To run the project use cmd or vscode and run
 ```python
 py hi3
 ```
+
 ## Changing Stage in Abyss/Memorial Using JSON
 
 - **Superstring Dimension (Abyss)**
 
-    Open the `Battle.json` file and update `area1` to the preferred `SiteID` from `UltraEndlessSite.json`.
+  Open the `Battle.json` file and update `area1` to the preferred `SiteID` from `UltraEndlessSite.json`.
 
 - **Memorial Arena**
 
-    Open the `Battle.json` file and update the `boss_ids` as needed. You can find `boss_id` values in the `BossIdList` within `ExBossMonsterSchedule.json`.
+  Open the `Battle.json` file and update the `boss_ids` as needed. You can find `boss_id` values in the `BossIdList` within `ExBossMonsterSchedule.json`.
 
 ## Commands
+
 ```
 /help. Displays a list of available commands.
 /maxskill {avatar_id | all}. Maximize the skills of a specific avatar. Use 'all' to maximize the skills of all avatars.
diff --git a/sdk_server/controllers/dispatch_controller.py b/sdk_server/controllers/dispatch_controller.py
index 02d4279..31c3fa6 100644
--- a/sdk_server/controllers/dispatch_controller.py
+++ b/sdk_server/controllers/dispatch_controller.py
@@ -16,10 +16,9 @@ def query_dispatch():
         "region_list": [
             {
                 "retcode": 0,
-                "dispatch_url": f"http://{Config.GameServer.IP}/query_gateway",
+                "dispatch_url": f"http://{Config.SDKServer.IP}:{Config.SDKServer.Port}/query_gateway",
                 "name": Config.RegionName,
-                "title": "",
-                "ext": get_ext(version),
+                "title": ""
             }
         ],
     }
@@ -39,25 +38,24 @@ def query_gateway():
     server = {"ip": Config.GameServer.IP, "port": Config.GameServer.Port}
 
     response_data = {
-        "account_url": f"http://{Config.GameServer.IP}/account",
-        "account_url_backup": f"http://{Config.GameServer.IP}/account",
+        "account_url": f"http://{Config.SDKServer.IP}:{Config.SDKServer.Port}/account",
+        "account_url_backup": f"http://{Config.SDKServer.IP}:{Config.SDKServer.Port}/account",
         "asset_bundle_url_list": get_asset_bundle_url_list(version),
         # "ex_audio_and_video_url_list": get_ex_audio_and_video_url_list(version),
         "ex_resource_url_list": get_ex_resource_url_list(version),
-        # TODO: Revisit this
         "ext": Config.get_hotpatch_ext(version),
         "gameserver": server,
         "gateway": server,
         "is_data_ready": True,
         "manifest": Config.get_hotpatch_manifest(version),
         "msg": "",
-        "oaserver_url": f"http://{Config.GameServer.IP}/oaserver",
+        "oaserver_url": f"http://{Config.SDKServer.IP}:{Config.SDKServer.Port}/oaserver",
         "region_name": Config.RegionName,
         "retcode": 0,
         "server_cur_time": int(time.time()),
         "server_cur_timezone": 8,
         "server_ext": {
-            "cdkey_url": "http://127.0.0.1/common/",
+            "cdkey_url": f"http://{Config.SDKServer.IP}:{Config.SDKServer.Port}/common/",
             "is_official": "1",
             "mihoyo_sdk_env": "0",
             "use_account_web_url": "1",
@@ -217,6 +215,6 @@ def get_ex_resource_url_list(version):
 
 def get_local_url_list(type, version):
     return [
-        f"http://{Config.GameServer.IP}/statics/{type}/{version.replace('.', '_')}",
-        f"http://{Config.GameServer.IP}/statics/{type}/{version.replace('.', '_')}",
+        f"http://{Config.SDKServer.IP}:{Config.SDKServer.Port}/statics/{type}/{version.replace('.', '_')}",
+        f"http://{Config.SDKServer.IP}:{Config.SDKServer.Port}/statics/{type}/{version.replace('.', '_')}",
     ]