wait rebase

vesoft-inc · Mar 14, 2022 · 99cc563 · 99cc563
1 parent 1720974
commit 99cc563
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/server/pkg/webserver/controller/files.go b/server/pkg/webserver/controller/files.go
@@ -11,11 +11,13 @@ import (
 	"os"
 	"path/filepath"
 
+
+	"github.com/vesoft-inc/nebula-studio/server/pkg/config"
+	"github.com/vesoft-inc/nebula-studio/server/pkg/webserver/base"
+
 	"github.com/axgle/mahonia"
 	"github.com/kataras/iris/v12"
 	"github.com/saintfish/chardet"
-	"github.com/vesoft-inc/nebula-studio/server/pkg/config"
-	"github.com/vesoft-inc/nebula-studio/server/pkg/webserver/base"
 )
 
 type fileStat struct {

diff --git a/server/pkg/webserver/controller/gateway.go b/server/pkg/webserver/controller/gateway.go
@@ -4,7 +4,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"github.com/vesoft-inc/nebula-studio/server/pkg/utils"
 	"path/filepath"
 	"strings"
 
@@ -13,6 +12,7 @@ import (
 	importconfig "github.com/vesoft-inc/nebula-importer/pkg/config"
 	importerErrors "github.com/vesoft-inc/nebula-importer/pkg/errors"
 	"github.com/vesoft-inc/nebula-studio/server/pkg/config"
+	"github.com/vesoft-inc/nebula-studio/server/pkg/utils"
 	"github.com/vesoft-inc/nebula-studio/server/pkg/webserver/base"
 	"github.com/vesoft-inc/nebula-studio/server/pkg/webserver/service/importer"
 

diff --git a/server/pkg/webserver/service/importer/importer.go b/server/pkg/webserver/service/importer/importer.go
@@ -3,7 +3,6 @@ package importer
 import (
 	"errors"
 	"fmt"
-	"github.com/vesoft-inc/nebula-studio/server/pkg/utils"
 	"gopkg.in/yaml.v2"
 	"os"
 	"path/filepath"
@@ -13,6 +12,7 @@ import (
 	importconfig "github.com/vesoft-inc/nebula-importer/pkg/config"
 	importerErrors "github.com/vesoft-inc/nebula-importer/pkg/errors"
 	"github.com/vesoft-inc/nebula-studio/server/pkg/config"
+	"github.com/vesoft-inc/nebula-studio/server/pkg/utils"
 
 	"go.uber.org/zap"
 )

diff --git a/server/pkg/webserver/service/importer/task.go b/server/pkg/webserver/service/importer/task.go
@@ -2,6 +2,7 @@ package importer
 
 import (
 	"github.com/vesoft-inc/nebula-importer/pkg/cmd"
+
 	"go.uber.org/zap"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ package importer @@
     import (
     	"github.com/vesoft-inc/nebula-importer/pkg/cmd"
     	"go.uber.org/zap"
     )
@@ Expand Down @@