From 111679505a65540f62d41ba287a0bceaff9dc59f Mon Sep 17 00:00:00 2001 From: Harold Date: Tue, 1 Oct 2024 13:24:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=8B=E8=BD=BD=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=20(#464)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- init.sh | 8 ++++---- scripts/downloadPg.sh | 4 ++-- scripts/downloadZx.sh | 4 ++-- scripts/index.sh | 2 +- scripts/init.sh | 2 +- scripts/movie.sh | 2 +- .../java/cn/har01d/alist_tvbox/service/DoubanService.java | 2 +- .../java/cn/har01d/alist_tvbox/service/IndexService.java | 2 +- .../java/cn/har01d/alist_tvbox/web/PgTokenController.java | 2 +- .../cn/har01d/alist_tvbox/web/ZxConfigController.java | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/init.sh b/init.sh index 2c3c11d9bc..e5abb35f28 100755 --- a/init.sh +++ b/init.sh @@ -54,7 +54,7 @@ init() { wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" -T 30 -t 2 http://docker.xiaoya.pro/update/tvbox.zip -O tvbox.zip || \ wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" --header="Host:docker.xiaoya.pro" -T 30 -t 2 http://104.21.17.247/update/tvbox.zip -O tvbox.zip || \ wget -T 30 -t 2 https://github.com/xiaoyaliu00/data/raw/main/tvbox.zip -O tvbox.zip || \ - wget -T 30 -t 2 http://data.har01d.cn/tvbox.zip -O tvbox.zip || \ + wget -T 30 -t 2 http://104.160.46.225/tvbox.zip -O tvbox.zip || \ cp /tvbox.zip ./ unzip -q -o tvbox.zip @@ -108,12 +108,12 @@ cd /tmp/ wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" -T 10 -t 2 -q http://docker.xiaoya.pro/version.txt -O version.txt || \ wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" --header="Host:docker.xiaoya.pro" -T 10 -t 2 -q http://104.21.17.247/version.txt -O version.txt || \ -wget -T 10 -t 2 http://data.har01d.cn/version.txt -O version.txt +wget -T 10 -t 2 http://104.160.46.225/version.txt -O version.txt wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" -T 30 -t 2 http://docker.xiaoya.pro/update/update.zip -O update.zip || \ wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" --header="Host:docker.xiaoya.pro" -T 30 -t 2 http://104.21.17.247/update/update.zip -O update.zip || \ wget -T 30 -t 2 https://github.com/xiaoyaliu00/data/raw/main/update.zip -O update.zip || \ -wget -T 30 -t 2 http://data.har01d.cn/update.zip -O update.zip +wget -T 30 -t 2 http://104.160.46.225/update.zip -O update.zip if [ ! -f update.zip ]; then echo "Failed to download update database file, the database upgrade process has aborted" @@ -160,7 +160,7 @@ else elif [ "$remote" = "$latest" ]; then wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" -T 30 -t 2 http://docker.xiaoya.pro/update/index.zip -O index.zip || \ wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" --header="Host:docker.xiaoya.pro" -T 40 -t 2 http://104.21.17.247/update/index.zip -O index.zip || \ - wget -T 40 -t 2 http://data.har01d.cn/index.zip -O index.zip + wget -T 40 -t 2 http://104.160.46.225/index.zip -O index.zip if [ ! -f index.zip ]; then echo "Failed to download index compressed file, the index file upgrade process has aborted" diff --git a/scripts/downloadPg.sh b/scripts/downloadPg.sh index 924e24313c..f3c22eea92 100755 --- a/scripts/downloadPg.sh +++ b/scripts/downloadPg.sh @@ -9,7 +9,7 @@ else cp /pg.zip /data/ fi -REMOTE=$(curl -s https://gitlab.com/power0721/pg/-/raw/main/pg.version) +REMOTE=$(curl -s http://104.160.46.225/pg.version) echo "local PG: ${LOCAL}, remote PG: ${REMOTE}" if [ "$LOCAL" = "${REMOTE}" ]; then @@ -19,7 +19,7 @@ if [ "$LOCAL" = "${REMOTE}" ]; then fi echo "download ${REMOTE}" && \ -wget https://gitlab.com/power0721/pg/-/raw/main/pg.zip -O /data/pg.zip && \ +wget http://104.160.46.225/pg.zip -O /data/pg.zip && \ echo "unzip file" && \ rm -rf /www/pg/* && unzip -q -o /data/pg.zip -d /www/pg && \ echo "save version" && \ diff --git a/scripts/downloadZx.sh b/scripts/downloadZx.sh index 6a1573ec77..521eed70dc 100755 --- a/scripts/downloadZx.sh +++ b/scripts/downloadZx.sh @@ -9,7 +9,7 @@ else cp /zx.zip /data/ fi -REMOTE=$(curl -s https://gitlab.com/power0721/pg/-/raw/main/zx.version) +REMOTE=$(curl -s http://104.160.46.225/zx.version) echo "local zx: ${LOCAL}, remote zx: ${REMOTE}" if [ "$LOCAL" = "${REMOTE}" ]; then @@ -19,7 +19,7 @@ if [ "$LOCAL" = "${REMOTE}" ]; then fi echo "download ${REMOTE}" && \ -wget https://gitlab.com/power0721/pg/-/raw/main/heart.zip -O /data/zx.zip && \ +wget http://104.160.46.225/zx.zip -O /data/zx.zip && \ echo "unzip file" && \ rm -rf /www/zx/* && unzip -q -o /data/zx.zip -d /www/zx && \ echo "save version" && \ diff --git a/scripts/index.sh b/scripts/index.sh index 93f49ab606..2d6e6e57ee 100755 --- a/scripts/index.sh +++ b/scripts/index.sh @@ -2,7 +2,7 @@ if [ $# -gt 0 ]; then remote=$1 wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" -T 30 -t 2 http://docker.xiaoya.pro/update/index.zip || \ wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" --header="Host:docker.xiaoya.pro" -T 40 -t 2 http://104.21.17.247/update/index.zip -O index.zip || \ - wget -T 40 -t 2 http://data.har01d.cn/index.zip -O index.zip + wget -T 40 -t 2 http://104.160.46.225/index.zip -O index.zip if [ ! -f index.zip ]; then echo "Failed to download index compressed file, the index file upgrade process has aborted" exit 1 diff --git a/scripts/init.sh b/scripts/init.sh index 08fb519dda..e014792c88 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -34,7 +34,7 @@ init() { wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" -T 30 -t 2 http://docker.xiaoya.pro/update/tvbox.zip -O tvbox.zip || wget --user-agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppelWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36" --header="Host:docker.xiaoya.pro" -T 30 -t 2 http://104.21.17.247/update/tvbox.zip -O tvbox.zip || \ wget -T 30 -t 2 https://github.com/xiaoyaliu00/data/raw/main/tvbox.zip -O tvbox.zip || \ - wget -T 30 -t 2 http://data.har01d.cn/tvbox.zip -O tvbox.zip || \ + wget -T 30 -t 2 http://104.160.46.225/tvbox.zip -O tvbox.zip || \ cp /tvbox.zip ./ unzip -q -o tvbox.zip diff --git a/scripts/movie.sh b/scripts/movie.sh index b1388482d7..bc0964f566 100755 --- a/scripts/movie.sh +++ b/scripts/movie.sh @@ -9,7 +9,7 @@ if [ "$LOCAL" = "$1" ]; then fi echo "download diff.zip" && \ -wget http://data.har01d.cn/diff.zip -O diff.zip && \ +wget http://104.160.46.225/diff.zip -O diff.zip && \ unzip -q -o diff.zip -d /data/atv/ && \ cat /data/atv/movie_version && \ rm -f /tmp/diff.zip diff --git a/src/main/java/cn/har01d/alist_tvbox/service/DoubanService.java b/src/main/java/cn/har01d/alist_tvbox/service/DoubanService.java index bc90cdf33e..db6e14050c 100644 --- a/src/main/java/cn/har01d/alist_tvbox/service/DoubanService.java +++ b/src/main/java/cn/har01d/alist_tvbox/service/DoubanService.java @@ -217,7 +217,7 @@ public String getRemoteVersion(Versions versions) { } try { - String remote = restTemplate.getForObject("http://data.har01d.cn/movie_version", String.class).trim(); + String remote = restTemplate.getForObject("http://104.160.46.225/movie_version", String.class).trim(); versions.setMovie(remote); String local = settingRepository.findById(MOVIE_VERSION).map(Setting::getValue).orElse("0.0").trim(); String cached = getCachedVersion(); diff --git a/src/main/java/cn/har01d/alist_tvbox/service/IndexService.java b/src/main/java/cn/har01d/alist_tvbox/service/IndexService.java index 2cf38680af..b076da8e6b 100644 --- a/src/main/java/cn/har01d/alist_tvbox/service/IndexService.java +++ b/src/main/java/cn/har01d/alist_tvbox/service/IndexService.java @@ -201,7 +201,7 @@ private String getVersion() { try { remote = restTemplate.getForObject("http://docker.xiaoya.pro/version.txt", String.class); } catch (ResourceAccessException e) { - remote = restTemplate.getForObject("http://data.har01d.cn/version.txt", String.class); + remote = restTemplate.getForObject("http://104.160.46.225/version.txt", String.class); } return Utils.trim(remote); } diff --git a/src/main/java/cn/har01d/alist_tvbox/web/PgTokenController.java b/src/main/java/cn/har01d/alist_tvbox/web/PgTokenController.java index 9c65a5d1da..b79073f490 100644 --- a/src/main/java/cn/har01d/alist_tvbox/web/PgTokenController.java +++ b/src/main/java/cn/har01d/alist_tvbox/web/PgTokenController.java @@ -47,7 +47,7 @@ public PgTokenController(SubscriptionService subscriptionService, @GetMapping("/version") public Object version() throws IOException { - String remote = restTemplate.getForObject("https://gitlab.com/power0721/pg/-/raw/main/pg.version", String.class); + String remote = restTemplate.getForObject("http://104.160.46.225/pg.version", String.class); String local = ""; Path path = Path.of("/data/pg_version.txt"); if (Files.exists(path)) { diff --git a/src/main/java/cn/har01d/alist_tvbox/web/ZxConfigController.java b/src/main/java/cn/har01d/alist_tvbox/web/ZxConfigController.java index d65238ed15..8e7a8ee54d 100644 --- a/src/main/java/cn/har01d/alist_tvbox/web/ZxConfigController.java +++ b/src/main/java/cn/har01d/alist_tvbox/web/ZxConfigController.java @@ -48,7 +48,7 @@ public ZxConfigController(SubscriptionService subscriptionService, @GetMapping("/version") public Object version() throws IOException { - String remote = restTemplate.getForObject("https://gitlab.com/power0721/pg/-/raw/main/zx.version", String.class); + String remote = restTemplate.getForObject("http://104.160.46.225/zx.version", String.class); String local = ""; Path path = Path.of("/data/zx_version.txt"); if (Files.exists(path)) {