feat: batchExec

config/webpack.prod.js

@@ -13,7 +13,7 @@ const publicConfig = {
     path: path.join(__dirname, '../dist/'),
     filename: '[name].[chunkhash].js',
     chunkFilename: '[name].[contenthash].js',
-    publicPath: '/assets/',
+    publicPath: '/',
   },
   module: {
     rules: [

server-v2/api/studio/internal/logic/gateway/batchexecngqllogic.go

@@ -0,0 +1,29 @@
+package gateway
+
+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/zeromicro/go-zero/core/logx"
+)
+
+type BatchExecNGQLLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewBatchExecNGQLLogic(ctx context.Context, svcCtx *svc.ServiceContext) BatchExecNGQLLogic {
+	return BatchExecNGQLLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+func (l *BatchExecNGQLLogic) BatchExecNGQL(req types.BatchExecNGQLParams) (*types.AnyResponse, error) {
+	return service.NewGatewayService(l.ctx, l.svcCtx).BatchExecNGQL(&req)
+}

server-v2/api/studio/internal/service/gateway.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"context"
+	"strings"
 
 	"github.com/vesoft-inc/nebula-http-gateway/ccore/nebula/gateway/dao"
 	"github.com/vesoft-inc/nebula-studio/server/api/studio/internal/svc"
@@ -16,6 +17,7 @@ var _ GatewayService = (*gatewayService)(nil)
 type (
 	GatewayService interface {
 		ExecNGQL(request *types.ExecNGQLParams) (*types.AnyResponse, error)
+		BatchExecNGQL(request *types.BatchExecNGQLParams) (*types.AnyResponse, error)
 		ConnectDB(request *types.ConnectDBParams) (*types.ConnectDBResult, error)
 		DisconnectDB(request *types.DisconnectDBParams) (*types.AnyResponse, error)
 	}
@@ -55,3 +57,41 @@ func (s *gatewayService) ExecNGQL(request *types.ExecNGQLParams) (*types.AnyResp
 	}
 	return &types.AnyResponse{Data: execute}, nil
 }
+
+func (s *gatewayService) BatchExecNGQL(request *types.BatchExecNGQLParams) (*types.AnyResponse, error) {
+	data := make([]map[string]interface{}, 0)
+
+	NSID := request.NSID
+	gqls := request.Gqls
+	paramList := request.ParamList
+
+	for _, gql := range gqls {
+		execute, _, err := dao.Execute(NSID, gql, make([]string, 0))
+		gqlRes := make(map[string]interface{})
+		gqlRes["gql"] = gql
+		if err != nil {
+			gqlRes["message"] = err.Error()
+			gqlRes["code"] = -1
+		} else {
+			gqlRes["code"] = 0
+		}
+		gqlRes["data"] = execute
+		data = append(data, gqlRes)
+	}
+
+	if len(paramList) > 0 {
+		execute, _, err := dao.Execute(NSID, "", paramList)
+		gqlRes := make(map[string]interface{})
+		gqlRes["gql"] = strings.Join(paramList, "; ")
+		if err != nil {
+			gqlRes["message"] = err.Error()
+			gqlRes["code"] = -1
+		} else {
+			gqlRes["code"] = 0
+		}
+		gqlRes["data"] = execute
+		data = append(data, gqlRes)
+	}
+
+	return &types.AnyResponse{Data: data}, nil
+}

server-v2/api/studio/pkg/auth/authorize.go

@@ -35,6 +35,11 @@ type (
 	}
 )
 
+var (
+	tokenName = "explorer_token"
+	nsidName  = "explorer_nsid"
+)
+
 func CreateToken(authData *AuthData, config *config.Config) (string, error) {
 	now := time.Now()
 	expiresAt := now.Add(time.Duration(config.Auth.AccessExpire) * time.Second).Unix()
@@ -136,14 +141,14 @@ func AuthMiddlewareWithCtx(svcCtx *svc.ServiceContext) rest.Middleware {
 				}
 
 				token := http.Cookie{
-					Name:     "token",
+					Name:     tokenName,
 					Value:    tokenString,
 					Path:     "/",
 					HttpOnly: true,
 					MaxAge:   int(configAuth.AccessExpire),
 				}
 				NSID := http.Cookie{
-					Name:     "NSID",
+					Name:     nsidName,
 					Value:    clientInfo.ClientID,
 					Path:     "/",
 					HttpOnly: true,
@@ -159,20 +164,20 @@ func AuthMiddlewareWithCtx(svcCtx *svc.ServiceContext) rest.Middleware {
 				return
 			}
 
-			NSIDCookie, NSIDErr := r.Cookie("NSID")
+			NSIDCookie, NSIDErr := r.Cookie(nsidName)
 			if NSIDErr == nil {
 				// Add NSID to request query
 				utils.AddQueryParams(r, map[string]string{"NSID": NSIDCookie.Value})
 			}
 
 			if strings.HasSuffix(r.URL.Path, "/disconnect") {
-				w.Header().Set("Set-Cookie", utils.DisabledCookie("token").String())
-				w.Header().Add("Set-Cookie", utils.DisabledCookie("NSID").String())
+				w.Header().Set("Set-Cookie", utils.DisabledCookie(tokenName).String())
+				w.Header().Add("Set-Cookie", utils.DisabledCookie(nsidName).String())
 				next(w, r)
 				return
 			}
 
-			tokenCookie, tokenErr := r.Cookie("token")
+			tokenCookie, tokenErr := r.Cookie(tokenName)
 			if NSIDErr != nil || tokenErr != nil {
 				if NSIDErr != nil {
 					svcCtx.ResponseHandler.Handle(w, r, nil, ecode.WithSessionMessage(NSIDErr))

server-v2/api/studio/restapi/gateway.api

@@ -6,6 +6,11 @@ type (
 		ParamList []string `json:"paramList,optional"`
 		NSID      string   `form:"NSID"`
 	}
+	BatchExecNGQLParams {
+		Gqls      []string `json:"gqls"`
+		ParamList []string `json:"paramList,optional"`
+		NSID      string   `form:"NSID"`
+	}
 	ConnectDBParams {
 		Address       string `json:"address"`
 		Port          int    `json:"port"`
@@ -18,7 +23,6 @@ type (
 	DisconnectDBParams {
 		NSID string `form:"NSID,optional"`
 	}
-
 	AnyResponse {
 		Data interface{} `json:"data"`
 	}
@@ -33,6 +37,10 @@ service studio-api {
 	@doc "Exec NGQL"
 	@handler ExecNGQL
 	post /exec(ExecNGQLParams) returns (AnyResponse)
+
+	@doc "BatchExec NGQL"
+	@handler BatchExecNGQL
+	post /batchExec(BatchExecNGQLParams) returns (AnyResponse)
 }
 
 @server(