Merge remote-tracking branch 'origin/main'

FGadvancer · Oct 12, 2023 · 2a8593b · 2a8593b
2 parents f0a1b2d + 5b890e3
commit 2a8593b
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 25 deletions.
diff --git a/tools/data-conversion/chat/chat.go b/tools/data-conversion/chat/chat.go
@@ -2,12 +2,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/chat/conversion"
-	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"
+	"log"
+
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"log"
+
+	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/chat/conversion"
+	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"
 )
 
 func main() {

diff --git a/tools/data-conversion/openim/msg.go b/tools/data-conversion/openim/msg.go
@@ -3,20 +3,22 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"log"
+	"sync"
+	"sync/atomic"
+	"time"
+
 	"github.com/IBM/sarama"
 	"github.com/OpenIMSDK/protocol/constant"
 	"github.com/OpenIMSDK/protocol/msg"
 	"github.com/OpenIMSDK/protocol/sdkws"
 	"github.com/OpenIMSDK/tools/mw"
 	"github.com/golang/protobuf/proto"
-	"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
-	pbmsg "github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/proto/msg"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-	"log"
-	"sync"
-	"sync/atomic"
-	"time"
+
+	"github.com/openimsdk/open-im-server/v3/pkg/apistruct"
+	pbmsg "github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/proto/msg"
 )
 
 func main() {

diff --git a/tools/data-conversion/openim/mysql.go b/tools/data-conversion/openim/mysql.go
@@ -16,12 +16,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/mysql/conversion"
-	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"
+	"log"
+
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"log"
+
+	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/mysql/conversion"
+	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"
 )
 
 func main() {

diff --git a/tools/data-conversion/openim/mysql/cmd.go b/tools/data-conversion/openim/mysql/cmd.go
@@ -2,12 +2,14 @@ package mysql
 
 import (
 	"fmt"
-	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/mysql/conversion"
-	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"
+	"log"
+
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
-	"log"
+
+	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/mysql/conversion"
+	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"
 )
 
 func Cmd() {

diff --git a/tools/data-conversion/openim/mysql/conversion/conversion.go b/tools/data-conversion/openim/mysql/conversion/conversion.go
@@ -2,6 +2,7 @@ package conversion
 
 import (
 	"github.com/OpenIMSDK/protocol/constant"
+
 	v3 "github.com/openimsdk/open-im-server/v3/pkg/common/db/table/relation"
 	v2 "github.com/openimsdk/open-im-server/v3/tools/data-conversion/openim/mysql/v2"
 	"github.com/openimsdk/open-im-server/v3/tools/data-conversion/utils"

diff --git a/tools/data-conversion/openim/mysql/v2/model_struct.go b/tools/data-conversion/openim/mysql/v2/model_struct.go
@@ -29,19 +29,19 @@ func (FriendRequest) TableName() string {
 }
 
 type Group struct {
-	GroupID                string    `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"`
-	GroupName              string    `gorm:"column:name;size:255" json:"groupName"`
-	Notification           string    `gorm:"column:notification;size:255" json:"notification"`
-	Introduction           string    `gorm:"column:introduction;size:255" json:"introduction"`
-	FaceURL                string    `gorm:"column:face_url;size:255" json:"faceURL"`
+	GroupID                string    `gorm:"column:group_id;primary_key;size:64"  json:"groupID"           binding:"required"`
+	GroupName              string    `gorm:"column:name;size:255"                 json:"groupName"`
+	Notification           string    `gorm:"column:notification;size:255"         json:"notification"`
+	Introduction           string    `gorm:"column:introduction;size:255"         json:"introduction"`
+	FaceURL                string    `gorm:"column:face_url;size:255"             json:"faceURL"`
 	CreateTime             time.Time `gorm:"column:create_time;index:create_time"`
-	Ex                     string    `gorm:"column:ex" json:"ex;size:1024" json:"ex"`
+	Ex                     string    `gorm:"column:ex"                            json:"ex;size:1024"`
 	Status                 int32     `gorm:"column:status"`
 	CreatorUserID          string    `gorm:"column:creator_user_id;size:64"`
 	GroupType              int32     `gorm:"column:group_type"`
 	NeedVerification       int32     `gorm:"column:need_verification"`
-	LookMemberInfo         int32     `gorm:"column:look_member_info" json:"lookMemberInfo"`
-	ApplyMemberFriend      int32     `gorm:"column:apply_member_friend" json:"applyMemberFriend"`
+	LookMemberInfo         int32     `gorm:"column:look_member_info"              json:"lookMemberInfo"`
+	ApplyMemberFriend      int32     `gorm:"column:apply_member_friend"           json:"applyMemberFriend"`
 	NotificationUpdateTime time.Time `gorm:"column:notification_update_time"`
 	NotificationUserID     string    `gorm:"column:notification_user_id;size:64"`
 }

diff --git a/tools/data-conversion/utils/find_insert.go b/tools/data-conversion/utils/find_insert.go
@@ -2,11 +2,12 @@ package utils
 
 import (
 	"fmt"
-	"gorm.io/gorm"
-	"gorm.io/gorm/schema"
 	"log"
 	"sync"
 	"sync/atomic"
+
+	"gorm.io/gorm"
+	"gorm.io/gorm/schema"
 )
 
 func FindAndInsert[V2 any, V3 schema.Tabler](v2db *gorm.DB, v3db *gorm.DB, fn func(V2) (V3, bool)) (string, error) {