From 378d18a9a3392197cdcdfc1a1825592366a39769 Mon Sep 17 00:00:00 2001
From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Date: Tue, 21 Apr 2026 23:41:44 +0800
Subject: [PATCH] Fix: spare domain of git-over-cdn

---
 deploy/git.py                 |  7 +++--
 deploy/git_over_cdn/client.py | 50 ++++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/deploy/git.py b/deploy/git.py
index 669870a7c..45e1bd2f3 100644
--- a/deploy/git.py
+++ b/deploy/git.py
@@ -71,7 +71,10 @@ class GitManager(DeployConfig):
     @property
     def goc_client(self):
         client = GitOverCdnClient(
-            url='https://vip.123pan.cn/1818706573/pack/LmeSzinc_AzurLaneAutoScript_master',
+            url=[
+                'https://vip.123pan.cn/1818706573/pack/LmeSzinc_AzurLaneAutoScript_master',
+                'https://1818706573.v.123yx.com/1818706573/pack/LmeSzinc_AzurLaneAutoScript_master',
+            ],
             folder=self.root_filepath,
             source='origin',
             branch='master',
@@ -102,4 +105,4 @@ class GitManager(DeployConfig):
 
 if __name__ == '__main__':
     self = GitManager()
-    self.goc_client.get_status()
\ No newline at end of file
+    self.goc_client.get_status()
diff --git a/deploy/git_over_cdn/client.py b/deploy/git_over_cdn/client.py
index a8fb5b5d2..4aa6d9258 100644
--- a/deploy/git_over_cdn/client.py
+++ b/deploy/git_over_cdn/client.py
@@ -52,10 +52,14 @@ class GitOverCdnClient:
     def __init__(self, url, folder, source='origin', branch='master', git='git'):
         """
         Args:
-            url: http://127.0.0.1:22251/pack/LmeSzinc_AzurLaneAutoScript_master/
+            url (str | list[str]): http://127.0.0.1:22251/pack/LmeSzinc_AzurLaneAutoScript_master/
             folder: D:/AzurLaneAutoScript
         """
-        self.url = url.strip('/')
+        if isinstance(url, str):
+            self.urls = [url.strip('/')]
+        else:
+            self.urls = [u.strip('/') for u in url]
+        self.url = self.urls[0]
         self.folder = folder.replace('\\', '/')
         self.source = source
         self.branch = branch
@@ -100,29 +104,31 @@ class GitOverCdnClient:
 
     @cached_property
     def latest_commit(self) -> str:
-        try:
+        for url_base in self.urls:
+            self.url = url_base
             url = self.urlpath('/latest.json')
             self.logger.info(f'Fetch url: {url}')
-            resp = self.session.get(url, timeout=3)
-        except Exception as e:
-            self.logger.error(f'Failed to get remote commit: {e}')
-            return ''
-
-        if resp.status_code == 200:
             try:
-                info = json.loads(resp.text)
-                commit = info['commit']
-                self.logger.attr('LatestCommit', commit)
-                return commit
-            except json.JSONDecodeError:
-                self.logger.error(f'Failed to get remote commit, response is not a json: {resp.text}')
-                return ''
-            except KeyError:
-                self.logger.error(f'Failed to get remote commit, key "commit" is not found: {resp.text}')
-                return ''
-        else:
-            self.logger.error(f'Failed to get remote commit, status={resp.status_code}, text={resp.text}')
-            return ''
+                resp = self.session.get(url, timeout=3)
+            except Exception as e:
+                self.logger.error(f'Failed to get remote commit: {e}')
+                continue
+
+            if resp.status_code == 200:
+                try:
+                    info = json.loads(resp.text)
+                    commit = info['commit']
+                    self.logger.attr('LatestCommit', commit)
+                    return commit
+                except json.JSONDecodeError:
+                    self.logger.error(f'Failed to get remote commit, response is not a json: {resp.text}')
+                except KeyError:
+                    self.logger.error(f'Failed to get remote commit, key "commit" is not found: {resp.text}')
+            else:
+                self.logger.error(f'Failed to get remote commit, status={resp.status_code}, text={resp.text}')
+
+        self.url = self.urls[0]
+        return ''
 
     def download_pack(self):
         try: