fix: v0.1.2

feat: login page && auth required
todo: file dir cleanup

.dockerignore

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

.gitea/workflows/build.yaml

@@ -5,7 +5,7 @@ on:
       - 'v*'
 
 jobs:
-  build ushare:
+  build and run u-api:
     runs-on: tencent-sg
     steps:
       - name: prepare enviroment
@@ -17,6 +17,9 @@ 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 }}"
 
@@ -26,29 +29,14 @@ jobs:
           ${{ secrets.DOCKER_CONFIG }}
           EOF
 
-      - name: print work dir and files
-        run: pwd & ls -alsh .
-
-      - name: build image by docker build
-        run: docker build -t gitea.loveuer.com/loveuer/build/ushare:${{ gitea.ref_name }} .
-
-      - name: login repository
-        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
+      - name: build by kaniko in docker
+        run: |
+          docker run --rm -v $(pwd):/workspace \
+            -v $(pwd)/.docker.config.json:/kaniko/.docker/config.json:ro \
+            gcr.io/kaniko-project/executor:latest \
+            '-f /workspace/Dockerfile' \
+            '-d "gitea.loveuer.com/loveuer/build/ushare:${{ gitea.ref_name }}"' \
+            '--single-snapshot'
 
   clean:
     if: always()

Dockerfile

@@ -27,12 +27,9 @@ 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
 
 # 启动服务
-ENTRYPOINT ["entrypoint.sh"]
+CMD sh -c "ushare & nginx -g 'daemon off;'"

deployment/entrypoint.sh

@@ -1,35 +0,0 @@
-#!/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

internal/controller/meta.go

@@ -104,10 +104,6 @@ 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 {
@@ -135,25 +131,14 @@ 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
 					}
@@ -179,16 +164,12 @@ func (m *meta) Start(ctx context.Context) {
 
 					code := strings.TrimPrefix(name, ".meta.")
 
-					if now.Sub(time.UnixMilli(mi.CreatedAt)) > duration {
+					if now.Sub(time.UnixMilli(mi.CreatedAt)) > 24*time.Hour {
 
 						log.Debug("controller.meta: file out of date, code = %s, user_key = %s", code, mi.Uploader)
 
-						if err = os.RemoveAll(opt.FilePath(code)); err != nil {
-							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())
-						}
+						os.RemoveAll(opt.FilePath(code))
+						os.RemoveAll(path)
 
 						m.Lock()
 						delete(m.m, code)

internal/opt/opt.go

@@ -11,7 +11,6 @@ type config struct {
 	Address  string
 	DataPath string
 	Auth     string
-	CleanInterval int
 }
 
 var (

main.go

@@ -7,7 +7,6 @@ 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"
 )
@@ -17,12 +16,11 @@ 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)
-		tool.TablePrinter(opt.Cfg)
+		log.Debug("start server with debug mode")
 	}
 }