Merge remote-tracking branch 'origin/errcode' into errcode

pkg/common/db/mysql.go

@@ -143,6 +143,20 @@ func initMysqlDB() {
 	if !db.Migrator().HasTable(&im_mysql_model.UserIpRecord{}) {
 		db.Migrator().CreateTable(&im_mysql_model.UserIpRecord{})
 	}
+
+	im_mysql_model.GroupDB = db.Table("groups")
+	im_mysql_model.GroupMemberDB = db.Table("group_members")
+	im_mysql_model.UserDB = db.Table("users")
+	im_mysql_model.ChatLogDB = db.Table("chat_logs")
+	im_mysql_model.BlackListDB = db.Table("black_lists")
+	im_mysql_model.BlackDB = db.Table("blacks")
+	im_mysql_model.AppDB = db.Table("app_version")
+	im_mysql_model.BlackDB = db.Table("blacks")
+	im_mysql_model.ConversationDB = db.Table("conversations")
+	im_mysql_model.FriendDB = db.Table("friends")
+	im_mysql_model.FriendRequestDB = db.Table("friend_requests")
+	im_mysql_model.GroupRequestDB = db.Table("group_requests")
+	im_mysql_model.AppDB = db.Table("app_db")
 	DB.MysqlDB.db = db
 }
 

pkg/common/db/mysql_model/im_mysql_model/group_model_k.go

@@ -26,7 +26,6 @@ type Group struct {
 	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"`
-	GroupDB                *gorm.DB
 }
 
 func (*Group) Create(ctx context.Context, groups []*Group) (err error) {

pkg/getcdv3/temp.go

@@ -8,7 +8,6 @@ import (
 	"github.com/OpenIMSDK/getcdv3"
 	"google.golang.org/grpc"
 	"strings"
-	"sync"
 )
 
 func GetDefaultConn(arg1, arg2, arg3, arg4 string) *grpc.ClientConn {
@@ -34,8 +33,3 @@ func GetDefaultGatewayConn4Unique(schema, addr, operationID string) []*grpc.Clie
 func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName string, ttl int, operationID string) error {
 	return getcdv3.RegisterEtcd(schema, etcdAddr, myHost, myPort, serviceName, ttl, operationID)
 }
-
-var Conn4UniqueList []*grpc.ClientConn
-var Conn4UniqueListMtx sync.RWMutex
-var IsUpdateStart bool
-var IsUpdateStartMtx sync.RWMutex