From ffd306f25c4f714548711e527a2f21cb10ea4382 Mon Sep 17 00:00:00 2001
From: skiffer-git <44203734@qq.com>
Date: Tue, 17 Jan 2023 15:03:47 +0800
Subject: [PATCH] Error code standardization

---
 internal/rpc/group/g.go   |  2 +-
 internal/utils/convert.go | 43 ++++++++++++++-------------------------
 2 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/internal/rpc/group/g.go b/internal/rpc/group/g.go
index 55c0b838f..73cb06bbd 100644
--- a/internal/rpc/group/g.go
+++ b/internal/rpc/group/g.go
@@ -2,7 +2,7 @@ package group
 
 import (
 	"Open_IM/pkg/common/constant"
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	imdb "Open_IM/pkg/common/db/mysql"
 	"Open_IM/pkg/common/tools"
 	pbGroup "Open_IM/pkg/proto/group"
 	sdk "Open_IM/pkg/proto/sdk_ws"
diff --git a/internal/utils/convert.go b/internal/utils/convert.go
index 3d6ccf549..7e1d057d2 100644
--- a/internal/utils/convert.go
+++ b/internal/utils/convert.go
@@ -1,7 +1,7 @@
 package utils
 
 import (
-	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	imdb "Open_IM/pkg/common/db/mysql"
 	sdk "Open_IM/pkg/proto/sdk_ws"
 	utils2 "Open_IM/pkg/utils"
 	utils "github.com/OpenIMSDK/open_utils"
@@ -207,44 +207,31 @@ func (db *DBGroupRequest) convert() (*sdk.GroupRequest, error) {
 }
 
 type DBUser struct {
-	*imdb
+	*imdb.User
 }
 
 type PBUser struct {
 	*sdk.UserInfo
 }
 
-func (pb *PBUser) convert() (*DBUser, error) {
-	dst := &DBUser{}
+func (pb *PBUser) convert() (*imdb.User, error) {
+	dst := &imdb.User{}
 	utils.CopyStructFields(dst, pb)
-
-	utils.CopyStructFields(dst, src)
-	dst.Birth, _ = utils.TimeStringToTime(src.BirthStr)
-	dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime))
-
+	dst.Birth = utils.UnixSecondToTime(pb.Birthday)
+	dst.CreateTime = utils.UnixSecondToTime(int64(pb.CreateTime))
 	return dst, nil
 }
-func (db *DBUser) convert() (*PBUser, error) {
-	dst := &sdk.GroupRequest{}
+
+func (db *DBUser) convert() (*sdk.UserInfo, error) {
+	dst := &sdk.UserInfo{}
 	utils.CopyStructFields(dst, db)
-	dst.ReqTime = uint32(db.ReqTime.Unix())
-	dst.HandleTime = uint32(db.HandledTime.Unix())
+	dst.CreateTime = uint32(db.CreateTime.Unix())
+	dst.Birthday = db.Birth.Unix()
 	return dst, nil
 }
 
-func UserOpenIMCopyDB(dst *imdb.User, src *sdk.UserInfo) {
-	utils.CopyStructFields(dst, src)
-	dst.Birth, _ = utils.TimeStringToTime(src.BirthStr)
-	dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime))
-}
-
-func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src *imdb.User) {
-	utils.CopyStructFields(dst, src)
-	dst.CreateTime = uint32(src.CreateTime.Unix())
-	//dst.Birth = uint32(src.Birth.Unix())
-	dst.BirthStr = utils2.TimeToString(src.Birth)
-}
-
-func UserDBCopyOpenIMPublicUser(dst *open_im_sdk.PublicUserInfo, src *imdb.User) {
-	utils.CopyStructFields(dst, src)
+func (db *DBUser) convertPublic() (*sdk.PublicUserInfo, error) {
+	dst := &sdk.PublicUserInfo{}
+	utils.CopyStructFields(dst, db)
+	return dst, nil
 }