Compare commits

..
2 Commits
Author SHA1 Message Date
3970260761 70b2cacc20 fixed76: 管理用户表加注册时间+最后登录两列+TVBox配置页加直播源地址+注册/添加补时间写入
Docker Build & Test / build (push) Canceled after 0s
Docker Build & Test / test (push) Canceled after 0s
Build & Push Docker image / build-and-push (linux/amd64) (push) Canceled after 0s
Build & Push Docker image / build-and-push (linux/arm/v7) (push) Canceled after 0s
Build & Push Docker image / build-and-push (linux/arm64) (push) Canceled after 0s
Build & Push Docker image / merge-images (push) Canceled after 0s
Release / release (push) Canceled after 0s
Release / docker (push) Canceled after 0s
2026-11-08 01:38:08 +08:00
3970260761 7d698273d0 fixed75: TVBOX按钮弹双地址(配置地址+直播源地址各带复制)
Docker Build & Test / build (push) Canceled after 0s
Docker Build & Test / test (push) Canceled after 0s
Build & Push Docker image / build-and-push (linux/amd64) (push) Canceled after 0s
Build & Push Docker image / build-and-push (linux/arm/v7) (push) Canceled after 0s
Build & Push Docker image / build-and-push (linux/arm64) (push) Canceled after 0s
Build & Push Docker image / merge-images (push) Canceled after 0s
Release / release (push) Canceled after 0s
Release / docker (push) Canceled after 0s
2026-11-08 00:59:44 +08:00
10 changed files with 226 additions and 44 deletions

No files matched your search

+1 -1
View File
@@ -51,7 +51,7 @@ ENV NODE_ENV=production
ENV HOSTNAME=0.0.0.0
ENV PORT=3000
ENV DOCKER_ENV=true
ENV NEXT_PUBLIC_SITE_VERSION=fixed74
ENV NEXT_PUBLIC_SITE_VERSION=fixed75
# 从构建器中复制 standalone 输出
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+22
View File
@@ -470,6 +470,18 @@ const UserConfig = ({ config, role, refreshConfig }: UserConfigProps) => {
>
状态
</th>
<th
scope='col'
className='px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider'
>
注册时间
</th>
<th
scope='col'
className='px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider'
>
最后登录
</th>
<th
scope='col'
className='px-6 py-3 text-right text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider'
@@ -548,6 +560,16 @@ const UserConfig = ({ config, role, refreshConfig }: UserConfigProps) => {
{!user.banned ? '正常' : '已封禁'}
</span>
</td>
<td className='px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400'>
{user.created_at
? `${new Date(user.created_at).toLocaleString('zh-CN', { hour12: false })}${user.created_at_estimated ? '*' : ''}`
: '-'}
</td>
<td className='px-6 py-4 whitespace-nowrap text-sm text-gray-500 dark:text-gray-400'>
{user.last_login_at
? `${new Date(user.last_login_at).toLocaleString('zh-CN', { hour12: false })}${user.last_login_estimated ? '*' : ''}`
: '-'}
</td>
<td className='px-6 py-4 whitespace-nowrap text-right text-sm font-medium space-x-2'>
{/* 修改密码按钮 */}
{canChangePassword && (
+4 -2
View File
@@ -132,11 +132,13 @@ export async function POST(request: NextRequest) {
);
}
await storage.registerUser(targetUsername!, targetPassword);
// 更新配置
// 更新配置(带注册时间,避免列表显示空白)
adminConfig.UserConfig.Users.push({
username: targetUsername!,
role: 'user',
});
created_at: new Date().toISOString(),
created_at_estimated: false,
} as any);
targetEntry =
adminConfig.UserConfig.Users[
adminConfig.UserConfig.Users.length - 1
+4 -2
View File
@@ -97,11 +97,13 @@ export async function POST(req: NextRequest) {
await db.registerUser(username, password);
// 添加到配置中并保存
// 添加到配置中并保存(带注册时间,避免列表显示空白)
config.UserConfig.Users.push({
username,
role: 'user',
});
created_at: new Date().toISOString(),
created_at_estimated: false,
} as any);
await db.saveAdminConfig(config);
// 注册成功,设置认证cookie
+42
View File
@@ -8,6 +8,7 @@ export const dynamic = 'force-dynamic';
export default function ConfigPage() {
const [copied, setCopied] = useState(false);
const [copiedLive, setCopiedLive] = useState(false);
const [format, setFormat] = useState<'json' | 'base64'>('json');
const getConfigUrl = useCallback(() => {
@@ -16,6 +17,12 @@ export default function ConfigPage() {
return `${baseUrl}/api/tvbox?format=${format}`;
}, [format]);
const getLiveUrl = useCallback(() => {
if (typeof window === 'undefined') return '';
const baseUrl = window.location.origin;
return `${baseUrl}/api/tvbox?live=txt`;
}, []);
const handleCopy = async () => {
try {
await navigator.clipboard.writeText(getConfigUrl());
@@ -26,6 +33,16 @@ export default function ConfigPage() {
}
};
const handleCopyLive = async () => {
try {
await navigator.clipboard.writeText(getLiveUrl());
setCopiedLive(true);
setTimeout(() => setCopiedLive(false), 2000);
} catch {
// Copy failed silently
}
};
return (
<>
<TopRightButtons variant='float' />
@@ -72,6 +89,31 @@ export default function ConfigPage() {
{copied ? '已复制' : '复制'}
</button>
</div>
<h2 className="text-xl font-semibold mt-6 mb-2 text-gray-900 dark:text-white">
直播源地址
</h2>
<p className="text-sm text-gray-500 dark:text-gray-400 mb-4">
仅含电视直播,可单独填入 TVBox 直播源(TXT 格式)。
</p>
<div className="flex items-center space-x-2">
<input
type="text"
readOnly
value={getLiveUrl()}
className="flex-1 p-3 border border-gray-300 dark:border-gray-600 rounded-md bg-gray-50 dark:bg-gray-700 text-gray-900 dark:text-white font-mono text-sm"
/>
<button
onClick={handleCopyLive}
className={`px-4 py-3 rounded-md font-medium transition-colors ${
copiedLive
? 'bg-green-500 text-white'
: 'bg-blue-500 hover:bg-blue-600 text-white'
}`}
>
{copiedLive ? '已复制' : '复制'}
</button>
</div>
</div>
<div className="bg-white dark:bg-gray-800 rounded-lg shadow-lg p-6 mb-6">
+1 -1
View File
@@ -27,7 +27,7 @@ const MobileHeader = ({ showBackButton = false }: MobileHeaderProps) => {
className='shrink-0 select-none rounded-md px-1.5 py-0.5 text-[10px] font-bold tracking-wide text-purple-600 dark:text-purple-400 bg-purple-500/10 border border-purple-500/20'
title='米视TV 当前版本'
>
v{process.env.NEXT_PUBLIC_SITE_VERSION || 'fixed74'}
v{process.env.NEXT_PUBLIC_SITE_VERSION || 'fixed75'}
</span>
<ThemeToggle />
<UserMenu />
+2 -2
View File
@@ -20,7 +20,7 @@ export default function TopRightButtons({ variant = 'bar' }: TopRightButtonsProp
className='shrink-0 select-none rounded-md px-1.5 py-1 text-[10px] font-bold tracking-wide text-purple-300 bg-purple-500/20 border border-purple-400/30'
title='米视TV 当前版本'
>
v{process.env.NEXT_PUBLIC_SITE_VERSION || 'fixed74'}
v{process.env.NEXT_PUBLIC_SITE_VERSION || 'fixed75'}
</span>
<HubBell forceShow />
<TvboxButton forceShow compact />
@@ -43,7 +43,7 @@ export default function TopRightButtons({ variant = 'bar' }: TopRightButtonsProp
className='hidden lg:inline-flex shrink-0 items-center select-none rounded-lg px-2 py-1.5 text-xs font-bold tracking-wide text-purple-600 dark:text-purple-400 bg-purple-500/10 border border-purple-500/20'
title='米视TV 当前版本'
>
v{process.env.NEXT_PUBLIC_SITE_VERSION || 'fixed74'}
v{process.env.NEXT_PUBLIC_SITE_VERSION || 'fixed75'}
</span>
<HubBell />
<TvboxButton />
+70 -28
View File
@@ -5,7 +5,25 @@ import { useState } from 'react';
export default function TvboxButton({ forceShow = false, compact = false }: { forceShow?: boolean; compact?: boolean }) {
const [label, setLabel] = useState('📺 TVBOX接口');
const showModal = (title: string, body: string, link?: string) => {
const copyText = (t: string, btn?: HTMLButtonElement) => {
try {
if (navigator.clipboard && navigator.clipboard.writeText) {
navigator.clipboard.writeText(t).then(() => {
if (btn) { btn.textContent = '✓ 已复制'; setTimeout(() => (btn.textContent = '复制'), 1600); }
}).catch(() => {});
return;
}
} catch {}
const ta = document.createElement('textarea');
ta.value = t;
document.body.appendChild(ta);
ta.select();
try { document.execCommand('copy'); } catch {}
document.body.removeChild(ta);
if (btn) { btn.textContent = '✓ 已复制'; setTimeout(() => (btn.textContent = '复制'), 1600); }
};
const showTvboxModal = (cfg: string, live: string) => {
const ov = document.createElement('div');
ov.className =
'fixed inset-0 z-[9999] flex items-center justify-center bg-black/50 p-4';
@@ -18,7 +36,7 @@ export default function TvboxButton({ forceShow = false, compact = false }: { fo
const h3 = document.createElement('h3');
h3.className =
'text-base font-bold text-gray-900 dark:text-gray-100 truncate mr-2';
h3.textContent = title;
h3.textContent = '📺 TVBOX 接入';
const xb = document.createElement('button');
xb.className =
'text-gray-400 hover:text-gray-600 dark:hover:text-gray-200 text-lg leading-none flex-shrink-0';
@@ -27,8 +45,51 @@ export default function TvboxButton({ forceShow = false, compact = false }: { fo
head.appendChild(xb);
const bd = document.createElement('div');
bd.className =
'px-6 pb-4 overflow-y-auto text-sm text-gray-700 dark:text-gray-300 whitespace-pre-wrap';
bd.textContent = body;
'px-6 pb-4 overflow-y-auto text-sm text-gray-700 dark:text-gray-300';
const mkRow = (label: string, url: string) => {
const wrap = document.createElement('div');
wrap.style.marginBottom = '14px';
const lb = document.createElement('div');
lb.style.fontWeight = '700';
lb.style.marginBottom = '6px';
lb.textContent = label;
const urlDiv = document.createElement('div');
urlDiv.style.wordBreak = 'break-all';
urlDiv.style.background = 'rgba(127,127,127,.12)';
urlDiv.style.borderRadius = '8px';
urlDiv.style.padding = '8px 10px';
urlDiv.style.fontSize = '12px';
urlDiv.textContent = url;
const row = document.createElement('div');
row.style.display = 'flex';
row.style.gap = '8px';
row.style.marginTop = '8px';
const cp = document.createElement('button');
cp.textContent = '复制';
cp.className =
'px-3 py-1.5 rounded-lg text-xs font-medium text-white bg-purple-600 hover:bg-purple-700';
cp.onclick = () => copyText(url, cp);
const op = document.createElement('a');
op.href = url;
op.target = '_blank';
op.rel = 'noopener';
op.textContent = '打开 →';
op.className =
'px-3 py-1.5 rounded-lg text-xs font-medium text-purple-600 dark:text-purple-400 hover:bg-purple-500/10';
row.appendChild(cp);
row.appendChild(op);
wrap.appendChild(lb);
wrap.appendChild(urlDiv);
wrap.appendChild(row);
return wrap;
};
bd.appendChild(mkRow('配置地址(含直播,推荐)', cfg));
bd.appendChild(mkRow('直播源地址(仅直播)', live));
const tip = document.createElement('div');
tip.style.fontSize = '12px';
tip.style.opacity = '0.75';
tip.textContent = '影视仓/TVBox「设置 → 配置地址」粘贴保存即可';
bd.appendChild(tip);
card.appendChild(head);
card.appendChild(bd);
const foot = document.createElement('div');
@@ -39,16 +100,6 @@ export default function TvboxButton({ forceShow = false, compact = false }: { fo
'px-3 py-1.5 rounded-lg text-xs font-medium text-gray-500 dark:text-gray-400 hover:bg-gray-100 dark:hover:bg-gray-600';
kb.textContent = '我知道了';
foot.appendChild(kb);
if (link) {
const la = document.createElement('a');
la.href = link;
la.target = '_blank';
la.rel = 'noopener';
la.className =
'px-3 py-1.5 rounded-lg text-xs font-medium text-purple-600 dark:text-purple-400 hover:bg-purple-500/10';
la.textContent = '查看详情 →';
foot.insertBefore(la, kb);
}
card.appendChild(foot);
const close = () => {
if (ov && ov.parentNode) ov.parentNode.removeChild(ov);
@@ -63,25 +114,16 @@ export default function TvboxButton({ forceShow = false, compact = false }: { fo
};
const onClick = (ev: React.MouseEvent<HTMLButtonElement>) => {
const u = location.origin + '/api/tvbox';
const cfg = location.origin + '/api/tvbox';
const live = location.origin + '/api/tvbox?live=txt';
const bt = ev.currentTarget;
const ok = () => {
setLabel('✓ 已复制');
setTimeout(() => setLabel('📺 TVBOX接口'), 1600);
};
const tip = '影视仓/TVBox「设置 → 配置地址」粘贴保存即可';
try {
if (navigator.clipboard && navigator.clipboard.writeText) {
navigator.clipboard
.writeText(u)
.then(ok)
.catch(() =>
showModal('📺 TVBOX 接入', '配置地址: ' + u + ' —— ' + tip, u)
);
return;
}
} catch {}
showModal('📺 TVBOX 接入', '配置地址: ' + u + ' —— ' + tip, u);
void bt;
void ok;
showTvboxModal(cfg, live);
};
return (
+4
View File
@@ -13,6 +13,10 @@ export interface AdminConfig {
username: string;
role: 'user' | 'admin' | 'owner';
banned?: boolean;
created_at?: string;
created_at_estimated?: boolean;
last_login_at?: string;
last_login_estimated?: boolean;
}[];
};
SourceConfig: {
+76 -8
View File
@@ -73,16 +73,41 @@ async function initConfig() {
adminConfig = await (storage as any).getAdminConfig();
}
// 获取所有用户名,用于补全 Users
// 获取所有用户(含注册/最后登录时间),用于补全 Users
let userNames: string[] = [];
const userTimeMap = new Map<
string,
{
created_at?: string;
created_at_estimated?: boolean;
last_login_at?: string;
last_login_estimated?: boolean;
}
>();
if (storage && typeof (storage as any).getAllUsers === 'function') {
try {
const rawUsers = await (storage as any).getAllUsers();
// getAllUsers 返回的是 User 对象数组,这里统一取用户名字符串,
// 否则会把整个对象写入 Users[].username(导致管理页渲染对象报 React #31)
userNames = (Array.isArray(rawUsers) ? rawUsers : [])
.map((u: any) => (typeof u === 'string' ? u : u && typeof u.username === 'string' ? u.username : ''))
.filter((n: string) => !!n);
// 同时保留时间字段,供用户列表展示注册/最后登录时间
(Array.isArray(rawUsers) ? rawUsers : []).forEach((u: any) => {
const n =
typeof u === 'string'
? u
: u && typeof u.username === 'string'
? u.username
: '';
if (!n) return;
userNames.push(n);
if (typeof u === 'object' && u) {
userTimeMap.set(n, {
created_at: u.created_at || undefined,
created_at_estimated: !!u.created_at_estimated,
last_login_at: u.last_login_at || undefined,
last_login_estimated: !!u.last_login_estimated,
});
}
});
} catch (e) {
console.error('获取用户列表失败:', e);
}
@@ -132,7 +157,24 @@ async function initConfig() {
adminConfig!.UserConfig.Users.push({
username: uname,
role: 'user',
...(userTimeMap.get(uname) || {}),
});
} else {
// 已存在用户也回填时间字段(老配置升级时补上)
const exist = adminConfig!.UserConfig.Users.find(
(u) => u.username === uname
);
const t = userTimeMap.get(uname);
if (exist && t) {
if (!exist.created_at && t.created_at) {
exist.created_at = t.created_at;
exist.created_at_estimated = t.created_at_estimated;
}
if (!exist.last_login_at && t.last_login_at) {
exist.last_login_at = t.last_login_at;
exist.last_login_estimated = t.last_login_estimated;
}
}
}
});
// 站长
@@ -151,6 +193,7 @@ async function initConfig() {
let allUsers = userNames.map((uname) => ({
username: uname,
role: 'user',
...(userTimeMap.get(uname) || {}),
}));
const ownerUser = process.env.USERNAME;
if (ownerUser) {
@@ -325,14 +368,38 @@ export async function getConfig(): Promise<AdminConfig> {
export async function resetConfig() {
const storage = getStorage();
// 获取所有用户名,用于补全 Users
// 获取所有用户(含注册/最后登录时间),用于补全 Users
let userNames: string[] = [];
const userTimeMap = new Map<
string,
{
created_at?: string;
created_at_estimated?: boolean;
last_login_at?: string;
last_login_estimated?: boolean;
}
>();
if (storage && typeof (storage as any).getAllUsers === 'function') {
try {
const rawUsers = await (storage as any).getAllUsers();
userNames = (Array.isArray(rawUsers) ? rawUsers : [])
.map((u: any) => (typeof u === 'string' ? u : u && typeof u.username === 'string' ? u.username : ''))
.filter((n: string) => !!n);
(Array.isArray(rawUsers) ? rawUsers : []).forEach((u: any) => {
const n =
typeof u === 'string'
? u
: u && typeof u.username === 'string'
? u.username
: '';
if (!n) return;
userNames.push(n);
if (typeof u === 'object' && u) {
userTimeMap.set(n, {
created_at: u.created_at || undefined,
created_at_estimated: !!u.created_at_estimated,
last_login_at: u.last_login_at || undefined,
last_login_estimated: !!u.last_login_estimated,
});
}
});
} catch (e) {
console.error('获取用户列表失败:', e);
}
@@ -358,6 +425,7 @@ export async function resetConfig() {
let allUsers = userNames.map((uname) => ({
username: uname,
role: 'user',
...(userTimeMap.get(uname) || {}),
}));
const ownerUser = process.env.USERNAME;
if (ownerUser) {