fix: v0.1.5

1. add nginx proxy headers

.dockerignore

@@ -1,2 +1,3 @@
-node_modules
+frontend/node_modules
-dist
+dist
+frontend/dist

.gitea/workflows/build.yaml

@@ -5,7 +5,7 @@ on:
       - 'v*'
 
 jobs:
-  build and run u-api:
+  build ushare:
     runs-on: tencent-sg
     steps:
       - name: prepare enviroment
@@ -17,9 +17,6 @@ jobs:
       - name: print operator
         run: whoami
 
-      - name: print work dir and files
-        run: pwd & ls -alsh .
-
       - name: print tag name
         run: echo "Tag name = ${{ gitea.ref_name }}"
 
@@ -29,14 +26,29 @@ jobs:
           ${{ secrets.DOCKER_CONFIG }}
           EOF
 
-      - name: build by kaniko in docker
+      - name: print work dir and files
-        run: |
+        run: pwd & ls -alsh .
-          docker run --rm -v $(pwd):/workspace \
+
-            -v $(pwd)/.docker.config.json:/kaniko/.docker/config.json:ro \
+      - name: build image by docker build
-            gcr.io/kaniko-project/executor:latest \
+        run: docker build -t gitea.loveuer.com/loveuer/build/ushare:${{ gitea.ref_name }} .
-            '-f /workspace/Dockerfile' \
+
-            '-d "gitea.loveuer.com/loveuer/build/ushare:${{ gitea.ref_name }}"' \
+      - name: login repository
-            '--single-snapshot'
+        run: echo ${{ secrets.DOCKER_REPOSITORY_PASSWORD }} | docker login --username loveuer --password-stdin gitea.loveuer.com/loveuer
+
+      - name: push image to repository
+        run: docker push gitea.loveuer.com/loveuer/build/ushare:${{ gitea.ref_name }}
+
+#      - name: build by kaniko in docker
+#        run: |
+#          docker run --rm -v $(pwd):/workspace \
+#            -v $(pwd)/.docker.config.json:/kaniko/.docker/config.json:ro \
+#            alpine:latest \
+#            ls -alsh /workspace
+#            gcr.io/kaniko-project/executor:latest \
+#            --dockerfile=/workspace/Dockerfile \
+#            --context=/workspace \
+#            --destination=gitea.loveuer.com/loveuer/build/u-api:${{ gitea.ref_name }} \
+#            --single-snapshot
 
   clean:
     if: always()

Dockerfile

@@ -27,9 +27,12 @@ COPY --from=backend-builder /app/ushare /usr/local/bin/ushare
 # 配置 Nginx
 RUN rm /etc/nginx/conf.d/default.conf
 COPY deployment/nginx.conf /etc/nginx/conf.d
+COPY deployment/entrypoint.sh /usr/local/bin/entrypoint.sh
+
+RUN chmod +x /usr/local/bin/entrypoint.sh
 
 # 开放端口
 EXPOSE 80
 
 # 启动服务
-CMD sh -c "ushare & nginx -g 'daemon off;'"
+ENTRYPOINT ["entrypoint.sh"]

deployment/entrypoint.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+set -e
+
+# 启动后端服务（带参数后台运行）
+echo "启动后端服务，参数: $@"
+ushare "$@" &
+BACKEND_PID=$!
+
+# 定义优雅关闭函数
+graceful_shutdown() {
+    echo "接收到终止信号，开始优雅关闭..."
+
+    # 先关闭 Nginx
+    echo "关闭 Nginx..."
+    nginx -s quit 2>/dev/null || kill -TERM $NGINX_PID 2>/dev/null
+
+    # 关闭后端服务
+    echo "关闭后端服务 PID $BACKEND_PID..."
+    kill -TERM $BACKEND_PID 2>/dev/null
+
+    # 等待进程终止
+    wait $BACKEND_PID $NGINX_PID 2>/dev/null
+    exit 0
+}
+
+# 捕获系统信号
+trap 'graceful_shutdown' SIGTERM SIGINT
+
+# 启动 Nginx（前台运行）
+echo "启动 Nginx..."
+nginx -g "daemon off;" &
+NGINX_PID=$!
+
+# 等待所有后台进程
+wait $BACKEND_PID $NGINX_PID

deployment/nginx.conf

@@ -18,5 +18,10 @@ server {
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_read_timeout 3600s;
+        proxy_send_timeout 3600s;
+        send_timeout 3600s;
+        proxy_buffering off;
+        gzip off;
     }
 }

internal/controller/meta.go

@@ -104,6 +104,10 @@ func (m *meta) Start(ctx context.Context) {
 	ticker := time.NewTicker(time.Minute)
 	m.ctx = ctx
 
+	if err := os.MkdirAll(opt.Cfg.DataPath, 0644); err != nil {
+		log.Fatal("controller.MetaManager.Start: mkdir datapath failed, path = %s, err = %s", opt.Cfg.DataPath, err.Error())
+	}
+
 	// 清理 2 分钟内没有继续上传的 part
 	go func() {
 		for {
@@ -131,14 +135,25 @@ func (m *meta) Start(ctx context.Context) {
 
 	// 清理一天前的文件
 	go func() {
+		if opt.Cfg.CleanInterval <= 0 {
+			log.Warn("meta.Clean: no clean interval set, plz clean manual!!!")
+			return
+		}
+
 		ticker := time.NewTicker(5 * time.Minute)
+		duration := time.Duration(opt.Cfg.CleanInterval) * time.Hour
 
 		for {
 			select {
 			case <-ctx.Done():
 				return
 			case now := <-ticker.C:
+				//log.Debug("meta.Clean: 开始清理过期文件 = %v", duration)
 				_ = filepath.Walk(opt.Cfg.DataPath, func(path string, info os.FileInfo, err error) error {
+					if info == nil {
+						return nil
+					}
+
 					if info.IsDir() {
 						return nil
 					}
@@ -164,12 +179,16 @@ func (m *meta) Start(ctx context.Context) {
 
 					code := strings.TrimPrefix(name, ".meta.")
 
-					if now.Sub(time.UnixMilli(mi.CreatedAt)) > 24*time.Hour {
+					if now.Sub(time.UnixMilli(mi.CreatedAt)) > duration {
 
 						log.Debug("controller.meta: file out of date, code = %s, user_key = %s", code, mi.Uploader)
 
-						os.RemoveAll(opt.FilePath(code))
+						if err = os.RemoveAll(opt.FilePath(code)); err != nil {
-						os.RemoveAll(path)
+							log.Warn("meta.Clean: remove file failed, file = %s, err = %s", opt.FilePath(code), err.Error())
+						}
+						if err = os.RemoveAll(path); err != nil {
+							log.Warn("meta.Clean: remove file failed, file = %s, err = %s", path, err.Error())
+						}
 
 						m.Lock()
 						delete(m.m, code)

internal/opt/opt.go

@@ -7,10 +7,11 @@ import (
 )
 
 type config struct {
-	Debug    bool
+	Debug         bool
-	Address  string
+	Address       string
-	DataPath string
+	DataPath      string
-	Auth     string
+	Auth          string
+	CleanInterval int
 }
 
 var (

main.go

@@ -7,6 +7,7 @@ import (
 	"github.com/loveuer/ushare/internal/api"
 	"github.com/loveuer/ushare/internal/controller"
 	"github.com/loveuer/ushare/internal/opt"
+	"github.com/loveuer/ushare/internal/pkg/tool"
 	"os/signal"
 	"syscall"
 )
@@ -16,11 +17,12 @@ func init() {
 	flag.StringVar(&opt.Cfg.Address, "address", "0.0.0.0:9119", "")
 	flag.StringVar(&opt.Cfg.DataPath, "data", "/data", "")
 	flag.StringVar(&opt.Cfg.Auth, "auth", "", "auth required(admin, password)")
+	flag.IntVar(&opt.Cfg.CleanInterval, "clean", 24, "清理文件的周期, 单位: 小时, 0 则表示不自动清理")
 	flag.Parse()
 
 	if opt.Cfg.Debug {
 		log.SetLogLevel(log.LogLevelDebug)
-		log.Debug("start server with debug mode")
+		tool.TablePrinter(opt.Cfg)
 	}
 }