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

Refactor code

Browse Source
This commit is contained in:
wenxu12345 2022-01-04 13:19:14 +08:00
parent 1ad80e1870
commit 3d6f1e42d2
2 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go.mod
View File

@ -35,6 +35,7 @@ require (
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/olivere/elastic/v7 v7.0.23 github.com/olivere/elastic/v7 v7.0.23
github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pkg/errors v0.9.1
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5
github.com/sirupsen/logrus v1.8.1 github.com/sirupsen/logrus v1.8.1

73
pkg/common/db/model_struct.go
View File

@ -14,13 +14,13 @@ import "time"
//} //}
//open_im_sdk.FriendInfo(FriendUser) != imdb.Friend(FriendUserID) //open_im_sdk.FriendInfo(FriendUser) != imdb.Friend(FriendUserID)
type Friend struct { type Friend struct {
OwnerUserID string `gorm:"column:owner_user_id;primary_key;"` OwnerUserID string `gorm:"column:owner_user_id;primary_key;size:64"`
Remark string `gorm:"column:remark"` FriendUserID string `gorm:"column:friend_user_id;primary_key;size:64"`
Remark string `gorm:"column:remark;size:255"`
CreateTime time.Time `gorm:"column:create_time"` CreateTime time.Time `gorm:"column:create_time"`
FriendUserID string `gorm:"column:friend_user_id;primary_key;"`
AddSource int32 `gorm:"column:add_source"` AddSource int32 `gorm:"column:add_source"`
OperatorUserID string `gorm:"column:operator_user_id"` OperatorUserID string `gorm:"column:operator_user_id;size:64"`
Ex string `gorm:"column:ex"` Ex string `gorm:"column:ex;size:1024"`
} }
//message FriendRequest{ //message FriendRequest{
@ -36,15 +36,15 @@ type Friend struct {
//} //}
//open_im_sdk.FriendRequest == imdb.FriendRequest //open_im_sdk.FriendRequest == imdb.FriendRequest
type FriendRequest struct { type FriendRequest struct {
FromUserID string `gorm:"column:from_user_id;primaryKey;"` FromUserID string `gorm:"column:from_user_id;primary_key;size:64"`
ToUserID string `gorm:"column:to_user_id;primaryKey;"` ToUserID string `gorm:"column:to_user_id;primary_key;size:64"`
HandleResult int32 `gorm:"column:handle_result"` HandleResult int32 `gorm:"column:handle_result"`
ReqMsg string `gorm:"column:req_msg"` ReqMsg string `gorm:"column:req_msg;size:255"`
CreateTime time.Time `gorm:"column:create_time"` CreateTime time.Time `gorm:"column:create_time"`
HandlerUserID string `gorm:"column:handler_user_id"` HandlerUserID string `gorm:"column:handler_user_id;size:64"`
HandleMsg string `gorm:"column:handle_msg"` HandleMsg string `gorm:"column:handle_msg;size:255"`
HandleTime time.Time `gorm:"column:handle_time"` HandleTime time.Time `gorm:"column:handle_time"`
Ex string `gorm:"column:ex"` Ex string `gorm:"column:ex;size:1024"`
} }
//message GroupInfo{ //message GroupInfo{
@ -65,17 +65,16 @@ type FriendRequest struct {
type Group struct { type Group struct {
//`json:"operationID" binding:"required"` //`json:"operationID" binding:"required"`
//`protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` `json:"operationID" binding:"required"` //`protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` `json:"operationID" binding:"required"`
GroupID string `gorm:"column:group_id;primaryKey;" json:"groupID" binding:"required"` GroupID string `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"`
GroupName string `gorm:"column:name" json:"groupName"` GroupName string `gorm:"column:name;size:255" json:"groupName"`
Notification string `gorm:"column:notification" json:"notification"` Notification string `gorm:"column:notification;size:255" json:"notification"`
Introduction string `gorm:"column:introduction" json:"introduction"` Introduction string `gorm:"column:introduction;size:255" json:"introduction"`
FaceUrl string `gorm:"column:face_url" json:"faceUrl"` FaceUrl string `gorm:"column:face_url;size:255" json:"faceUrl"`
CreateTime time.Time `gorm:"column:create_time"` CreateTime time.Time `gorm:"column:create_time"`
Ex string `gorm:"column:ex" json:"ex;size:1024"`
Status int32 `gorm:"column:status"` Status int32 `gorm:"column:status"`
CreatorUserID string `gorm:"column:creator_user_id"` CreatorUserID string `gorm:"column:creator_user_id;size:64"`
GroupType int32 `gorm:"column:group_type"` GroupType int32 `gorm:"column:group_type"`
Ex string `gorm:"column:ex" json:"ex"`
} }
//message GroupMemberFullInfo { //message GroupMemberFullInfo {
@ -91,15 +90,15 @@ type Group struct {
//int32 AppMangerLevel = 7; //if >0 //int32 AppMangerLevel = 7; //if >0
//} open_im_sdk.GroupMemberFullInfo(AppMangerLevel) > imdb.GroupMember //} open_im_sdk.GroupMemberFullInfo(AppMangerLevel) > imdb.GroupMember
type GroupMember struct { type GroupMember struct {
GroupID string `gorm:"column:group_id;primaryKey;"` GroupID string `gorm:"column:group_id;primary_key;size:64"`
UserID string `gorm:"column:user_id;primaryKey;"` UserID string `gorm:"column:user_id;primary_key;size:64"`
Nickname string `gorm:"column:nickname;size:255"`
FaceUrl string `gorm:"column:user_group_face_url;size:255"`
RoleLevel int32 `gorm:"column:role_level"` RoleLevel int32 `gorm:"column:role_level"`
JoinTime time.Time `gorm:"column:join_time"` JoinTime time.Time `gorm:"column:join_time"`
Nickname string `gorm:"column:nickname"`
FaceUrl string `gorm:"column:user_group_face_url"`
JoinSource int32 `gorm:"column:join_source"` JoinSource int32 `gorm:"column:join_source"`
OperatorUserID string `gorm:"column:operator_user_id"` OperatorUserID string `gorm:"column:operator_user_id;size:64"`
Ex string `gorm:"column:ex"` Ex string `gorm:"column:ex;size:1024"`
} }
//message GroupRequest{ //message GroupRequest{
@ -114,15 +113,15 @@ type GroupMember struct {
//string Ex = 9; //string Ex = 9;
//}open_im_sdk.GroupRequest == imdb.GroupRequest //}open_im_sdk.GroupRequest == imdb.GroupRequest
type GroupRequest struct { type GroupRequest struct {
UserID string `gorm:"column:user_id;primaryKey;"` UserID string `gorm:"column:user_id;primary_key;size:64"`
GroupID string `gorm:"column:group_id;primaryKey;"` GroupID string `gorm:"column:group_id;primary_key;size:64"`
HandleResult int32 `gorm:"column:handle_result"` HandleResult int32 `gorm:"column:handle_result"`
ReqMsg string `gorm:"column:req_msg"` ReqMsg string `gorm:"column:req_msg;size:255"`
HandledMsg string `gorm:"column:handle_msg"` HandledMsg string `gorm:"column:handle_msg;size:255"`
ReqTime time.Time `gorm:"column:req_time"` ReqTime time.Time `gorm:"column:req_time"`
HandleUserID string `gorm:"column:handle_user_id"` HandleUserID string `gorm:"column:handle_user_id;size:64"`
HandledTime time.Time `gorm:"column:handle_time"` HandledTime time.Time `gorm:"column:handle_time"`
Ex string `gorm:"column:ex"` Ex string `gorm:"column:ex;size:1024"`
} }
//string UserID = 1; //string UserID = 1;
@ -137,14 +136,14 @@ type GroupRequest struct {
//int32 AppMangerLevel = 10; //int32 AppMangerLevel = 10;
//open_im_sdk.User == imdb.User //open_im_sdk.User == imdb.User
type User struct { type User struct {
UserID string `gorm:"column:user_id;primaryKey;"` UserID string `gorm:"column:user_id;primary_key;size:64"`
Nickname string `gorm:"column:name"` Nickname string `gorm:"column:name;size:255"`
FaceUrl string `gorm:"column:face_url"` FaceUrl string `gorm:"column:face_url;size:255"`
Gender int32 `gorm:"column:gender"` Gender int32 `gorm:"column:gender"`
PhoneNumber string `gorm:"column:phone_number"` PhoneNumber string `gorm:"column:phone_number;size:32"`
Birth time.Time `gorm:"column:birth"` Birth time.Time `gorm:"column:birth"`
Email string `gorm:"column:email"` Email string `gorm:"column:email;size:64"`
Ex string `gorm:"column:ex"` Ex string `gorm:"column:ex;size:1024"`
CreateTime time.Time `gorm:"column:create_time"` CreateTime time.Time `gorm:"column:create_time"`
AppMangerLevel int32 `gorm:"column:app_manger_level"` AppMangerLevel int32 `gorm:"column:app_manger_level"`
} }