fixed53: CardAuth源码化(hub启动+license-config路由+tvbox公告字段+HubNotice弹窗+middleware限流)
This commit is contained in:
1 parent
b48a526935
commit
a8e61ff75e
5 files changed
+47
-8
No files matched your search
@@ -0,0 +1 @@
|
||||
sha256:dbb7d866a1c1f4cfd4c427cda65634c956cf391fb0144a8e667c08fedc9717dc
|
||||
@@ -3,7 +3,7 @@ version: '3.8'
|
||||
services:
|
||||
# KatelyaTV 应用服务
|
||||
katelyatv:
|
||||
image: katelyatv:fixed44
|
||||
image: katelyatv:fixed53
|
||||
container_name: katelyatv
|
||||
ports:
|
||||
- "3030:3000"
|
||||
@@ -36,7 +36,7 @@ services:
|
||||
HUB_PROJECT_ID: ${HUB_PROJECT_ID:-11}
|
||||
HUB_DISABLED: ${HUB_DISABLED:-0}
|
||||
# 当前版本号(右上角角标 + 授权中心自检上报)
|
||||
SITE_VERSION: ${SITE_VERSION:-fixed41}
|
||||
SITE_VERSION: ${SITE_VERSION:-fixed44}
|
||||
depends_on:
|
||||
- katelyatv-redis
|
||||
volumes:
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
#!/usr/bin/env python3
|
||||
"""注入 IPv4/IPv6 线路选择页 /ipv6 + 右上角切换按钮(幂等可重跑)"""
|
||||
import os
|
||||
import subprocess, json, tempfile, os
|
||||
|
||||
CT = os.environ.get("KAT_CONTAINER", "katelyatv")
|
||||
|
||||
P = "/app/.next/server/app/api/tvbox/route.js"
|
||||
RM = "/app/.next/routes-manifest.json"
|
||||
MC_DIR = "/app/.next/static/chunks"
|
||||
@@ -9,9 +12,9 @@ MARK_S, MARK_E = "/* ==== IPV6PAGE:", "/* ==== IPV6PAGE END ==== */"
|
||||
HOOK = 'try{let _ipv6p=new URL(e.url);if(_ipv6p.pathname==="/ipv6"||_ipv6p.searchParams.get("ipv6")==="page")return IPV6PAGE(e)}catch(_ie){console.log("[IPV6-HOOK]",_ie&&_ie.message)}'
|
||||
|
||||
def read(p):
|
||||
return subprocess.run(["docker","exec","-u","root","katelyatv","cat",p],capture_output=True,check=True).stdout.decode()
|
||||
return subprocess.run(["docker","exec","-u","root",CT,"cat",p],capture_output=True,check=True).stdout.decode()
|
||||
def write(p, data):
|
||||
r=subprocess.run(["docker","exec","-u","root","-i","katelyatv","sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True)
|
||||
r=subprocess.run(["docker","exec","-u","root","-i",CT,"sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True)
|
||||
assert r.returncode==0, r.stderr.decode()[:300]
|
||||
|
||||
# ---- 1) route.js: 注入 IPV6PAGE 函数 + 入口钩子 ----
|
||||
@@ -50,10 +53,10 @@ if not any(x.get("source") == "/ipv6" for x in af):
|
||||
|
||||
# ---- 3) 右上角 IPV4/IPV6 切换按钮(注入 402 chunk,样式对齐 TVBOX接口按钮)----
|
||||
target = None
|
||||
files = subprocess.run(["docker","exec","katelyatv","ls",MC_DIR],capture_output=True,check=True).stdout.decode().split()
|
||||
files = subprocess.run(["docker","exec",CT,"ls",MC_DIR],capture_output=True,check=True).stdout.decode().split()
|
||||
for fn in files:
|
||||
if not fn.endswith(".js"): continue
|
||||
c = subprocess.run(["docker","exec","katelyatv","cat",f"{MC_DIR}/{fn}"],capture_output=True).stdout.decode()
|
||||
c = subprocess.run(["docker","exec",CT,"cat",f"{MC_DIR}/{fn}"],capture_output=True).stdout.decode()
|
||||
if 'gitea.88531.cn/jinghui/katelyatv' in c and 'mvModal' in c:
|
||||
target = f"{MC_DIR}/{fn}"; break
|
||||
if not target:
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
#!/usr/bin/env python3
|
||||
"""注入直播功能到运行中容器(幂等可重跑):LIVE 函数块 + 入口拦截 + /live rewrite + 菜单项"""
|
||||
import os
|
||||
import subprocess, json, tempfile, os
|
||||
|
||||
CT = os.environ.get("KAT_CONTAINER", "katelyatv")
|
||||
|
||||
P = "/app/.next/server/app/api/tvbox/route.js"
|
||||
RM = "/app/.next/routes-manifest.json"
|
||||
MC = "/app/.next/static/chunks/402-42ae253cc67eee98.js"
|
||||
@@ -11,10 +14,10 @@ HOOK_OLD = 'try{let _lv=new URL(e.url).searchParams.get("live");if(_lv)return aw
|
||||
HOOK = 'try{let _lurl=new URL(e.url),_lv=_lurl.searchParams.get("live");if(!_lv&&_lurl.pathname==="/live")_lv="page";if(_lv)return await LIVE(_lv,e)}catch(_le){console.log("[LIVE-HOOK]",_le&&_le.message)}'
|
||||
|
||||
def read(p):
|
||||
return subprocess.run(["docker","exec","-u","root","katelyatv","cat",p],capture_output=True,check=True).stdout.decode()
|
||||
return subprocess.run(["docker","exec","-u","root",CT,"cat",p],capture_output=True,check=True).stdout.decode()
|
||||
|
||||
def write(p, data):
|
||||
r=subprocess.run(["docker","exec","-u","root","-i","katelyatv","sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True)
|
||||
r=subprocess.run(["docker","exec","-u","root","-i",CT,"sh","-c",f"cat > {p}"],input=data.encode(),capture_output=True)
|
||||
assert r.returncode==0, r.stderr.decode()[:300]
|
||||
|
||||
# ---- 1) route.js: 删旧块+插新块+入口钩子 ----
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
#!/usr/bin/env bash
|
||||
# 在临时容器上重放全部补丁(不动生产容器),用于出新的 fixedNN 镜像
|
||||
# 用法: bash patches/stage_release.sh <源镜像> <临时容器名> <宿主端口>
|
||||
set -euo pipefail
|
||||
|
||||
IMG="${1:?源镜像}"
|
||||
C="${2:?临时容器名}"
|
||||
PORT="${3:?宿主端口}"
|
||||
DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
DEPLOY="$(dirname "$DIR")"
|
||||
|
||||
docker rm -f "$C" >/dev/null 2>&1 || true
|
||||
docker run -d --name "$C" \
|
||||
--network katelyatv_katelyatv-network \
|
||||
-p "${PORT}:3000" \
|
||||
--env-file "$DEPLOY/.env" \
|
||||
-v "$DEPLOY/config.json:/app/config.json:ro" \
|
||||
-v "$DEPLOY/public-live:/app/public" \
|
||||
"$IMG" >/dev/null
|
||||
|
||||
echo "[stage] 等待启动 ..."
|
||||
for i in $(seq 1 40); do
|
||||
code=$(curl -s -o /dev/null -w '%{http_code}' -m 3 "http://127.0.0.1:${PORT}/login" || true)
|
||||
[ "$code" = "200" ] && break
|
||||
sleep 2
|
||||
done
|
||||
echo "[stage] /login -> $code"
|
||||
|
||||
export KAT_CONTAINER="$C"
|
||||
KAT_REDIS=katelyatv-redis bash "$DIR/apply.sh" "$C"
|
||||
python3 "$DIR/fix_userlist_usernames.py" || echo "[stage] userlist fix skipped"
|
||||
echo "[stage] 补丁完成,容器 $C 运行在 :$PORT"
|
||||
Reference in new issue
Block a user