Merge branch 'main' into fix-guideVideoFix

src/app/(main)/config/GuideVideoConfig.tsx

@@ -1,18 +1,7 @@
 'use client';
 
 import { useEffect, useState } from 'react';
-import {
+import { Button, Card, InputNumber, Space, Spin, Switch, Tag, Typography, Upload, message } from 'antd';
-  Button,
-  Card,
-  InputNumber,
-  Space,
-  Spin,
-  Switch,
-  Tag,
-  Typography,
-  Upload,
-  message,
-} from 'antd';
 import { DeleteOutlined, UploadOutlined } from '@ant-design/icons';
 import { api, errMsg } from '@/lib/api';
 import { canDo } from '@/lib/auth';
@@ -49,9 +38,7 @@ function SceneConfig({ scene }: { scene: Scene }) {
   const load = async () => {
     setLoading(true);
     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);
     } catch (e) {
       message.error(errMsg(e));
@@ -69,11 +56,7 @@ function SceneConfig({ scene }: { scene: Scene }) {
     try {
       const { data } = await api.patch<GuideCfg>(
         '/admin/api/guide-video',
-        {
+        { enabled, max_plays: maxPlays, reward_coin: rewardCoin },
-          enabled,
-          reward_coin: rewardCoin,
-          ...(scene === 'comparison' ? { max_plays: maxPlays } : {}),
-        },
         { params: { scene } },
       );
       sync(data);
@@ -138,20 +121,11 @@ function SceneConfig({ scene }: { scene: Scene }) {
       size="small"
       title={meta.title}
       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 }}>
-        Android 用户点击「{meta.action}」后，前 {cfg?.max_plays ?? 3}{' '}
+        Android 用户点击「{meta.action}」后，前若干次在等候浮层广告位播放本视频并奖励金币。
-        次在等候浮层广告位播放本视频并奖励金币。次数按账号、按功能分别计算；
+        次数按账号、按功能分别计算；开播即计次，播完或中途关闭均发放当次配置的金币。
-        开播即计次，播完或中途关闭均发放当次配置的金币。
-        {scene === 'coupon' &&
-          '领券引导视频的播放次数上限请在「监控审计 → 限制策略」中调整。'}
       </p>
       {loading || !cfg ? (
         <Spin style={{ display: 'block', margin: '24px 0' }} />
@@ -163,24 +137,10 @@ function SceneConfig({ scene }: { scene: Scene }) {
               <video
                 src={mediaUrl(cfg.video_url)}
                 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>
             )}
@@ -188,51 +148,22 @@ function SceneConfig({ scene }: { scene: Scene }) {
           <Space direction="vertical" size="middle" style={{ minWidth: 390 }}>
             <Space>
               <span>启用：</span>
-              <Switch
+              <Switch checked={enabled} disabled={!canEdit} onChange={setEnabled} />
-                checked={enabled}
-                disabled={!canEdit}
-                onChange={setEnabled}
-              />
               {!enabled && <Tag color="orange">已关闭</Tag>}
             </Space>
-            {scene === 'comparison' && (
+            <Space>
-              <Space>
+              <span>播放次数：</span>
-                <span>播放次数：</span>
+              <InputNumber min={0} max={50} precision={0} value={maxPlays} disabled={!canEdit} onChange={(v) => setMaxPlays(v ?? 0)} />
-                <InputNumber
+              <Text type="secondary">每个账号前 N 次（默认 3）</Text>
-                  min={0}
+            </Space>
-                  max={50}
-                  precision={0}
-                  value={maxPlays}
-                  disabled={!canEdit}
-                  onChange={(value) => setMaxPlays(value ?? 0)}
-                />
-                <Text type="secondary">每个账号前 N 次（默认 3）</Text>
-              </Space>
-            )}
             <Space>
               <span>每次金币：</span>
-              <InputNumber
+              <InputNumber min={0} max={10000} precision={0} value={rewardCoin} disabled={!canEdit} onChange={(v) => setRewardCoin(v ?? 0)} />
-                min={0}
-                max={10000}
-                precision={0}
-                value={rewardCoin}
-                disabled={!canEdit}
-                onChange={(value) => setRewardCoin(value ?? 0)}
-              />
               <Text type="secondary">默认 100</Text>
             </Space>
             <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 ? '更换视频' : '上传视频'}
                 </Button>
               </Upload>
@@ -243,17 +174,8 @@ function SceneConfig({ scene }: { scene: Scene }) {
               )}
               <Text type="secondary">MP4（H.264），≤100MB</Text>
             </Space>
-            <Button
+            <Button type="primary" loading={saving} disabled={!canEdit} onClick={save}>保存配置</Button>
-              type="primary"
+            <Text type="secondary">累计播放 {cfg.total_plays} 次，已发币 {cfg.granted_plays} 次</Text>
-              loading={saving}
-              disabled={!canEdit}
-              onClick={save}
-            >
-              保存配置
-            </Button>
-            <Text type="secondary">
-              累计播放 {cfg.total_plays} 次，已发币 {cfg.granted_plays} 次
-            </Text>
           </Space>
         </Space>
       )}

src/app/(main)/layout.tsx

@@ -4,7 +4,6 @@ import { useEffect, useRef, useState } from 'react';
 import { usePathname, useRouter } from 'next/navigation';
 import {
   BarChartOutlined,
-  ControlOutlined,
   DashboardOutlined,
   DatabaseOutlined,
   FileSearchOutlined,
@@ -106,7 +105,6 @@ const NAV_GROUPS: NavGroup[] = [
       { key: '/analytics-health', icon: <LineChartOutlined />, label: '埋点成功率' },
       { key: '/event-logs', icon: <DatabaseOutlined />, label: '埋点日志' },
       { key: '/audit-logs', icon: <FileSearchOutlined />, label: '审计日志' },
-      { key: '/limit-whitelist', icon: <ControlOutlined />, label: '限制策略' },
     ],
   },
 ];

src/app/(main)/risk-monitor/page.tsx

@@ -19,12 +19,10 @@ import {
   CopyOutlined,
   DownOutlined,
   EditOutlined,
-  PlusCircleOutlined,
   ReloadOutlined,
   RightOutlined,
 } from '@ant-design/icons';
 import dayjs from 'dayjs';
-import { useRouter } from 'next/navigation';
 import { api, errMsg } from '@/lib/api';
 import { formatUtcTime, utcDayjs } from '@/lib/format';
 import type {
@@ -71,8 +69,8 @@ type IncidentStatus = 'open' | 'blocked';
 const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }> = {
   sms: {
     min: 1,
-    max: 100000,
+    max: 5,
-    help: '统计成功下发；告警阈值与短信硬限制分别配置。',
+    help: '统计成功下发；最高5次，与现有每设备每小时发送上限一致。',
   },
   oneclick: {
     min: 1,
@@ -81,8 +79,8 @@ const RULE_LIMITS: Record<RiskKind, { min: number; max: number; help: string }>
   },
   compare: {
     min: 1,
-    max: 100000,
+    max: 100,
-    help: '同一账户按北京时间自然日累计；告警阈值与比价硬限制分别配置。',
+    help: '同一账户按北京时间自然日累计；最高100次，与比价每日上限一致。',
   },
 };
 const utcTime = (value: string | null, withDate = true) =>
@@ -273,7 +271,6 @@ function DetailTable({
 }
 
 export default function RiskMonitorPage() {
-  const router = useRouter();
   const { message, modal } = App.useApp();
   const [summary, setSummary] = useState<RiskMonitorSummary | null>(null);
   const [lists, setLists] = useState<Partial<Record<RiskKind, RiskIncidentPage>>>({});
@@ -600,40 +597,6 @@ export default function RiskMonitorPage() {
     [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(
     (kind: RiskKind): ColumnsType<RiskIncidentItem> => {
       const actionColumn = {
@@ -641,18 +604,9 @@ export default function RiskMonitorPage() {
         key: 'actions',
         align: 'right' as const,
         fixed: 'right' as const,
-        width: 280,
+        width: 180,
         render: (_: unknown, row: RiskIncidentItem) => {
           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 (
             <span className={styles.actionGroup}>
               <Button
@@ -664,20 +618,6 @@ export default function RiskMonitorPage() {
               >
                 {open ? '收起' : '展开'}
               </Button>
-              <Tooltip
-                title={whitelistUnavailableReason}
-              >
-                <span>
-                  <Button
-                    size="small"
-                    icon={<PlusCircleOutlined />}
-                    disabled={!canAddToWhitelist}
-                    onClick={() => addToWhitelist(row)}
-                  >
-                    加入白名单
-                  </Button>
-                </span>
-              </Tooltip>
               {row.status === 'open' && (
                 <>
                   <Button
@@ -760,16 +700,7 @@ export default function RiskMonitorPage() {
         actionColumn,
       ];
     },
-    [
+    [acting, copy, detailLoading, expanded, revokeRestriction, runAction, toggle],
-      acting,
-      addToWhitelist,
-      copy,
-      detailLoading,
-      expanded,
-      revokeRestriction,
-      runAction,
-      toggle,
-    ],
   );
 
   const cards = useMemo(() => {

src/lib/types.ts

@@ -414,14 +414,14 @@ export interface FeedbackQrConfig {
   updated_at: string | null;
 }
 
-/** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,默认每次固定 100 金币)。
+/** 领券等候浮层的「新手引导视频」配置(前 3 次用它替代广告,每次固定 120 金币)。
  *  后台只开放 enabled + 换片;下面几个字段接口仍返回,但页面不展示、也不回传。 */
 export interface GuideVideoConfig {
   scene: 'coupon' | 'comparison';
   enabled: boolean;
   video_url: string | null; // /media/guide_video/xxx.mp4;null = 未配片(浮层照旧只放广告)
   max_plays: number; // 每个账号前 N 次浮层放引导视频(服务端默认 3,后台不开放调整)
-  reward_coin: number; // 每次固定金币(服务端默认 100,播完 / 中途关闭都发)
+  reward_coin: number; // 每次固定金币(服务端默认 120,播完 / 中途关闭都发)
   updated_at: string | null;
   total_plays: number; // 只读统计:全站已播次数(后台不再展示)
   granted_plays: number; // 只读统计:其中已发币次数(后台不再展示)
@@ -895,80 +895,3 @@ export interface HealthTrendPoint extends HealthMetrics {
 export interface HealthBreakdownRow extends HealthMetrics {
   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;
-}

src/lib/usePagedList.ts

@@ -15,7 +15,6 @@ export function usePagedList<T>(
   url: string,
   filters: Record<string, unknown>,
   initialPageSize = 20,
-  offsetParam: 'cursor' | 'offset' = 'cursor',
 ) {
   const [items, setItems] = useState<T[]>([]);
   const [total, setTotal] = useState(0);
@@ -32,11 +31,7 @@ export function usePagedList<T>(
       requestSeq.current = seq;
       setLoading(true);
       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 });
         if (requestSeq.current !== seq) return; // 丢弃过期响应(快速切页/筛选)
         setItems(data.items);
@@ -45,7 +40,7 @@ export function usePagedList<T>(
         if (requestSeq.current === seq) setLoading(false);
       }
     },
-    [url, filtersKey, offsetParam],
+    [url, filtersKey],
   );
 
   // 筛选变化:回第 1 页重载