From cd62d7f0d988b38c5fb860469995ae7c25516735 Mon Sep 17 00:00:00 2001
From: wenxu12345 <44203734@qq.com>
Date: Fri, 31 Dec 2021 10:49:37 +0800
Subject: [PATCH] Refactor code

---
 pkg/common/utils/utils.go | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkg/common/utils/utils.go b/pkg/common/utils/utils.go
index 61dc47be0..1df23b0b2 100644
--- a/pkg/common/utils/utils.go
+++ b/pkg/common/utils/utils.go
@@ -1,6 +1,7 @@
 package utils
 
 import (
+	db "Open_IM/pkg/common/db"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	"Open_IM/pkg/common/token_verify"
 	open_im_sdk "Open_IM/pkg/proto/sdk_ws"
@@ -14,12 +15,12 @@ func OperationIDGenerator() string {
 	return strconv.FormatInt(time.Now().UnixNano()+int64(rand.Uint32()), 10)
 }
 
-func FriendOpenIMCopyDB(dst *imdb.Friend, src *open_im_sdk.FriendInfo) {
+func FriendOpenIMCopyDB(dst *db.Friend, src *open_im_sdk.FriendInfo) {
 	utils.CopyStructFields(dst, src)
 	dst.FriendUserID = src.FriendUser.UserID
 }
 
-func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src *imdb.Friend) {
+func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src *db.Friend) {
 	utils.CopyStructFields(dst, src)
 	user, _ := imdb.GetUserByUserID(src.FriendUserID)
 	if user != nil {
@@ -30,21 +31,21 @@ func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src *imdb.Friend) {
 }
 
 //
-func FriendRequestOpenIMCopyDB(dst *imdb.FriendRequest, src *open_im_sdk.FriendRequest) {
+func FriendRequestOpenIMCopyDB(dst *db.FriendRequest, src *open_im_sdk.FriendRequest) {
 	utils.CopyStructFields(dst, src)
 }
 
-func FriendRequestDBCopyOpenIM(dst *open_im_sdk.FriendRequest, src *imdb.FriendRequest) {
+func FriendRequestDBCopyOpenIM(dst *open_im_sdk.FriendRequest, src *db.FriendRequest) {
 	utils.CopyStructFields(dst, src)
 	dst.CreateTime = src.CreateTime.Unix()
 	dst.HandleTime = src.HandleTime.Unix()
 }
 
-func GroupOpenIMCopyDB(dst *imdb.Group, src *open_im_sdk.GroupInfo) {
+func GroupOpenIMCopyDB(dst *db.Group, src *open_im_sdk.GroupInfo) {
 	utils.CopyStructFields(dst, src)
 }
 
-func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src *imdb.Group) {
+func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src *db.Group) {
 	utils.CopyStructFields(dst, src)
 	user, _ := imdb.GetGroupOwnerInfoByGroupID(src.GroupID)
 	if user != nil {
@@ -54,11 +55,11 @@ func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src *imdb.Group) {
 	dst.CreateTime = src.CreateTime.Unix()
 }
 
-func GroupMemberOpenIMCopyDB(dst *imdb.GroupMember, src *open_im_sdk.GroupMemberFullInfo) {
+func GroupMemberOpenIMCopyDB(dst *db.GroupMember, src *open_im_sdk.GroupMemberFullInfo) {
 	utils.CopyStructFields(dst, src)
 }
 
-func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *imdb.GroupMember) {
+func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *db.GroupMember) {
 	utils.CopyStructFields(dst, src)
 	if token_verify.IsMangerUserID(src.UserID) {
 		u, _ := imdb.GetUserByUserID(src.UserID)
@@ -70,31 +71,31 @@ func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src *imdb.Gro
 	dst.JoinTime = src.JoinTime.Unix()
 }
 
-func GroupRequestOpenIMCopyDB(dst *imdb.GroupRequest, src *open_im_sdk.GroupRequest) {
+func GroupRequestOpenIMCopyDB(dst *db.GroupRequest, src *open_im_sdk.GroupRequest) {
 	utils.CopyStructFields(dst, src)
 }
 
-func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src *imdb.GroupRequest) {
+func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src *db.GroupRequest) {
 	utils.CopyStructFields(dst, src)
 	dst.ReqTime = src.ReqTime.Unix()
 	dst.HandleTime = src.HandledTime.Unix()
 }
 
-func UserOpenIMCopyDB(dst *imdb.User, src *open_im_sdk.UserInfo) {
+func UserOpenIMCopyDB(dst *db.User, src *open_im_sdk.UserInfo) {
 	utils.CopyStructFields(dst, src)
 }
 
-func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src *imdb.User) {
+func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src *db.User) {
 	utils.CopyStructFields(dst, src)
 	dst.CreateTime = src.CreateTime.Unix()
 }
 
-func BlackOpenIMCopyDB(dst *imdb.Black, src *open_im_sdk.BlackInfo) {
+func BlackOpenIMCopyDB(dst *db.Black, src *open_im_sdk.BlackInfo) {
 	utils.CopyStructFields(dst, src)
 	dst.BlockUserID = src.BlackUserInfo.UserID
 }
 
-func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src *imdb.Black) {
+func BlackDBCopyOpenIM(dst *open_im_sdk.BlackInfo, src *db.Black) {
 	utils.CopyStructFields(dst, src)
 	dst.CreateTime = src.CreateTime.Unix()
 	user, _ := imdb.GetUserByUserID(src.BlockUserID)