diff --git a/Dockerfile b/Dockerfile index 0bee634..bd34c9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ RUN find ./src -type f -name "route.ts" -print0 \ ENV DOCKER_ENV=true # 海报走站内 /api/image-proxy(浏览器直连豆瓣图被拦导致全裂) ENV NEXT_PUBLIC_IMAGE_PROXY=/api/image-proxy -ENV NEXT_PUBLIC_SITE_VERSION=fixed106 +ENV NEXT_PUBLIC_SITE_VERSION=fixed107 # For Docker builds, force dynamic rendering to read runtime environment variables. RUN sed -i "/const inter = Inter({ subsets: \['latin'] });/a export const dynamic = 'force-dynamic';" src/app/layout.tsx @@ -55,7 +55,7 @@ ENV HOSTNAME=0.0.0.0 ENV PORT=3000 ENV DOCKER_ENV=true ENV NEXT_PUBLIC_IMAGE_PROXY=/api/image-proxy -ENV NEXT_PUBLIC_SITE_VERSION=fixed106 +ENV NEXT_PUBLIC_SITE_VERSION=fixed107 # 从构建器中复制 standalone 输出 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ diff --git a/config.json b/config.json index 8932279..193d1e7 100644 --- a/config.json +++ b/config.json @@ -10,6 +10,21 @@ "api": "https://hhzyapi.com/api.php/provide/vod", "name": "彗星资源", "is_adult": false + }, + "bfzy": { + "api": "https://bfzyapi.com/api.php/provide/vod", + "name": "暴风资源", + "is_adult": false + }, + "jyzy": { + "api": "https://jyzyapi.com/api.php/provide/vod", + "name": "极速资源", + "is_adult": false + }, + "bz360": { + "api": "https://360zy.com/api.php/provide/vod", + "name": "360资源", + "is_adult": false } } } \ No newline at end of file diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 1335ee6..bb28fe7 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -7,13 +7,14 @@ import 'sweetalert2/dist/sweetalert2.min.css'; import { getConfig } from '@/lib/config'; import { SiteProvider } from '../components/SiteProvider'; +import Ipv6FirstVisitGate from '../components/Ipv6FirstVisitGate'; import { ThemeProvider } from '../components/ThemeProvider'; const inter = Inter({ subsets: ['latin'] }); // 动态生成 metadata,支持配置更新后的标题变化 export async function generateMetadata(): Promise { - let siteName = process.env.SITE_NAME || 'KatelyaTV'; + let siteName = process.env.SITE_NAME || '米视TV'; try { // 只有在非 d1 和 upstash 存储类型时才尝试获取配置 @@ -57,7 +58,7 @@ export default async function RootLayout({ }: { children: React.ReactNode; }) { - let siteName = process.env.SITE_NAME || 'KatelyaTV'; + let siteName = process.env.SITE_NAME || '米视TV'; let announcement = process.env.ANNOUNCEMENT || '本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。Link Me TG:@katelya77'; @@ -114,8 +115,7 @@ export default async function RootLayout({ disableTransitionOnChange > - {/* 首访不再强制跳 /ipv6(fixed105 移除 Ipv6FirstVisitGate):首页直接加载数据, - IPv6 推荐改由首页 LineRecommender 非阻塞提示 */} + {children} diff --git a/src/app/page.tsx b/src/app/page.tsx index eac4818..44b1a97 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -25,7 +25,7 @@ import PageLayout from '@/components/PageLayout'; import PaginatedRow from '@/components/PaginatedRow'; import VideoCard from '@/components/VideoCard'; -// 主内容区大型 KatelyaTV Logo 组件 +// 主内容区大型 米视TV Logo 组件 const MainKatelyaLogo = () => { return (
@@ -33,7 +33,7 @@ const MainKatelyaLogo = () => {
{/* 主 Logo */} -
KatelyaTV
+
米视TV
{/* 副标题 */}
@@ -53,7 +53,7 @@ const MainKatelyaLogo = () => { ); }; -// KatelyaTV 底部 Logo 组件 +// 米视TV 底部 Logo 组件 const BottomKatelyaLogo = () => { return (
@@ -66,9 +66,9 @@ const BottomKatelyaLogo = () => {
-
KatelyaTV
+
米视TV
- Powered by KatelyaTV Core + Powered by 米视TV Core
diff --git a/src/components/Ipv6FirstVisitGate.tsx b/src/components/Ipv6FirstVisitGate.tsx index fa6e8d2..874eb8c 100644 --- a/src/components/Ipv6FirstVisitGate.tsx +++ b/src/components/Ipv6FirstVisitGate.tsx @@ -1,18 +1,24 @@ 'use client'; -// 首次访问公网入口时跳转到 /ipv6 线路选择页(源码化恢复:旧版 patch_license.js V6-PROBE 在迁移时未搬入源码) +// 首次访问公网入口:若用户支持 IPv6,则跳转到 tv6 线路选择页让用户选择 import { useEffect } from 'react'; export default function Ipv6FirstVisitGate() { useEffect(() => { try { - if (location.hostname !== 'tv.88531.cn') return; // 仅公网 IPv4 入口;LAN/IPv6 线路不跳转(避免循环) - if (location.pathname === '/ipv6') return; - // middleware 已记住线路(cookie)即视为已选择,不再重复弹 + if (location.hostname !== 'tv.88531.cn') return; if (/(^|;\s*)__v6dest=/.test(document.cookie)) return; - if (localStorage.getItem('__v6dest')) return; // 已记住线路,不打扰 - sessionStorage.setItem('__v6back', location.pathname + location.search + location.hash); - location.replace('/ipv6'); + if (localStorage.getItem('__v6dest')) return; + // 探测 IPv6 可达性,可达才跳转 + const ctrl = new AbortController(); + const t = setTimeout(() => ctrl.abort(), 1500); + fetch('https://tv6.88531.cn:4443/api/license-config?_=', { mode: 'no-cors', signal: ctrl.signal }) + .then(() => { + clearTimeout(t); + sessionStorage.setItem('__v6back', location.pathname + location.search + location.hash); + location.replace('https://tv6.88531.cn:4443/ipv6'); + }) + .catch(() => { clearTimeout(t); }); } catch {} }, []); return null; diff --git a/src/lib/config.ts b/src/lib/config.ts index 254b064..1b9396a 100644 --- a/src/lib/config.ts +++ b/src/lib/config.ts @@ -205,7 +205,7 @@ async function initConfig() { } adminConfig = { SiteConfig: { - SiteName: process.env.SITE_NAME || 'KatelyaTV', + SiteName: process.env.SITE_NAME || '米视TV', Announcement: process.env.ANNOUNCEMENT || '本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。', @@ -245,7 +245,7 @@ async function initConfig() { // 本地存储直接使用文件配置 cachedConfig = { SiteConfig: { - SiteName: process.env.SITE_NAME || 'KatelyaTV', + SiteName: process.env.SITE_NAME || '米视TV', Announcement: process.env.ANNOUNCEMENT || '本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。', @@ -290,7 +290,7 @@ export async function getConfig(): Promise { if (adminConfig) { // 合并一些环境变量配置 - adminConfig.SiteConfig.SiteName = process.env.SITE_NAME || 'KatelyaTV'; + adminConfig.SiteConfig.SiteName = process.env.SITE_NAME || '米视TV'; adminConfig.SiteConfig.Announcement = process.env.ANNOUNCEMENT || '本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。'; @@ -437,7 +437,7 @@ export async function resetConfig() { } const adminConfig = { SiteConfig: { - SiteName: process.env.SITE_NAME || 'KatelyaTV', + SiteName: process.env.SITE_NAME || '米视TV', Announcement: process.env.ANNOUNCEMENT || '本网站仅提供影视信息搜索服务,所有内容均来自第三方网站。本站不存储任何视频资源,不对任何内容的准确性、合法性、完整性负责。',