From 678a149785dac858868e290600127e0ee45d5cdd Mon Sep 17 00:00:00 2001
From: longdayi <13477510+longdayilongdayi@user.noreply.gitee.com>
Date: Wed, 8 Jan 2025 00:57:37 +0800
Subject: [PATCH] 01080057

---
 Dockerfile                            | 16 ---------
 apps/server/src/upload/tus.service.ts |  4 ---
 docker-compose.example.yml            | 47 ++++++++++++++++++++-------
 packages/common/prisma/schema.prisma  |  2 --
 4 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 979066f..e36b24a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -100,19 +100,3 @@ RUN apk add --no-cache gettext
 # 暴露 80 端口
 EXPOSE 80
 
-FROM tusproject/tusd as tusd
-
-USER root
-
-# 创建一个包装脚本
-COPY <<EOF /docker-entrypoint.sh
-#!/bin/sh
-umask 000
-exec "\$@"
-EOF
-
-RUN chmod +x /docker-entrypoint.sh
-
-# 设置入口点
-ENTRYPOINT ["/docker-entrypoint.sh"]
-CMD ["tusd"]
\ No newline at end of file
diff --git a/apps/server/src/upload/tus.service.ts b/apps/server/src/upload/tus.service.ts
index 4589b61..0eea246 100644
--- a/apps/server/src/upload/tus.service.ts
+++ b/apps/server/src/upload/tus.service.ts
@@ -11,7 +11,6 @@ import { Queue } from 'bullmq';
 import { QueueJobType } from '@server/queue/types';
 import { nanoid } from 'nanoid-cjs';
 import { slugify } from 'transliteration';
-import path from 'path';
 const FILE_UPLOAD_CONFIG = {
     directory: process.env.UPLOAD_DIR,
     maxSizeBytes: 20_000_000_000, // 20GB
@@ -68,7 +67,6 @@ export class TusService implements OnModuleInit {
             await this.resourceService.create({
                 data: {
                     title: getFilenameWithoutExt(upload.metadata.filename),
-                    filename,
                     fileId, // 移除最后的文件名
                     url: upload.id,
                     metadata: upload.metadata,
@@ -103,9 +101,7 @@ export class TusService implements OnModuleInit {
                     status: ResourceStatus.UPLOADING
                 }
             });
-
             const expiredUploadCount = await this.tusServer.cleanUpExpiredUploads();
-
             this.logger.log(`Cleanup complete: ${deletedResources.count} resources and ${expiredUploadCount} uploads removed`);
         } catch (error) {
             this.logger.error('Expired uploads cleanup failed', error);
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index fded013..84eeb67 100644
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -1,5 +1,4 @@
 version: "3.8"
-
 services:
   db:
     image: postgres:latest
@@ -40,19 +39,45 @@ services:
     environment:
       - PGADMIN_DEFAULT_EMAIL=insiinc@outlook.com
       - PGADMIN_DEFAULT_PASSWORD=Letusdoit000
+  # tusd:
+  #   image: tusproject/tusd
+  #   ports:
+  #     - "8080:8080"
+  #   environment:
+  #     - AWS_REGION=cn-north-1
+  #     - AWS_ACCESS_KEY_ID=minioadmin
+  #     - AWS_SECRET_ACCESS_KEY=minioadmin
+  #   command: -verbose -s3-bucket app -s3-endpoint http://minio:9000 -hooks-http http://host.docker.internal:3000/upload/hook
+  #   volumes:
+  #     - ./volumes/tusd:/data
+  #   extra_hosts:
+  #     - "host.docker.internal:host-gateway"
+  #   depends_on:
+  #     - minio
   tusd:
     image: tusproject/tusd
     ports:
       - "8080:8080"
-    environment:
-      - AWS_REGION=cn-north-1
-      - AWS_ACCESS_KEY_ID=minioadmin
-      - AWS_SECRET_ACCESS_KEY=minioadmin
-    command: -verbose -s3-bucket app -s3-endpoint http://minio:9000
+    command: -verbose -upload-dir /data -hooks-http http://host.docker.internal:3000/upload/hook
     volumes:
-      - ./volumes/tusd:/data
-    depends_on:
-      - minio
+      - ./uploads:/data
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+  nginx:
+    image: nice-nginx:latest
+    ports:
+      - "80:80"
+    volumes:
+      - ./config/nginx/conf.d:/etc/nginx/conf.d
+      - ./config/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./uploads:/data/uploads  # tusd 上传目录
+      - ./web-dist:/usr/share/nginx/html  # 添加前端构建文件的挂载
+      - ./config/nginx/entrypoint.sh:/docker-entrypoint.sh
+    environment:
+      - SERVER_IP=host.docker.internal
+    entrypoint: ["/docker-entrypoint.sh"]
+    extra_hosts:
+      - "host.docker.internal:host-gateway" 
   redis:
       image: redis:latest
       ports:
@@ -81,7 +106,7 @@ services:
   #   environment:
   #     - VITE_APP_SERVER_IP=192.168.79.77
   #     - VITE_APP_VERSION=0.3.0
-  #     - VITE_APP_APP_NAME=fh慕课
+  #     - VITE_APP_APP_NAME=两道防线管理后台
   # server:
   #   image: td-server:latest
   #   ports:
@@ -106,4 +131,4 @@ services:
 
 networks:
   default:
-    name: defender-app
+    name: remooc
diff --git a/packages/common/prisma/schema.prisma b/packages/common/prisma/schema.prisma
index 64e3bd9..721acce 100644
--- a/packages/common/prisma/schema.prisma
+++ b/packages/common/prisma/schema.prisma
@@ -424,8 +424,6 @@ model Resource {
     title       String?   @map("title")
     description String?   @map("description")
     type        String?   @map("type")
-    // 存储信息
-    filename    String?
     fileId      String?   @unique
     url         String?
     // 元数据