Merge branch 'main' of http://113.45.157.195:3003/insiinc/leader-mail

apps/server/src/auth/auth.service.ts

@@ -24,7 +24,7 @@ export class AuthService {
     private readonly staffService: StaffService,
     private readonly jwtService: JwtService,
     private readonly sessionService: SessionService,
-  ) {}
+  ) { }
   async validateFileRequest(params: FileRequest): Promise<FileAuthResult> {
     try {
       // 基础参数验证

apps/server/src/models/resource/pipe/resource.pipeline.ts

@@ -51,7 +51,7 @@ export class ResourceProcessingPipeline {
         ResourceStatus.PROCESSED,
       );
       this.logger.log(
-        `资源 ${resource.id} 处理成功 ${JSON.stringify(currentResource.metadata)}`,
+        `资源 ${resource.id} 处理成功 ${JSON.stringify(currentResource.meta)}`,
       );
 
       return {

apps/server/src/models/resource/processor/BaseProcessor.ts

@@ -1,5 +1,5 @@
 import path, { dirname } from "path";
-import { FileMetadata, VideoMetadata, ResourceProcessor } from "../types";
+import { ResourceProcessor } from "../types";
 import { Resource, ResourceStatus, db } from "@nice/common";
 import { Logger } from "@nestjs/common";
 import fs from 'fs/promises';

apps/server/src/models/resource/processor/ImageProcessor.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 import sharp from 'sharp';
-import { FileMetadata, ImageMetadata, ResourceProcessor } from '../types';
+import { FileMetadata, ImageMetadata, ResourceDto } from '@nice/common';
 import { Resource, ResourceStatus, db } from '@nice/common';
 import { getUploadFilePath } from '@server/utils/file';
 import { BaseProcessor } from './BaseProcessor';
@@ -10,10 +10,10 @@ export class ImageProcessor extends BaseProcessor {
     super();
   }
 
-  async process(resource: Resource): Promise<Resource> {
+  async process(resource: ResourceDto): Promise<Resource> {
     const { url } = resource;
     const filepath = getUploadFilePath(url);
-    const originMeta = resource.metadata as unknown as FileMetadata;
+    const originMeta = resource.meta as unknown as FileMetadata;
     if (!originMeta.filetype?.startsWith('image/')) {
       this.logger.log(`Skipping non-image resource: ${resource.id}`);
       return resource;
@@ -47,7 +47,7 @@ export class ImageProcessor extends BaseProcessor {
       const updatedResource = await db.resource.update({
         where: { id: resource.id },
         data: {
-          metadata: {
+          meta: {
             ...originMeta,
             ...imageMeta,
           },

apps/server/src/models/resource/processor/VideoProcessor.ts

@@ -1,7 +1,6 @@
 import path, { dirname } from 'path';
 import ffmpeg from 'fluent-ffmpeg';
-import { FileMetadata, VideoMetadata, ResourceProcessor } from '../types';
+import { Resource, ResourceStatus, db, FileMetadata, VideoMetadata, ResourceDto } from '@nice/common';
-import { Resource, ResourceStatus, db } from '@nice/common';
 import { getUploadFilePath } from '@server/utils/file';
 import fs from 'fs/promises';
 import sharp from 'sharp';
@@ -11,14 +10,14 @@ export class VideoProcessor extends BaseProcessor {
   constructor() {
     super();
   }
-  async process(resource: Resource): Promise<Resource> {
+  async process(resource: ResourceDto): Promise<Resource> {
     const { url } = resource;
     const filepath = getUploadFilePath(url);
     this.logger.log(
       `Processing video for resource ID: ${resource.id}, File ID: ${url}`,
     );
 
-    const originMeta = resource.metadata as unknown as FileMetadata;
+    const originMeta = resource.meta as unknown as FileMetadata;
     if (!originMeta.filetype?.startsWith('video/')) {
       this.logger.log(`Skipping non-video resource: ${resource.id}`);
       return resource;
@@ -39,7 +38,7 @@ export class VideoProcessor extends BaseProcessor {
       const updatedResource = await db.resource.update({
         where: { id: resource.id },
         data: {
-          metadata: {
+          meta: {
             ...originMeta,
             ...videoMeta,
           },

apps/server/src/models/resource/types.ts

@@ -9,47 +9,3 @@ export interface ProcessResult {
     error?: Error
 }
 
-export interface BaseMetadata {
-    size: number
-    filetype: string
-    filename: string
-    extension: string
-    modifiedAt: Date
-}
-/**
- * 图片特有元数据接口
- */
-export interface ImageMetadata {
-    width: number;          // 图片宽度(px)
-    height: number;         // 图片高度(px)
-    compressedUrl?: string;
-    orientation?: number;   // EXIF方向信息
-    space?: string;    // 色彩空间 (如: RGB, CMYK)
-    hasAlpha?: boolean;     // 是否包含透明通道
-}
-
-/**
- * 视频特有元数据接口
- */
-export interface VideoMetadata {
-    width?: number;
-    height?: number;
-    duration?: number;
-    videoCodec?: string;
-    audioCodec?: string;
-    coverUrl?: string
-}
-
-/**
- * 音频特有元数据接口
- */
-export interface AudioMetadata {
-    duration: number;       // 音频时长(秒)
-    bitrate?: number;       // 比特率(bps)
-    sampleRate?: number;    // 采样率(Hz)
-    channels?: number;      // 声道数
-    codec?: string;         // 音频编码格式
-}
-
-
-export type FileMetadata = ImageMetadata & VideoMetadata & AudioMetadata & BaseMetadata

apps/server/src/models/staff/staff.service.ts

@@ -44,6 +44,7 @@ export class StaffService extends BaseService<Prisma.StaffDelegate> {
       ...data,
       password: await argon2.hash((data.password || '123456') as string),
     };
+   
     const result = await super.create({ ...args, data: createData });
     this.emitDataChangedEvent(result, CrudOperation.CREATED);
     return result;

apps/server/src/upload/tus.service.ts

@@ -68,13 +68,12 @@ export class TusService implements OnModuleInit {
   ) {
     try {
       const fileId = this.getFileId(upload.id);
-     
       await this.resourceService.create({
         data: {
           title: getFilenameWithoutExt(upload.metadata.filename),
           fileId, // 移除最后的文件名
           url: upload.id,
-          metadata: upload.metadata,
+          meta: upload.metadata,
           status: ResourceStatus.UPLOADING,
         },
       });

apps/web/index.html

@@ -12,7 +12,7 @@
 			VITE_APP_VERSION: "$VITE_APP_VERSION",
 		};
 	</script>
-	<title>fhmooc</title>
+	<title>首长机关信箱</title>
 </head>
 
 <body>

apps/web/src/app/auth/page.tsx

@@ -48,10 +48,10 @@ const AuthPage: React.FC = () => {
                                 transition={{ delay: 0.2, duration: 0.5 }}
                             >
                                 <div className="text-4xl text-white mb-4 font-serif">
-                                    烽火建言
+                                    首长机关信箱
                                 </div>
                                 <Paragraph className="text-lg mb-8 text-blue-100 leading-relaxed text-justify">
-                                    用真心聆听每一位官兵的心声，第一时间回应大家的关切，把战友们的烦心事当作自己的心头事，用心用情解决每一个难题，全心全意办好每一件实事，让贴心服务成为军营最温暖的底色
+                                    聆音于微，润心以答，纾难化雨，解忧惟勤
                                 </Paragraph>
                                 {showLogin && (
                                     <Button

apps/web/src/app/main/letter/list/page.tsx

@@ -1,15 +1,17 @@
 import LetterList from "@web/src/components/models/post/list/LetterList";
 import { Header } from "./Header";
+import { useSearchParams } from "react-router-dom";
 
 export default function LetterListPage() {
-
+    const [params] = useSearchParams()
+    const keyword = params.get("keyword")
     return (
         // 添加 flex flex-col 使其成为弹性布局容器
         <div className="min-h-screen shadow-elegant border-2 border-white  rounded-xl overflow-hidden bg-slate-200 flex flex-col">
             <Header />
             {/* 添加 flex-grow 使内容区域自动填充剩余空间 */}
 
-            <LetterList params={{
+            <LetterList search={keyword} params={{
                 where: {
                     isPublic: true
                 }

apps/web/src/app/main/letter/progress/page.tsx

@@ -30,7 +30,7 @@ export default function LetterProgressPage() {
 		<div
 			className=" shadow-elegant border-2 border-white rounded-xl  bg-slate-200">
 			<ProgressHeader></ProgressHeader>
-			<main className="container mx-auto p-6 flex flex-col gap-4">
+			<main className=" mx-auto p-6 flex flex-col gap-4">
 				<div className="flex gap-4">
 					<Input
 						variant="filled"

apps/web/src/app/main/letter/searh/page.tsx

@@ -1,3 +0,0 @@
-export default function LetterSearchPage() {
-    return <>Search</>
-}

apps/web/src/app/main/letter/write/page.tsx

@@ -36,6 +36,7 @@ export default function WriteLetterPage() {
                             contains: searchQuery,
                         },
                     },
+
                 ],
             },
             orderBy: {
@@ -55,9 +56,8 @@ export default function WriteLetterPage() {
     return (
         <div className="min-h-screen shadow-elegant border-2 border-white  rounded-xl bg-slate-200">
             <WriteHeader term={getTerm(termId)} />
-            <div className="container mx-auto px-4 py-8">
+            <div className=" mx-auto p-6">
-                <div className="mb-8 space-y-4">
+                <div className="mb-4 space-y-4">
-                    {/* Search and Filter Section */}
                     <div className="flex flex-col md:flex-row gap-4 items-center">
                         <DepartmentSelect
                             variant="filled"
@@ -80,7 +80,6 @@ export default function WriteLetterPage() {
                             size="large"
                         />
                     </div>
-
                     {error && (
                         <Alert
                             message="加载失败"
@@ -90,7 +89,6 @@ export default function WriteLetterPage() {
                         />
                     )}
                 </div>
-
                 <AnimatePresence>
                     {isLoading ? (
                         <div className="flex justify-center items-center py-12">

apps/web/src/components/layout/main/Footer.tsx

@@ -12,7 +12,7 @@ export function Footer() {
                             创新高地  软件小组
                         </h3>
                         <p className="text-gray-400 text-xs italic">
-                            提供全天候技术支持
+                            提供技术支持
                         </p>
                     </div>
 

apps/web/src/components/layout/main/Header.tsx

@@ -1,26 +1,27 @@
-import { Link, NavLink } from "react-router-dom";
+import { Link, NavLink, useNavigate } from "react-router-dom";
 import { memo } from "react";
 import { SearchBar } from "./SearchBar";
 import Navigation from "./navigation";
 import { useAuth } from "@web/src/providers/auth-provider";
 import { UserOutlined } from "@ant-design/icons";
 import { UserMenu } from "../element/usermenu/usermenu";
-import SineWavesCanvas from "../../animation/sine-wave";
+
-interface HeaderProps {
+export const Header = memo(function Header() {
-    onSearch?: (query: string) => void;
-}
-export const Header = memo(function Header({ onSearch }: HeaderProps) {
     const { isAuthenticated } = useAuth();
+
     return (
         <header className="sticky top-0 z-50  bg-gradient-to-br from-primary-500 to-primary-800  text-white shadow-lg">
-            <div className="container mx-auto px-4">
+            <div className=" mx-auto px-4">
-                <div className="py-3">
+                <div className="py-4">
                     <div className="flex items-center justify-between gap-4">
-                        <div className=" text-xl font-bold">烽火建言</div>
+                        <div className="">
-                        <div className="flex-grow max-w-2xl">
+                            <span className="text-xl font-bold">首长机关信箱</span>
-                            <SearchBar onSearch={onSearch} />
+                            <p className=" text-sm text-secondary-50">聆怀若水，应语如风；纾难化困，践诺成春</p>
                         </div>
-                        <div className="flex items-center gap-6">
+                        <div className="flex-grow max-w-2xl">
+                            <SearchBar />
+                        </div>
+                        <div className="flex items-center ">
                             {!isAuthenticated ? (
                                 <Link
                                     to="/auth"
@@ -33,6 +34,7 @@ focus:outline-none focus:ring-2
 focus:ring-[#8EADD4] focus:ring-offset-2
 focus:ring-offset-[#13294B]"
                                     aria-label="Login">
+
                                     <UserOutlined
                                         className="h-5 w-5 transition-transform 
     group-hover:scale-110 group-hover:rotate-12"></UserOutlined>

apps/web/src/components/layout/main/MainLayout.tsx

@@ -15,7 +15,7 @@ export function MainLayout() {
 
             {/* 主要内容区域 */}
             <main className="min-h-screen bg-slate-50">
-                <div className="container mx-auto px-4 py-8">
+                <div className=" mx-auto px-4 py-8">
                     <Outlet />
                 </div>
             </main>

apps/web/src/components/layout/main/SearchBar.tsx

@@ -1,23 +1,21 @@
 import { MagnifyingGlassIcon } from "@heroicons/react/24/outline";
 import { useState, useCallback } from "react";
 import debounce from "lodash/debounce";
+import { useNavigate } from "react-router-dom";
 
-interface SearchBarProps {
-  onSearch?: (query: string) => void;
-}
 
-export const SearchBar = ({ onSearch }: SearchBarProps) => {
+export const SearchBar = () => {
   const [query, setQuery] = useState("");
-
+  const navigate = useNavigate()
   const debouncedSearch = useCallback(
     debounce((value: string) => {
-      onSearch?.(value);
+      navigate(`/letter-list?keyword=${value}`, { replace: true })
     }, 300),
-    [onSearch]
+    []
   );
 
   return (
-    <div className="flex-1 max-w-xl mx-12">
+    <div className="flex-1 max-w-xl ">
       <div className="group relative">
         <input
           type="search"
@@ -26,12 +24,12 @@ export const SearchBar = ({ onSearch }: SearchBarProps) => {
             setQuery(e.target.value);
             debouncedSearch(e.target.value);
           }}
-          placeholder="Search letters, announcements, policies..."
+          placeholder="搜索信件..."
           className="w-full rounded-lg border border-transparent bg-[#0B1A32] 
                      px-4 py-2.5 pl-10 text-white placeholder-[#8EADD4] 
                      transition-all duration-300 focus:border-[#8EADD4] 
                      focus:outline-none focus:ring-1 focus:ring-[#8EADD4]"
-          aria-label="Search"
+          aria-label="搜索"
         />
         <MagnifyingGlassIcon
           className="absolute left-3 top-3 h-5 w-5 text-[#8EADD4] 

apps/web/src/components/models/post/detail/PostResources.tsx

@@ -4,7 +4,7 @@ import { DownloadOutlined } from "@ant-design/icons";
 import { PostDto } from "@nice/common";
 import { env } from "@web/src/env";
 import { getFileIcon } from "./utils";
-
+import { formatFileSize } from '@nice/utils';
 export default function PostResources({ post }: { post: PostDto }) {
 	const { resources } = useMemo(() => {
 		if (!post?.resources) return { resources: [] };
@@ -98,9 +98,8 @@ export default function PostResources({ post }: { post: PostDto }) {
 												文件
 											</span>
 											<span className="text-xs text-gray-400">
-												{(resource.metadata as any)
+												{resource.meta.size &&
-													.size &&
+													formatFileSize(resource.meta.size)}
-													`${((resource.metadata as any).size / 1024 / 1024).toFixed(1)}MB`}
 											</span>
 										</div>
 									</div>

apps/web/src/components/models/post/list/LetterList.tsx

@@ -8,12 +8,17 @@ import debounce from "lodash/debounce";
 import { postDetailSelect } from "@nice/common";
 export default function LetterList({
     params,
+    search = ''
 }: {
+    search?: string,
     params: NonVoid<RouterInputs["post"]["findManyWithPagination"]>;
 }) {
-	const [searchText, setSearchText] = useState("");
+    const [keyword, setKeyword] = useState<string | undefined>('');
     const [currentPage, setCurrentPage] = useState(1);
+    useEffect(() => {
 
+        setKeyword(search || '')
+    }, [search])
     const { data, isLoading } = api.post.findManyWithPagination.useQuery({
         page: currentPage,
         pageSize: params.pageSize,
@@ -21,7 +26,7 @@ export default function LetterList({
             OR: [
                 {
                     title: {
-						contains: searchText,
+                        contains: keyword,
                     },
                 },
             ],
@@ -39,7 +44,7 @@ export default function LetterList({
     const debouncedSearch = useMemo(
         () =>
             debounce((value: string) => {
-				setSearchText(value);
+                setKeyword(value);
                 setCurrentPage(1);
             }, 300),
         []
@@ -65,6 +70,7 @@ export default function LetterList({
             {/* Search Bar */}
             <div className="p-6 transition-all ">
                 <Input
+                    value={keyword}
                     variant="filled"
                     className="w-full"
                     placeholder="搜索信件标题..."
@@ -103,7 +109,7 @@ export default function LetterList({
                     <div className="flex flex-col justify-center items-center pt-6">
                         <Empty
                             description={
-								searchText ? "未找到相关信件" : "暂无信件"
+                                keyword ? "未找到相关信件" : "暂无信件"
                             }
                         />
                     </div>

apps/web/src/hooks/useTusUpload.ts

@@ -52,6 +52,7 @@ export function useTusUpload() {
 				metadata: {
 					filename: file.name,
 					filetype: file.type,
+					size: file.size as any
 				},
 				onProgress: (bytesUploaded, bytesTotal) => {
 					const progress = Number(

packages/common/prisma/schema.prisma

@@ -78,7 +78,6 @@ model Staff {
 
     phoneNumber String? @unique @map("phone_number")
 
-
     domainId String? @map("domain_id")
     deptId   String? @map("dept_id")
 
@@ -271,9 +270,7 @@ model Resource {
     type        String?   @map("type")
     fileId      String?   @unique
     url         String?
-    // 元数据
+    meta        Json?     @map("meta")
-    metadata    Json?     @map("metadata")
-    // 处理状态控制
     status      String?
     createdAt   DateTime? @default(now()) @map("created_at")
     updatedAt   DateTime? @updatedAt @map("updated_at")

packages/common/src/types.ts

@@ -130,6 +130,55 @@ export type PostComment = {
 		avatar: string;
 	};
 };
+
+export interface BaseMetadata {
+	size: number
+	filetype: string
+	filename: string
+	extension: string
+	modifiedAt: Date
+}
+/**
+ * 图片特有元数据接口
+ */
+export interface ImageMetadata {
+	width: number;          // 图片宽度(px)
+	height: number;         // 图片高度(px)
+	compressedUrl?: string;
+	orientation?: number;   // EXIF方向信息
+	space?: string;    // 色彩空间 (如: RGB, CMYK)
+	hasAlpha?: boolean;     // 是否包含透明通道
+}
+
+/**
+ * 视频特有元数据接口
+ */
+export interface VideoMetadata {
+	width?: number;
+	height?: number;
+	duration?: number;
+	videoCodec?: string;
+	audioCodec?: string;
+	coverUrl?: string
+}
+
+/**
+ * 音频特有元数据接口
+ */
+export interface AudioMetadata {
+	duration: number;       // 音频时长(秒)
+	bitrate?: number;       // 比特率(bps)
+	sampleRate?: number;    // 采样率(Hz)
+	channels?: number;      // 声道数
+	codec?: string;         // 音频编码格式
+}
+
+
+export type FileMetadata = ImageMetadata & VideoMetadata & AudioMetadata & BaseMetadata
+
+export type ResourceDto = Resource & {
+	meta: FileMetadata
+}
 export type PostDto = Post & {
 	readed: boolean;
 	liked: boolean;
@@ -139,7 +188,7 @@ export type PostDto = Post & {
 	terms: TermDto[];
 	author: StaffDto | undefined;
 	receivers: StaffDto[];
-	resources: Resource[];
+	resources: ResourceDto[];
 	perms?: {
 		delete: boolean;
 		// edit: boolean;

packages/utils/src/index.ts

@@ -21,5 +21,11 @@ export function generateUniqueId(prefix?: string): string {
     // 如果提供了前缀，则添加前缀
     return prefix ? `${prefix}_${uniquePart}` : uniquePart;
 }
+export const formatFileSize = (bytes: number) => {
+    if (bytes < 1024) return `${bytes} B`;
+    if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
+    if (bytes < 1024 * 1024 * 1024) return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+    return `${(bytes / (1024 * 1024 * 1024)).toFixed(2)} GB`;
+};
 
 export * from "./types"