Refactor (#219)

* update: server-v2 * updata: format
vesoft-inc · May 26, 2022 · 23567a9 · 23567a9
1 parent fd5af80
commit 23567a9
Show file tree

Hide file tree

Showing 57 changed files with 325 additions and 237 deletions.
diff --git a/app/utils/http.ts b/app/utils/http.ts
@@ -43,8 +43,11 @@ service.interceptors.request.use(config => {
 
 service.interceptors.response.use(
   (response: any) => {
-    const isExecReq = /api-nebula\/db\/(exec|batchExec)$/.test(response.config?.url);
-    return isExecReq ? response.data?.data : response.data;
+    // const isExecReq = /api-nebula\/db\/(exec|batchExec)$/.test(response.config?.url);
+    if (response.data?.data?.data) {
+      response.data.data = response.data.data.data;
+    }
+    return response.data;
   },
   (error: any) => {
     if (error.response?.status) {

diff --git a/server-v2/Makefile b/server-v2/Makefile
@@ -67,7 +67,7 @@ $(GOBIN)/goctl:
 	$(call go-get-tool,$(GOBIN)/goctl,github.com/zeromicro/go-zero/tools/goctl@v1.3.2)
 
 $(GOBIN)/modelconst-gen:
-	$(call go-get-tool,$(GOBIN)/modelconst-gen,github.com/vesoft-inc/nebula-studio/server/tools/modelconst-gen)
+	$(call go-get-tool,$(GOBIN)/modelconst-gen,github.com/vesoft-inc/nebula-studio/server-v2/tools/modelconst-gen)
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 define go-get-tool

diff --git a/server-v2/api/studio/.goctl/api/handler.tpl b/server-v2/api/studio/.goctl/api/handler.tpl
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	{{if .HasRequest}}"github.com/vesoft-inc/go-pkg/validator"
-	"github.com/vesoft-inc/nebula-studio/server/api/studio/pkg/ecode"
+	"github.com/vesoft-inc/nebula-studio/server-v2/api/studio/pkg/ecode"
 
 	{{end}}{{if .HasRequest}}"github.com/zeromicro/go-zero/rest/httpx"{{end}}
 	{{.ImportPackages}}

diff --git a/server-v2/api/studio/etc/studio-api.yaml b/server-v2/api/studio/etc/studio-api.yaml
@@ -1,6 +1,6 @@
 Name: studio-api
 Host: 0.0.0.0
-Port: 7002
+Port: 9000
 MaxBytes: 1073741824
 Debug:
   Enable: false

diff --git a/server-v2/api/studio/internal/common/utils.go b/server-v2/api/studio/internal/common/utils.go
@@ -7,10 +7,13 @@ import (
 
 var (
 	ReserveRequestRoutes = []string{
+		"/api-nebula/db/disconnect",
 		"/api/files",
 		"/api/import-tasks",
 	}
 	ReserveResponseRoutes = []string{
+		"/api-nebula/db/connect",
+		"/api-nebula/db/disconnect",
 		"/api/import-tasks",
 	}
 	IgnoreHandlerBodyPatterns = []*regexp.Regexp{

diff --git a/server-v2/api/studio/internal/handler/file/filedestroyhandler.go b/server-v2/api/studio/internal/handler/file/filedestroyhandler.go
diff --git a/server-v2/api/studio/internal/handler/file/filesindexhandler.go b/server-v2/api/studio/internal/handler/file/filesindexhandler.go
diff --git a/server-v2/api/studio/internal/handler/file/fileuploadhandler.go b/server-v2/api/studio/internal/handler/file/fileuploadhandler.go
diff --git a/server-v2/api/studio/internal/handler/gateway/batchexecngqlhandler.go b/server-v2/api/studio/internal/handler/gateway/batchexecngqlhandler.go
diff --git a/server-v2/api/studio/internal/handler/gateway/connecthandler.go b/server-v2/api/studio/internal/handler/gateway/connecthandler.go
diff --git a/server-v2/api/studio/internal/handler/gateway/disonnecthandler.go b/server-v2/api/studio/internal/handler/gateway/disonnecthandler.go
diff --git a/server-v2/api/studio/internal/handler/gateway/execngqlhandler.go b/server-v2/api/studio/internal/handler/gateway/execngqlhandler.go
diff --git a/server-v2/api/studio/internal/handler/health/gethandler.go b/server-v2/api/studio/internal/handler/health/gethandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/createimporttaskhandler.go b/server-v2/api/studio/internal/handler/importtask/createimporttaskhandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/deleteimporttaskhandler.go b/server-v2/api/studio/internal/handler/importtask/deleteimporttaskhandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/downloadconfighandler.go b/server-v2/api/studio/internal/handler/importtask/downloadconfighandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/downloadlogshandler.go b/server-v2/api/studio/internal/handler/importtask/downloadlogshandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/getimporttaskhandler.go b/server-v2/api/studio/internal/handler/importtask/getimporttaskhandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/getimporttasklognameshandler.go b/server-v2/api/studio/internal/handler/importtask/getimporttasklognameshandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/getmanyimporttaskhandler.go b/server-v2/api/studio/internal/handler/importtask/getmanyimporttaskhandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/getmanyimporttaskloghandler.go b/server-v2/api/studio/internal/handler/importtask/getmanyimporttaskloghandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/getworkingdirhandler.go b/server-v2/api/studio/internal/handler/importtask/getworkingdirhandler.go
diff --git a/server-v2/api/studio/internal/handler/importtask/stopimporttaskhandler.go b/server-v2/api/studio/internal/handler/importtask/stopimporttaskhandler.go
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
@@ -3,10 +3,10 @@ package file
 import (
 	"context"
 
-	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/service"
+	"github.com/vesoft-inc/nebula-studio/server-v2/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"
+	"github.com/vesoft-inc/nebula-studio/server-v2/api/studio/internal/svc"
+	"github.com/vesoft-inc/nebula-studio/server-v2/api/studio/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

diff --git a/server-v2/api/studio/internal/logic/file/filesindexlogic.go b/server-v2/api/studio/internal/logic/file/filesindexlogic.go
@@ -3,10 +3,9 @@ package file
 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"
+	"github.com/vesoft-inc/nebula-studio/server-v2/api/studio/internal/service"
+	"github.com/vesoft-inc/nebula-studio/server-v2/api/studio/internal/svc"
+	"github.com/vesoft-inc/nebula-studio/server-v2/api/studio/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )