mody: go mod

refine the code update: make check motify api modify return values rename
vesoft-inc · May 18, 2022 · a0deae0 · a0deae0
1 parent 8aa2aa6
commit a0deae0
Show file tree

Hide file tree

Showing 31 changed files with 362 additions and 364 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,5 +23,6 @@ dist/
 !app/**/*.js
 tmp
 server/data
+server-v2/api/*/data
 assets/
 bin/
diff --git a/server-v2/api/studio/etc/studio-api.yaml b/server-v2/api/studio/etc/studio-api.yaml
@@ -8,4 +8,7 @@ Auth:
   AccessSecret: "login_secret"
   AccessExpire: 1800
 File:
-  UploadDir: "./upload/"
+  UploadDir: "./data/upload/"
+  TasksDir: "./data/tasks"
+  SqliteDbFilePath: "./data/tasks.db"
+  TaskIdPath: "./data/taskId.data"
diff --git a/server-v2/api/studio/internal/common/utils.go b/server-v2/api/studio/internal/common/utils.go
@@ -0,0 +1,29 @@
+package common
+
+import (
+	"net/http"
+	"regexp"
+	"strings"
+)
+
+func ReserveRequest(r *http.Request) bool {
+	if strings.HasPrefix(r.URL.Path, "/api/files") {
+		return true
+	}
+	if strings.HasPrefix(r.URL.Path, "/api/import-tasks") {
+		return true
+	}
+	return false
+}
+
+func ReserveResponse(r *http.Request) bool {
+	if strings.HasPrefix(r.URL.Path, "/api/import-tasks") {
+		return true
+	}
+	return false
+}
+
+func IgnoreHandlerBody(r *http.Request) bool {
+	pattern := regexp.MustCompile(`/api/import-tasks/\d/download.*`)
+	return pattern.MatchString(r.URL.Path)
+}
diff --git a/server-v2/api/studio/internal/config/config.go b/server-v2/api/studio/internal/config/config.go
@@ -1,7 +1,12 @@
 package config
 
 import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+
 	"github.com/zeromicro/go-zero/rest"
+	"go.uber.org/zap"
 )
 
 type Config struct {
@@ -15,6 +20,76 @@ type Config struct {
 	}
 
 	File struct {
-		UploadDir string
+		UploadDir        string
+		TasksDir         string
+		SqliteDbFilePath string
+		TaskIdPath       string
 	}
 }
+
+const (
+	DefaultFilesDataDir     = "data"
+	DefaultTaskIdPath       = "data/taskId.data"
+	DefaultUploadDir        = "data/upload"
+	DefaultTasksDir         = "data/tasks"
+	DefaultSqlitedbFilePath = "data/tasks.db"
+)
+
+func (c *Config) Validate() error {
+	return nil
+}
+
+func (c *Config) Complete() {
+	if c.File.TaskIdPath == "" {
+		_, err := os.Stat(DefaultFilesDataDir)
+		if os.IsNotExist(err) {
+			os.MkdirAll(DefaultFilesDataDir, 0o766)
+		}
+		abs, _ := filepath.Abs(DefaultTaskIdPath)
+		_, err = ioutil.ReadFile(abs)
+		if err != nil {
+			if os.IsNotExist(err) {
+				_, err := os.Create(abs)
+				if err != nil {
+					zap.L().Fatal("DefaultTaskIdPath Init fail", zap.Error(err))
+				} else {
+					zap.L().Fatal("DefaultTaskIdPath Init fail", zap.Error(err))
+				}
+			}
+		}
+		c.File.TaskIdPath = abs
+	}
+
+	if c.File.UploadDir == "" {
+		abs, _ := filepath.Abs(DefaultTasksDir)
+		c.File.UploadDir = abs
+		_, err := os.Stat(abs)
+		if os.IsNotExist(err) {
+			os.MkdirAll(abs, 0o776)
+		}
+	}
+
+	if c.File.TasksDir == "" {
+		abs, _ := filepath.Abs(DefaultTasksDir)
+		c.File.TasksDir = abs
+		_, err := os.Stat(abs)
+		if os.IsNotExist(err) {
+			os.MkdirAll(abs, 0o766)
+		}
+	}
+
+	if c.File.SqliteDbFilePath == "" {
+		_, err := os.Stat(DefaultFilesDataDir)
+		if os.IsNotExist(err) {
+			os.MkdirAll(DefaultFilesDataDir, 0o766)
+		}
+		abs, _ := filepath.Abs(DefaultSqlitedbFilePath)
+		c.File.SqliteDbFilePath = abs
+	}
+}
+
+func (c *Config) InitConfig() error {
+	c.Complete()
+
+	return c.Validate()
+}
diff --git a/server-v2/api/studio/internal/handler/routes.go b/server-v2/api/studio/internal/handler/routes.go
diff --git a/server-v2/api/studio/internal/logic/file/filedestroylogic.go b/server-v2/api/studio/internal/logic/file/filedestroylogic.go
@@ -26,5 +26,5 @@ func NewFileDestroyLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FileD
 }
 
 func (l *FileDestroyLogic) FileDestroy(req types.FileDestroyRequest) error {
-	return service.NewFileService(nil, l.ctx, l.svcCtx).FileDestroy(req.Name)
+	return service.NewFileService(l.ctx, l.svcCtx).FileDestroy(req.Name)
 }
diff --git a/server-v2/api/studio/internal/logic/file/filesindexlogic.go b/server-v2/api/studio/internal/logic/file/filesindexlogic.go
@@ -26,5 +26,5 @@ func NewFilesIndexLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FilesI
 }
 
 func (l *FilesIndexLogic) FilesIndex() (resp *types.FilesIndexData, err error) {
-	return service.NewFileService(nil, l.ctx, l.svcCtx).FilesIndex()
+	return service.NewFileService(l.ctx, l.svcCtx).FilesIndex()
 }
diff --git a/server-v2/api/studio/internal/logic/file/fileuploadlogic.go b/server-v2/api/studio/internal/logic/file/fileuploadlogic.go
@@ -1,7 +1,7 @@
 package file
 
 import (
-	"net/http"
+	"context"
 
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"
@@ -10,18 +10,18 @@ import (
 
 type FileUploadLogic struct {
 	logx.Logger
-	r      *http.Request
+	ctx    context.Context
 	svcCtx *svc.ServiceContext
 }
 
-func NewFileUploadLogic(r *http.Request, svcCtx *svc.ServiceContext) *FileUploadLogic {
+func NewFileUploadLogic(ctx context.Context, svcCtx *svc.ServiceContext) *FileUploadLogic {
 	return &FileUploadLogic{
-		Logger: logx.WithContext(r.Context()),
-		r:      r,
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
 		svcCtx: svcCtx,
 	}
 }
 
 func (l *FileUploadLogic) FileUpload() error {
-	return service.NewFileService(l.r, nil, l.svcCtx).FileUpload()
+	return service.NewFileService(l.ctx, l.svcCtx).FileUpload()
 }
diff --git a/server-v2/api/studio/internal/logic/importtask/createimporttasklogic.go b/server-v2/api/studio/internal/logic/importtask/createimporttasklogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/types"

diff --git a/server-v2/api/studio/internal/logic/importtask/deleteimporttasklogic.go b/server-v2/api/studio/internal/logic/importtask/deleteimporttasklogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/types"

diff --git a/server-v2/api/studio/internal/logic/importtask/downloadconfiglogic.go b/server-v2/api/studio/internal/logic/importtask/downloadconfiglogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"

diff --git a/server-v2/api/studio/internal/logic/importtask/downloadlogslogic.go b/server-v2/api/studio/internal/logic/importtask/downloadlogslogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"

diff --git a/server-v2/api/studio/internal/logic/importtask/getimporttasklogic.go b/server-v2/api/studio/internal/logic/importtask/getimporttasklogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/types"

diff --git a/server-v2/api/studio/internal/logic/importtask/getimporttasklognameslogic.go b/server-v2/api/studio/internal/logic/importtask/getimporttasklognameslogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/types"

diff --git a/server-v2/api/studio/internal/logic/importtask/getmanyimporttasklogic.go b/server-v2/api/studio/internal/logic/importtask/getmanyimporttasklogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/types"

diff --git a/server-v2/api/studio/internal/logic/importtask/getmanyimporttaskloglogic.go b/server-v2/api/studio/internal/logic/importtask/getmanyimporttaskloglogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"

diff --git a/server-v2/api/studio/internal/logic/importtask/stopimporttasklogic.go b/server-v2/api/studio/internal/logic/importtask/stopimporttasklogic.go
@@ -2,6 +2,7 @@ package importtask
 
 import (
 	"context"
+
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
 
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"

diff --git a/server-v2/api/studio/internal/service/file.go b/server-v2/api/studio/internal/service/file.go
@@ -48,22 +48,6 @@ type (
 	}
 )
 
-func NewFileService(r *http.Request, ctx context.Context, svcCtx *svc.ServiceContext) FileService {
-	if r != nil {
-		return &fileService{
-			Logger: logx.WithContext(r.Context()),
-			r:      r,
-			svcCtx: svcCtx,
-		}
-	} else {
-		return &fileService{
-			Logger: logx.WithContext(ctx),
-			ctx:    ctx,
-			svcCtx: svcCtx,
-		}
-	}
-}
-
 func NewFileService(ctx context.Context, svcCtx *svc.ServiceContext) FileService {
 	return &fileService{
 		Logger: logx.WithContext(ctx),
@@ -238,7 +222,7 @@ func checkCharset(file *multipart.FileHeader) (string, error) {
 func changeFileCharset2UTF8(filePath string, charSet string) error {
 	fileUTF8Path := filePath + "-copy"
 	err := func() error {
-		file, err := os.OpenFile(filePath, os.O_RDONLY, 0666)
+		file, err := os.OpenFile(filePath, os.O_RDONLY, 0o666)
 		if err != nil {
 			zap.L().Warn("open file fail", zap.Error(err))
 			return err
@@ -251,7 +235,7 @@ func changeFileCharset2UTF8(filePath string, charSet string) error {
 			return noCharsetErr
 		}
 		decodeReader := decoder.NewReader(reader)
-		fileUTF8, err := os.OpenFile(fileUTF8Path, os.O_RDONLY|os.O_CREATE|os.O_WRONLY, 0666)
+		fileUTF8, err := os.OpenFile(fileUTF8Path, os.O_RDONLY|os.O_CREATE|os.O_WRONLY, 0o666)
 		if err != nil {
 			return err
 		}