无关紧要的问题

god-jason · Jul 5, 2024 · 8283f3c · 8283f3c
1 parent 5d76167
commit 8283f3c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/pkg/condition/and.go b/pkg/condition/and.go
@@ -1,5 +1,7 @@
 package condition
 
+import "github.com/god-jason/bucket/pkg/exception"
+
 type And struct {
 	Compares []*Compare `json:"compares,omitempty"`
 }

diff --git a/pkg/condition/condition.go b/pkg/condition/condition.go
@@ -1,5 +1,7 @@
 package condition
 
+import "github.com/god-jason/bucket/pkg/exception"
+
 // Condition 条件，外OR，内And
 // 比如： （a>1 && b<2）||（c==2 && d<5）
 type Condition struct {

diff --git a/pkg/condition/or.go b/pkg/condition/or.go
@@ -1,5 +1,7 @@
 package condition
 
+import "github.com/god-jason/bucket/pkg/exception"
+
 type Or struct {
 	Compares []*Compare `json:"compares,omitempty"`
 }

diff --git a/pkg/vconn/vconn.go b/pkg/vconn/vconn.go
@@ -1,6 +1,7 @@
 package vconn
 
 import (
+	"errors"
 	"io"
 	"net"
 	"time"
@@ -26,7 +27,7 @@ func (c *VConn) Close() error {
 	e1 := c.PipeWriter.Close()
 	e2 := c.PipeReader.Close()
 	if e1 != nil && e2 != nil {
-		return exception.Join(e1, e2)
+		return errors.Join(e1, e2)
 		//return errors.New(e1.Error() + " and " + e2.Error())
 	}
 	if e1 != nil {

diff --git a/web/export/import.go b/web/export/import.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"github.com/god-jason/bucket/db"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"io"
 )
 
@@ -29,7 +30,7 @@ func ApiImport(table string) gin.HandlerFunc {
 			return
 		}
 
-		var idss []any
+		var idss []primitive.ObjectID
 		//数据解析
 		for _, file := range reader.File {
 			if file.FileInfo().IsDir() {