blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-19 19:05:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Error code standardization

Browse Source
This commit is contained in:
skiffer-git 2023-01-17 15:03:47 +08:00
parent 58866c1b41
commit ffd306f25c
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/rpc/group/g.go
View File

@ -2,7 +2,7 @@ package group
import ( import (
"Open_IM/pkg/common/constant" "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" "Open_IM/pkg/common/tools"
pbGroup "Open_IM/pkg/proto/group" pbGroup "Open_IM/pkg/proto/group"
sdk "Open_IM/pkg/proto/sdk_ws" sdk "Open_IM/pkg/proto/sdk_ws"

43
internal/utils/convert.go
View File

@ -1,7 +1,7 @@
package utils package utils
import ( 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" sdk "Open_IM/pkg/proto/sdk_ws"
utils2 "Open_IM/pkg/utils" utils2 "Open_IM/pkg/utils"
utils "github.com/OpenIMSDK/open_utils" utils "github.com/OpenIMSDK/open_utils"
@ -207,44 +207,31 @@ func (db *DBGroupRequest) convert() (*sdk.GroupRequest, error) {
} }
type DBUser struct { type DBUser struct {
*imdb *imdb.User
} }
type PBUser struct { type PBUser struct {
*sdk.UserInfo *sdk.UserInfo
} }
func (pb *PBUser) convert() (*DBUser, error) { func (pb *PBUser) convert() (*imdb.User, error) {
dst := &DBUser{} dst := &imdb.User{}
utils.CopyStructFields(dst, pb) utils.CopyStructFields(dst, pb)
dst.Birth = utils.UnixSecondToTime(pb.Birthday)
utils.CopyStructFields(dst, src) dst.CreateTime = utils.UnixSecondToTime(int64(pb.CreateTime))
dst.Birth, _ = utils.TimeStringToTime(src.BirthStr)
dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime))
return dst, nil 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) utils.CopyStructFields(dst, db)
dst.ReqTime = uint32(db.ReqTime.Unix()) dst.CreateTime = uint32(db.CreateTime.Unix())
dst.HandleTime = uint32(db.HandledTime.Unix()) dst.Birthday = db.Birth.Unix()
return dst, nil return dst, nil
} }
func UserOpenIMCopyDB(dst *imdb.User, src *sdk.UserInfo) { func (db *DBUser) convertPublic() (*sdk.PublicUserInfo, error) {
utils.CopyStructFields(dst, src) dst := &sdk.PublicUserInfo{}
dst.Birth, _ = utils.TimeStringToTime(src.BirthStr) utils.CopyStructFields(dst, db)
dst.CreateTime = utils.UnixSecondToTime(int64(src.CreateTime)) return dst, nil
}
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)
} }