merge: 合并远程 A2 告警引擎分布式安全更新,保留本地日志中心等最新改动

This commit is contained in:
Logan committed 2026-06-26 23:19:42 +08:00
commit 23e9e3da62
137 files changed
+947 -611

No files matched your search

@@ -24,6 +24,7 @@ import {
Loader2,
} from 'lucide-react';
import { regionApi, serverApi, credentialApi } from '@/api';
import type { JsonData } from '@/types/common';
interface RegionOption {
id: string;
@@ -116,7 +117,7 @@ export function ExcelServerImport({ open, onClose }: ExcelServerImportProps) {
const [regions, setRegions] = useState<RegionOption[]>([]);
const [isImporting, setIsImporting] = useState(false);
// 凭据选择 // Logan.Li
const [credentials, setCredentials] = useState<any[]>([]);
const [credentials, setCredentials] = useState<JsonData[]>([]);
const [selectedCredentialId, setSelectedCredentialId] = useState<string>('');
const [defaultSshPort, setDefaultSshPort] = useState('22');
@@ -132,7 +133,7 @@ export function ExcelServerImport({ open, onClose }: ExcelServerImportProps) {
]);
if (cancelled) return;
const list = regionResp?.list ?? [];
setRegions(list.map(( r: any) => ({
setRegions(list.map((r: JsonData) => ({
id: String(r.id ?? ''),
name: r.name ?? '',
code: r.code ?? '',
@@ -363,7 +364,7 @@ export function ExcelServerImport({ open, onClose }: ExcelServerImportProps) {
className="w-full px-3 py-2 bg-[var(--dg-bg-secondary)] border border-[var(--dg-border)] rounded-md text-[var(--dg-text-primary)] text-sm"
>
<option value="">不使用凭据(后续手动配置)</option>
{credentials.map(( c: any) => (
{credentials.map((c: JsonData) => (
<option key={c.id} value={String(c.id)}>
{c.type === 'ssh_key' ? '🔑' : c.type === 'api_token' ? '🌐' : '🔒'} {c.name} ({c.type === 'ssh_key' ? 'SSH密钥' : c.type === 'api_token' ? 'API Token' : '密码'})
</option>
@@ -27,6 +27,7 @@ import {
} from 'lucide-react';
import { cn } from '@/lib/utils';
import { serverApi } from '@/api';
import type { JsonData } from '@/types/common';
interface FileItem {
name: string;
@@ -70,7 +71,7 @@ export function ServerFileBrowser({ open, onOpenChange, serverId, serverName }:
setLoading(true);
setError('');
try {
const resp = await serverApi.listFiles(serverId, path) as any;
const resp = await serverApi.listFiles(serverId, path) as JsonData;
const data = resp?.data || resp;
setItems(data.items || []);
setBreadcrumbs(data.breadcrumbs || []);
@@ -95,7 +96,7 @@ export function ServerFileBrowser({ open, onOpenChange, serverId, serverName }:
try {
await serverApi.downloadFile(serverId, filePath);
} catch (err) {
setError('下载失败: ' + ((err as any)?.message || ''));
setError('下载失败: ' + ((err as JsonData)?.message || ''));
}
};
@@ -27,6 +27,7 @@ import {
import { Server, ChevronDown, Loader2, Save, Key, Shield } from 'lucide-react';
import { useNavigate } from 'react-router-dom';
import { credentialApi } from '@/api';
import type { JsonData } from '@/types/common';
// 表单数据结构
export interface ServerFormData {
@@ -110,7 +111,7 @@ export function ServerForm({
useEffect(() => {
if (open) {
credentialApi.list()
.then(( res: any) => {
.then((res: JsonData) => {
const list = Array.isArray(res) ? res : (res?.list || res?.data || []);
setCredentials(list);
})
@@ -48,6 +48,7 @@ import { useUserStore } from '@/store';
import { CloudServerImport } from './CloudServerImport';
import { TerminalDialog } from './TerminalDialog';
import { ServerFileBrowser } from './ServerFileBrowser';
import type { JsonData } from '@/types/common';
import { ExcelServerImport } from './ExcelServerImport';
import { ServerForm, EMPTY_FORM, type ServerFormData } from './ServerForm';
import { getTags } from './serverHelpers';
@@ -95,12 +96,12 @@ export function ServerManager() {
const servers = data?.list ?? [];
const total = data?.total ?? 0;
const openTerminal = ( server: any) => {
const openTerminal = (server: JsonData) => {
setTerminalServer({ id: server.id, name: server.hostname, ip: server.ip, hasAuth: server.has_auth ?? true });
setTerminalOpen(true);
};
const openFileBrowser = ( server: any) => {
const openFileBrowser = (server: JsonData) => {
setFileBrowserServer({ id: server.id, name: server.hostname });
setFileBrowserOpen(true);
};
@@ -258,7 +259,7 @@ export function ServerManager() {
};
// 打开编辑表单
const openEditForm = ( server: any) => {
const openEditForm = (server: JsonData) => {
setEditingId(server.id);
setFormData({
hostname: server.hostname || '',
@@ -1,8 +1,9 @@
// 服务器统计条 — 紧凑型替代 4 张大卡片
import { StatStrip } from '@/components/ui/stat-strip';
import type { JsonData } from '@/types/common';
interface ServerStatsStripProps {
servers: any[];
servers: JsonData[];
}
export function ServerStatsStrip({ servers }: ServerStatsStripProps) {
@@ -15,14 +15,15 @@ import { TableCell, TableRow } from '@/components/ui/table';
import { Edit, MoreHorizontal, Server as ServerIcon, Terminal, Trash2, Network, HardDrive, FolderOpen } from 'lucide-react';
import { getStatusBadge, getTags, getUsageColor } from './serverHelpers';
import { usePermission } from '@/hooks/usePermission';
import type { JsonData } from '@/types/common';
interface ServerTableRowProps {
server: any;
server?: JsonData;
selected: boolean;
onToggleSelect: (id: string) => void;
onOpenTerminal: ( server: any) => void;
onOpenEdit: ( server: any) => void;
onOpenFiles?: ( server: any) => void;
onOpenTerminal: (server: JsonData) => void;
onOpenEdit: (server: JsonData) => void;
onOpenFiles?: (server: JsonData) => void;
onDelete: (id: string) => void;
}
@@ -15,6 +15,7 @@ import { attachTerminalResize, fitTerminal, mountXterm } from '@/lib/xterm-utils
import { useUserStore } from '@/store';
import { credentialApi, serverCredentialApi } from '@/api';
import { toast } from 'sonner';
import type { JsonData } from '@/types/common';
interface TerminalDialogProps {
open: boolean;
@@ -46,7 +47,7 @@ export function TerminalDialog({
const [fullscreen, setFullscreen] = useState(false);
// 凭据选择状态(hasAuth=false 时显示) // Logan.Li
const [credentials, setCredentials] = useState<any[]>([]);
const [credentials, setCredentials] = useState<JsonData[]>([]);
const [selectedCredId, setSelectedCredId] = useState<string>('');
const [assigning, setAssigning] = useState(false);
const [authReady, setAuthReady] = useState(hasAuth); // 认证就绪标志
@@ -54,7 +55,7 @@ export function TerminalDialog({
// 加载凭据列表
useEffect(() => {
if (!open || hasAuth) return;
credentialApi.list().then(( res: any) => setCredentials(res?.list || [])).catch(() => {});
credentialApi.list().then((res: JsonData) => setCredentials(res?.list || [])).catch(() => {});
}, [open, hasAuth]);
// 关联凭据
@@ -235,7 +236,7 @@ export function TerminalDialog({
className="w-64 px-3 py-2 bg-[var(--dg-bg-tertiary)] border border-[var(--dg-border)] rounded-md text-[var(--dg-text-primary)] text-sm"
>
<option value="">-- 选择凭据 --</option>
{credentials.map(( c: any) => (
{credentials.map((c: JsonData) => (
<option key={c.id} value={String(c.id)}>
{c.type === 'ssh_key' ? '🔑' : '🔒'} {c.name}
</option>
+6 -5
View File
@@ -31,6 +31,7 @@ import { FitAddon } from 'xterm-addon-fit';
import 'xterm/css/xterm.css';
import { serverApi } from '@/api';
import { useUserStore } from '@/store';
import type { JsonData } from '@/types/common';
interface TerminalSession {
id: string;
@@ -48,7 +49,7 @@ interface TermEntry {
}
export function WebShell() {
const [servers, setServers] = useState<any[]>([]);
const [servers, setServers] = useState<JsonData[]>([]);
const [sessions, setSessions] = useState<TerminalSession[]>([]);
const [activeSession, setActiveSession] = useState<string | null>(null);
const [selectedServer, setSelectedServer] = useState<string>('');
@@ -62,7 +63,7 @@ export function WebShell() {
const loadServers = async () => {
try {
const res: Record<string, any> = await serverApi.getServers();
const res: JsonData = await serverApi.getServers();
setServers(res?.list || []);
} catch (e) {
console.error('加载服务器列表失败:', e);
@@ -257,15 +258,15 @@ export function WebShell() {
try { entry.fit.fit(); } catch { /* noop */ }
});
observer.observe(el);
(entry as any)._observer = observer;
(entry as JsonData)._observer = observer;
} catch (e) {
console.error('打开终端失败:', e);
}
}
} else {
const entry = termsRef.current.get(sessionId);
if (entry && (entry as any)._observer) {
(entry as any)._observer.disconnect();
if (entry && (entry as JsonData)._observer) {
(entry as JsonData)._observer.disconnect();
}
containerRef.current.delete(sessionId);
}
@@ -1,9 +1,10 @@
// 服务器管理共享纯函数/常量 // Logan.Li
import { Badge } from '@/components/ui/badge';
import type { Server as ServerType } from '@/types';
import type { JsonData } from '@/types/common';
// 解析标签:后端 tags 可能是 JSON 字符串(JSON数组/对象)、逗号分隔字符串或数组 // Logan.Li
export function getTags( server: any): string[] {
export function getTags(server: JsonData): string[] {
const tags = server.tags;
if (!tags) return [];
if (Array.isArray(tags)) return tags;