Compare commits

..

1 Commits

Author SHA1 Message Date
exinglang 1e81bab6ea feat(新手引导): 支持十圈视频配置 2026-07-29 22:39:42 +08:00
9 changed files with 143 additions and 1316 deletions
+1 -1
View File
@@ -3,7 +3,7 @@
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "next dev -p 3001", "dev": "next dev -p 3002",
"build": "next build", "build": "next build",
"start": "next start -p 3001", "start": "next start -p 3001",
"lint": "next lint" "lint": "next lint"
+110 -83
View File
@@ -2,9 +2,12 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { import {
Alert,
Button, Button,
Card, Card,
Descriptions,
InputNumber, InputNumber,
Popconfirm,
Space, Space,
Spin, Spin,
Switch, Switch,
@@ -21,6 +24,10 @@ import type { GuideVideoConfig as GuideCfg } from '@/lib/types';
const { Text } = Typography; const { Text } = Typography;
const MAX_BYTES = 100 * 1024 * 1024; const MAX_BYTES = 100 * 1024 * 1024;
const MIN_PLAYS = 1;
const MAX_PLAYS = 50;
const MIN_REWARD_COIN = 10;
const MAX_REWARD_COIN = 10000;
type Scene = 'coupon' | 'comparison'; type Scene = 'coupon' | 'comparison';
const META: Record<Scene, { title: string; action: string }> = { const META: Record<Scene, { title: string; action: string }> = {
@@ -28,16 +35,29 @@ const META: Record<Scene, { title: string; action: string }> = {
comparison: { title: '开始比价引导视频', action: '开始比价' }, comparison: { title: '开始比价引导视频', action: '开始比价' },
}; };
function formatDuration(durationMs: number | null | undefined) {
if (durationMs == null || !Number.isFinite(durationMs)) return '—';
return `${(durationMs / 1000).toFixed(3).replace(/\.?0+$/, '')}`;
}
function SceneConfig({ scene }: { scene: Scene }) { function SceneConfig({ scene }: { scene: Scene }) {
const meta = META[scene]; const meta = META[scene];
const [cfg, setCfg] = useState<GuideCfg | null>(null); const [cfg, setCfg] = useState<GuideCfg | null>(null);
const [loading, setLoading] = useState(true); const [loading, setLoading] = useState(true);
const [saving, setSaving] = useState(false); const [saving, setSaving] = useState(false);
const [uploading, setUploading] = useState(false); const [uploading, setUploading] = useState(false);
const [enabled, setEnabled] = useState(true); const [enabled, setEnabled] = useState(false);
const [maxPlays, setMaxPlays] = useState(3); const [maxPlays, setMaxPlays] = useState(3);
const [rewardCoin, setRewardCoin] = useState(100); const [rewardCoin, setRewardCoin] = useState(100);
const canEdit = canDo(['operator']); const canEdit = canDo(['operator']);
const configValid =
Number.isInteger(maxPlays) &&
maxPlays >= MIN_PLAYS &&
maxPlays <= MAX_PLAYS &&
Number.isInteger(rewardCoin) &&
rewardCoin >= MIN_REWARD_COIN &&
rewardCoin <= MAX_REWARD_COIN &&
rewardCoin % 10 === 0;
const sync = (value: GuideCfg) => { const sync = (value: GuideCfg) => {
setCfg(value); setCfg(value);
@@ -49,9 +69,7 @@ function SceneConfig({ scene }: { scene: Scene }) {
const load = async () => { const load = async () => {
setLoading(true); setLoading(true);
try { try {
const { data } = await api.get<GuideCfg>('/admin/api/guide-video', { const { data } = await api.get<GuideCfg>('/admin/api/guide-video', { params: { scene } });
params: { scene },
});
sync(data); sync(data);
} catch (e) { } catch (e) {
message.error(errMsg(e)); message.error(errMsg(e));
@@ -65,15 +83,15 @@ function SceneConfig({ scene }: { scene: Scene }) {
}, [scene]); }, [scene]);
const save = async () => { const save = async () => {
if (!configValid) {
message.error('请检查配置:播放次数为 1~50,每次金币为 10~10000 且必须是 10 的倍数');
return;
}
setSaving(true); setSaving(true);
try { try {
const { data } = await api.patch<GuideCfg>( const { data } = await api.patch<GuideCfg>(
'/admin/api/guide-video', '/admin/api/guide-video',
{ { enabled, max_plays: maxPlays, reward_coin: rewardCoin },
enabled,
reward_coin: rewardCoin,
...(scene === 'comparison' ? { max_plays: maxPlays } : {}),
},
{ params: { scene } }, { params: { scene } },
); );
sync(data); sync(data);
@@ -98,7 +116,7 @@ function SceneConfig({ scene }: { scene: Scene }) {
sync(data); sync(data);
message.success(`${meta.title}已更新`); message.success(`${meta.title}已更新`);
} catch (e) { } catch (e) {
message.error(errMsg(e)); message.error(`${errMsg(e)},原视频和配置未改变`);
} finally { } finally {
setUploading(false); setUploading(false);
} }
@@ -106,7 +124,7 @@ function SceneConfig({ scene }: { scene: Scene }) {
const beforeUpload = (file: File) => { const beforeUpload = (file: File) => {
if (file.type !== 'video/mp4' && !/\.mp4$/i.test(file.name)) { if (file.type !== 'video/mp4' && !/\.mp4$/i.test(file.name)) {
message.error('仅支持 MP4 视频(H.264 编码)'); message.error('仅支持 MP4 视频(H.264 或 HEVC/H.265 编码)');
return Upload.LIST_IGNORE; return Upload.LIST_IGNORE;
} }
if (file.size > MAX_BYTES) { if (file.size > MAX_BYTES) {
@@ -138,20 +156,11 @@ function SceneConfig({ scene }: { scene: Scene }) {
size="small" size="small"
title={meta.title} title={meta.title}
style={{ marginBottom: 16 }} style={{ marginBottom: 16 }}
extra={ extra={cfg?.updated_at ? <Text type="secondary"> {new Date(cfg.updated_at).toLocaleString('zh-CN')}</Text> : null}
cfg?.updated_at ? (
<Text type="secondary">
{new Date(cfg.updated_at).toLocaleString('zh-CN')}
</Text>
) : null
}
> >
<p style={{ color: '#777', marginTop: 0 }}> <p style={{ color: '#777', marginTop: 0 }}>
Android {meta.action} {cfg?.max_plays ?? 3}{' '} Android {meta.action}
广 1/10 1/10 退
{scene === 'coupon' &&
'领券引导视频的播放次数上限请在「监控审计 → 限制策略」中调整。'}
</p> </p>
{loading || !cfg ? ( {loading || !cfg ? (
<Spin style={{ display: 'block', margin: '24px 0' }} /> <Spin style={{ display: 'block', margin: '24px 0' }} />
@@ -163,97 +172,115 @@ function SceneConfig({ scene }: { scene: Scene }) {
<video <video
src={mediaUrl(cfg.video_url)} src={mediaUrl(cfg.video_url)}
controls controls
style={{ style={{ width: 240, maxHeight: 420, borderRadius: 12, background: '#000' }}
width: 240,
maxHeight: 420,
borderRadius: 12,
background: '#000',
}}
/> />
) : ( ) : (
<div <div style={{ height: 280, border: '1px dashed #d9d9d9', borderRadius: 12, display: 'grid', placeItems: 'center', color: '#aaa' }}>
style={{
height: 280,
border: '1px dashed #d9d9d9',
borderRadius: 12,
display: 'grid',
placeItems: 'center',
color: '#aaa',
}}
>
</div> </div>
)} )}
</div> </div>
<Space direction="vertical" size="middle" style={{ minWidth: 390 }}> <Space direction="vertical" size="middle" style={{ minWidth: 390 }}>
{cfg.analysis_status === 'invalid' || cfg.analysis_error ? (
<Alert
type="error"
showIcon
message="视频分析异常,当前场景不可启用"
description={cfg.analysis_error || '请重新上传符合要求的视频'}
/>
) : null}
<Space> <Space>
<span></span> <span></span>
<Switch <Switch
checked={enabled} checked={enabled}
disabled={!canEdit} disabled={!canEdit || (!enabled && cfg.analysis_status !== 'valid')}
onChange={setEnabled} onChange={setEnabled}
/> />
{!enabled && <Tag color="orange"></Tag>} {!enabled && <Tag color="orange"></Tag>}
{!enabled && cfg.analysis_status !== 'valid' && <Text type="secondary"></Text>}
</Space> </Space>
{scene === 'comparison' && (
<Space>
<span></span>
<InputNumber
min={0}
max={50}
precision={0}
value={maxPlays}
disabled={!canEdit}
onChange={(value) => setMaxPlays(value ?? 0)}
/>
<Text type="secondary"> N 3</Text>
</Space>
)}
<Space> <Space>
<span></span> <span></span>
<InputNumber <InputNumber
min={0} min={MIN_PLAYS}
max={10000} max={MAX_PLAYS}
precision={0} precision={0}
status={maxPlays < MIN_PLAYS || maxPlays > MAX_PLAYS ? 'error' : undefined}
value={maxPlays}
disabled={!canEdit}
onChange={(v) => setMaxPlays(v ?? MIN_PLAYS)}
/>
<Text type="secondary"> 150 3</Text>
</Space>
<Space>
<span></span>
<InputNumber
min={MIN_REWARD_COIN}
max={MAX_REWARD_COIN}
step={10}
precision={0}
status={
rewardCoin < MIN_REWARD_COIN ||
rewardCoin > MAX_REWARD_COIN ||
rewardCoin % 10 !== 0
? 'error'
: undefined
}
value={rewardCoin} value={rewardCoin}
disabled={!canEdit} disabled={!canEdit}
onChange={(value) => setRewardCoin(value ?? 0)} onChange={(v) => setRewardCoin(v ?? MIN_REWARD_COIN)}
/> />
<Text type="secondary"> 100</Text> <Text type="secondary">1010000 10 100</Text>
</Space> </Space>
{cfg.video_url ? (
<Descriptions size="small" bordered column={2}>
<Descriptions.Item label="总时长">{formatDuration(cfg.duration_ms)}</Descriptions.Item>
<Descriptions.Item label="单圈时长">
{formatDuration(cfg.circle_duration_ms ?? (cfg.duration_ms == null ? null : cfg.duration_ms / 10))}
</Descriptions.Item>
<Descriptions.Item label="单圈金币">
{rewardCoin === cfg.reward_coin ? cfg.reward_per_circle : rewardCoin / cfg.circle_count}
</Descriptions.Item>
<Descriptions.Item label="编码">
{cfg.video_codec || '—'} / {cfg.audio_codec || '无'}
</Descriptions.Item>
<Descriptions.Item label="分析状态" span={2}>
<Tag color={cfg.analysis_status === 'valid' ? 'green' : 'orange'}>
{cfg.analysis_status === 'valid'
? '分析完成'
: cfg.analysis_status === 'invalid'
? '分析异常'
: '未上传'}
</Tag>
</Descriptions.Item>
</Descriptions>
) : null}
<Space wrap> <Space wrap>
<Upload <Upload accept="video/mp4,.mp4" showUploadList={false} beforeUpload={beforeUpload} disabled={!canEdit}>
accept="video/mp4,.mp4" <Button icon={<UploadOutlined />} loading={uploading} disabled={!canEdit}>
showUploadList={false}
beforeUpload={beforeUpload}
disabled={!canEdit}
>
<Button
icon={<UploadOutlined />}
loading={uploading}
disabled={!canEdit}
>
{cfg.video_url ? '更换视频' : '上传视频'} {cfg.video_url ? '更换视频' : '上传视频'}
</Button> </Button>
</Upload> </Upload>
{cfg.video_url && ( {cfg.video_url && (
<Button icon={<DeleteOutlined />} danger loading={uploading} disabled={!canEdit} onClick={removeVideo}> <Popconfirm
title={`确认移除${meta.title}`}
</Button> description="移除后该场景的新播放将无法使用引导视频,已经开始的播放不受影响。"
okText="确认移除"
cancelText="取消"
okButtonProps={{ danger: true }}
onConfirm={removeVideo}
disabled={!canEdit}
>
<Button icon={<DeleteOutlined />} danger loading={uploading} disabled={!canEdit}>
</Button>
</Popconfirm>
)} )}
<Text type="secondary">MP4H.264100MB</Text> <Text type="secondary">MP4H.264 HEVC/H.265 AAC30180 100MB</Text>
</Space> </Space>
<Button <Button type="primary" loading={saving} disabled={!canEdit || !configValid} onClick={save}>
type="primary"
loading={saving}
disabled={!canEdit}
onClick={save}
>
</Button> </Button>
<Text type="secondary">
{cfg.total_plays} {cfg.granted_plays}
</Text>
</Space> </Space>
</Space> </Space>
)} )}
-2
View File
@@ -4,7 +4,6 @@ import { useEffect, useRef, useState } from 'react';
import { usePathname, useRouter } from 'next/navigation'; import { usePathname, useRouter } from 'next/navigation';
import { import {
BarChartOutlined, BarChartOutlined,
ControlOutlined,
DashboardOutlined, DashboardOutlined,
DatabaseOutlined, DatabaseOutlined,
FileSearchOutlined, FileSearchOutlined,
@@ -106,7 +105,6 @@ const NAV_GROUPS: NavGroup[] = [
{ key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' }, { key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
{ key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' }, { key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
{ key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' }, { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
{ key: '/limit-whitelist', icon: <ControlOutlined />, label: '限制策略' },
], ],
}, },
]; ];
File diff suppressed because it is too large Load Diff
+6 -75
View File
@@ -19,12 +19,10 @@ import {
CopyOutlined, CopyOutlined,
DownOutlined, DownOutlined,
EditOutlined, EditOutlined,
PlusCircleOutlined,
ReloadOutlined, ReloadOutlined,
RightOutlined, RightOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { useRouter } from 'next/navigation';
import { api, errMsg } from '@/lib/api'; import { api, errMsg } from '@/lib/api';
import { formatUtcTime, utcDayjs } from '@/lib/format'; import { formatUtcTime, utcDayjs } from '@/lib/format';
import type { import type {
@@ -71,8 +69,8 @@ type IncidentStatus = 'open' | 'blocked';
const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }> = { const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }> = {
sms: { sms: {
min: 1, min: 1,
max: 100000, max: 5,
help: '统计成功下发;告警阈值与短信硬限制分别配置。', help: '统计成功下发;最高5次,与现有每设备每小时发送上限一致。',
}, },
oneclick: { oneclick: {
min: 1, min: 1,
@@ -81,8 +79,8 @@ const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }>
}, },
compare: { compare: {
min: 1, min: 1,
max: 100000, max: 100,
help: '同一账户按北京时间自然日累计;告警阈值与比价硬限制分别配置。', help: '同一账户按北京时间自然日累计;最高100次,与比价每日上限一致。',
}, },
}; };
const utcTime = (value: string | null, withDate = true) => const utcTime = (value: string | null, withDate = true) =>
@@ -273,7 +271,6 @@ function DetailTable({
} }
export default function RiskMonitorPage() { export default function RiskMonitorPage() {
const router = useRouter();
const { message, modal } = App.useApp(); const { message, modal } = App.useApp();
const [summary, setSummary] = useState<RiskMonitorSummary | null>(null); const [summary, setSummary] = useState<RiskMonitorSummary | null>(null);
const [lists, setLists] = useState<Partial<Record<RiskKind, RiskIncidentPage>>>({}); const [lists, setLists] = useState<Partial<Record<RiskKind, RiskIncidentPage>>>({});
@@ -600,40 +597,6 @@ export default function RiskMonitorPage() {
[lists, loadAll, message, modal], [lists, loadAll, message, modal],
); );
const addToWhitelist = useCallback(
(row: RiskIncidentItem) => {
const isCompare = row.kind === 'compare';
const subjectValue = isCompare ? row.phone : row.subject_id;
if (!isCompare && subjectValue?.startsWith('legacy-ip:')) {
void message.error(
'旧客户端未上报真实设备 ID,无法加入设备白名单,请升级客户端后重试',
);
return;
}
if (!subjectValue) {
void message.error(
isCompare
? '该风险记录没有关联手机号,暂时无法加入白名单'
: '该风险记录没有设备 ID,暂时无法加入白名单',
);
return;
}
const ruleCode: Record<RiskKind, string> = {
sms: 'risk.sms.hourly',
oneclick: 'risk.oneclick.daily',
compare: 'risk.compare.daily',
};
const params = new URLSearchParams({
create: '1',
subject_type: isCompare ? 'phone' : 'device',
subject_value: subjectValue,
rule_code: ruleCode[row.kind],
});
router.push(`/limit-whitelist?${params.toString()}`);
},
[message, router],
);
const columns = useCallback( const columns = useCallback(
(kind: RiskKind): ColumnsType<RiskIncidentItem> => { (kind: RiskKind): ColumnsType<RiskIncidentItem> => {
const actionColumn = { const actionColumn = {
@@ -641,18 +604,9 @@ export default function RiskMonitorPage() {
key: 'actions', key: 'actions',
align: 'right' as const, align: 'right' as const,
fixed: 'right' as const, fixed: 'right' as const,
width: 280, width: 180,
render: (_: unknown, row: RiskIncidentItem) => { render: (_: unknown, row: RiskIncidentItem) => {
const open = expanded.has(row.incident_id); const open = expanded.has(row.incident_id);
const whitelistUnavailableReason =
row.kind === 'compare'
? row.phone
? undefined
: '该风险记录没有关联手机号,暂时无法加入白名单'
: row.subject_id.startsWith('legacy-ip:')
? '旧客户端未上报真实设备 ID,无法加入设备白名单'
: undefined;
const canAddToWhitelist = !whitelistUnavailableReason;
return ( return (
<span className={styles.actionGroup}> <span className={styles.actionGroup}>
<Button <Button
@@ -664,20 +618,6 @@ export default function RiskMonitorPage() {
> >
{open ? '收起' : '展开'} {open ? '收起' : '展开'}
</Button> </Button>
<Tooltip
title={whitelistUnavailableReason}
>
<span>
<Button
size="small"
icon={<PlusCircleOutlined />}
disabled={!canAddToWhitelist}
onClick={() => addToWhitelist(row)}
>
</Button>
</span>
</Tooltip>
{row.status === 'open' && ( {row.status === 'open' && (
<> <>
<Button <Button
@@ -760,16 +700,7 @@ export default function RiskMonitorPage() {
actionColumn, actionColumn,
]; ];
}, },
[ [acting, copy, detailLoading, expanded, revokeRestriction, runAction, toggle],
acting,
addToWhitelist,
copy,
detailLoading,
expanded,
revokeRestriction,
runAction,
toggle,
],
); );
const cards = useMemo(() => { const cards = useMemo(() => {
+13 -84
View File
@@ -414,17 +414,23 @@ export interface FeedbackQrConfig {
updated_at: string | null; updated_at: string | null;
} }
/** 领券等候浮层的「新手引导视频配置(前 3 次用它替代广告,默认每次固定 100 金币)。 /** 领券/比价等候浮层的引导视频配置。视频分析结果均由服务端 ffprobe 生成。 */
* 后台只开放 enabled + 换片;下面几个字段接口仍返回,但页面不展示、也不回传。 */
export interface GuideVideoConfig { export interface GuideVideoConfig {
scene: 'coupon' | 'comparison'; scene: 'coupon' | 'comparison';
enabled: boolean; enabled: boolean;
video_url: string | null; // /media/guide_video/xxx.mp4;null = 未配片(浮层照旧只放广告) video_url: string | null;
max_plays: number; // 每个账号前 N 次浮层放引导视频(服务端默认 3,后台不开放调整) max_plays: number;
reward_coin: number; // 每次固定金币(服务端默认 100,播完 / 中途关闭都发) reward_coin: number;
updated_at: string | null; updated_at: string | null;
total_plays: number; // 只读统计:全站已播次数(后台不再展示) duration_ms: number | null;
granted_plays: number; // 只读统计:其中已发币次数(后台不再展示) circle_duration_ms: number | null;
circle_count: 10;
reward_per_circle: number;
video_codec: string | null;
audio_codec: string | null;
analysis_status: 'missing' | 'valid' | 'invalid';
analysis_error: string | null;
config_version: number;
} }
export interface AuditLog { export interface AuditLog {
@@ -895,80 +901,3 @@ export interface HealthTrendPoint extends HealthMetrics {
export interface HealthBreakdownRow extends HealthMetrics { export interface HealthBreakdownRow extends HealthMetrics {
key: string; // 维度值(event 名 / app_ver / oem);缺失为 "(unknown)" key: string; // 维度值(event 名 / app_ver / oem);缺失为 "(unknown)"
} }
// ===== 统一限制策略 / 白名单 =====
export type LimitSubjectType = 'phone' | 'device';
export type LimitPolicyMode =
| 'inherit'
| 'override'
| 'unlimited'
| 'suppress_alert';
export interface LimitRule {
code: string;
label: string;
group: string;
global_limit: number;
default_limit: number;
window_label: string;
subject_types: LimitSubjectType[];
allowed_modes: LimitPolicyMode[];
min_value: number;
max_value: number;
supports_reset: boolean;
alert_only: boolean;
}
export interface LimitDeviceCandidate {
device_id: string;
source: string;
source_label: string;
user_id: number | null;
username: string | null;
phone: string | null;
nickname: string | null;
device_model: string | null;
last_active_at: string;
}
export interface LimitOverride {
id: number;
subject_type: LimitSubjectType;
subject_value: string;
rule_code: string;
rule_label: string;
rule_group: string;
mode: LimitPolicyMode;
limit_value: number | null;
global_limit: number;
effective_limit: number | null;
enabled: boolean;
starts_at: string | null;
expires_at: string | null;
reset_at: string | null;
reason: string | null;
status: 'active' | 'scheduled' | 'expired' | 'disabled';
created_by_admin_id: number | null;
created_at: string;
updated_at: string;
}
export interface LimitOverrideList {
items: LimitOverride[];
total: number;
}
export interface LimitSubject {
subject_type: LimitSubjectType;
subject_value: string;
group_counts: Record<string, number>;
total_rules: number;
items: LimitOverride[];
created_at: string;
updated_at: string;
}
export interface LimitSubjectList {
items: LimitSubject[];
total: number;
}
+2 -7
View File
@@ -15,7 +15,6 @@ export function usePagedList<T>(
url: string, url: string,
filters: Record<string, unknown>, filters: Record<string, unknown>,
initialPageSize = 20, initialPageSize = 20,
offsetParam: 'cursor' | 'offset' = 'cursor',
) { ) {
const [items, setItems] = useState<T[]>([]); const [items, setItems] = useState<T[]>([]);
const [total, setTotal] = useState(0); const [total, setTotal] = useState(0);
@@ -32,11 +31,7 @@ export function usePagedList<T>(
requestSeq.current = seq; requestSeq.current = seq;
setLoading(true); setLoading(true);
try { try {
const params = { const params = { ...JSON.parse(filtersKey), limit: ps, cursor: (p - 1) * ps };
...JSON.parse(filtersKey),
limit: ps,
[offsetParam]: (p - 1) * ps,
};
const { data } = await api.get<CursorPage<T>>(url, { params }); const { data } = await api.get<CursorPage<T>>(url, { params });
if (requestSeq.current !== seq) return; // 丢弃过期响应(快速切页/筛选) if (requestSeq.current !== seq) return; // 丢弃过期响应(快速切页/筛选)
setItems(data.items); setItems(data.items);
@@ -45,7 +40,7 @@ export function usePagedList<T>(
if (requestSeq.current === seq) setLoading(false); if (requestSeq.current === seq) setLoading(false);
} }
}, },
[url, filtersKey, offsetParam], [url, filtersKey],
); );
// 筛选变化:回第 1 页重载 // 筛选变化:回第 1 页重载
+8 -8
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# 一键启动傻瓜比价本地联调:用户侧 API(8770) + 运营后台 API(8771) + 运营后台前端(3001)。 # 一键启动傻瓜比价本地联调:用户侧 API(8772) + 运营后台 API(8773) + 运营后台前端(3002)。
# 跨平台:Windows(Git Bash)与 macOS 通用。停止用 ./stop.sh。 # 跨平台:Windows(Git Bash)与 macOS 通用。停止用 ./stop.sh。
# #
# 路径相对本脚本推导(本脚本在 shaguabijia-admin-web 内,server 是它的同级目录), # 路径相对本脚本推导(本脚本在 shaguabijia-admin-web 内,server 是它的同级目录),
@@ -93,19 +93,19 @@ start_uvicorn() {
} }
# 用户侧绑 0.0.0.0,真机/模拟器可经局域网 IP 访问;后台只本机用,绑 127.0.0.1 # 用户侧绑 0.0.0.0,真机/模拟器可经局域网 IP 访问;后台只本机用,绑 127.0.0.1
start_uvicorn "user-api" "app.main:app" 8770 "0.0.0.0" start_uvicorn "user-api" "app.main:app" 8772 "0.0.0.0"
start_uvicorn "admin-api" "app.admin.main:admin_app" 8771 "127.0.0.1" start_uvicorn "admin-api" "app.admin.main:admin_app" 8773 "127.0.0.1"
if port_in_use 3001; then if port_in_use 3002; then
echo "↺ admin-web 已在 :3001(跳过)" echo "↺ admin-web 已在 :3002(跳过)"
else else
cd "$WEB_DIR" || exit 1 cd "$WEB_DIR" || exit 1
nohup npm run dev > "$LOG_DIR/admin-web.log" 2>&1 & nohup npm run dev > "$LOG_DIR/admin-web.log" 2>&1 &
echo "$!" > "$LOG_DIR/admin-web.pid" echo "$!" > "$LOG_DIR/admin-web.pid"
echo "✅ admin-web 起在 :3001 (日志 $LOG_DIR/admin-web.log)" echo "✅ admin-web 起在 :3002 (日志 $LOG_DIR/admin-web.log)"
fi fi
echo "" echo ""
echo "⏳ 前端首次编译要几秒,然后开 👉 http://localhost:3001 (admin / admin12345)" echo "⏳ 前端首次编译要几秒,然后开 👉 http://localhost:3002 (admin / admin12345)"
echo " 用户侧 API: http://127.0.0.1:8770 | 后台 API: http://127.0.0.1:8771/admin/docs" echo " 用户侧 API: http://127.0.0.1:8772 | 后台 API: http://127.0.0.1:8773/admin/docs"
echo " 看日志: tail -f $LOG_DIR/admin-web.log | 停止: bash \"$SCRIPT_DIR/stop.sh\"" echo " 看日志: tail -f $LOG_DIR/admin-web.log | 停止: bash \"$SCRIPT_DIR/stop.sh\""
+3 -3
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# 停止 start.sh 起的三个服务:用户侧 API(8770) + 后台 API(8771) + 前端(3001)。 # 停止 start.sh 起的三个服务:用户侧 API(8772) + 后台 API(8773) + 前端(3002)。
# 双保险:先按 start.sh 落的 PID 文件杀,再按端口兜底(Windows 走 PowerShell,mac 走 lsof)。 # 双保险:先按 start.sh 落的 PID 文件杀,再按端口兜底(Windows 走 PowerShell,mac 走 lsof)。
# (PG 若由 brew 自启,本脚本不停它。) # (PG 若由 brew 自启,本脚本不停它。)
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -32,8 +32,8 @@ kill_port() {
fi fi
} }
for port in 8770 8771 3001; do for port in 8772 8773 3002; do
kill_port "$port" kill_port "$port"
done done
echo "✅ 已停止(用户侧 8770 / 后台 8771 / 前端 3001)。" echo "✅ 已停止(用户侧 8772 / 后台 8773 / 前端 3002)。"