From 1e3cad4b2034a349669bc8f3a8e453d901964cd0 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 15:47:20 +0800 Subject: [PATCH 01/22] tidy code --- pkg/common/utils/utils.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/common/utils/utils.go b/pkg/common/utils/utils.go index ba5d3257b..ca67f33e2 100644 --- a/pkg/common/utils/utils.go +++ b/pkg/common/utils/utils.go @@ -25,6 +25,8 @@ func FriendDBCopyOpenIM(dst *open_im_sdk.FriendInfo, src imdb.Friend) { if user != nil { utils.CopyStructFields(dst.FriendUser, user) } + dst.CreateTime = src.CreateTime.Unix() + dst.FriendUser.CreateTime = user.CreateTime.Unix() } // @@ -34,6 +36,8 @@ func FriendRequestOpenIMCopyDB(dst *imdb.FriendRequest, src open_im_sdk.FriendRe func FriendRequestDBCopyOpenIM(dst *open_im_sdk.FriendRequest, src imdb.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) { @@ -47,6 +51,7 @@ func GroupDBCopyOpenIM(dst *open_im_sdk.GroupInfo, src imdb.Group) { dst.OwnerUserID = user.UserID } dst.MemberCount = imdb.GetGroupMemberNumByGroupID(src.GroupID) + dst.CreateTime = src.CreateTime.Unix() } func GroupMemberOpenIMCopyDB(dst *imdb.GroupMember, src open_im_sdk.GroupMemberFullInfo) { @@ -62,6 +67,7 @@ func GroupMemberDBCopyOpenIM(dst *open_im_sdk.GroupMemberFullInfo, src imdb.Grou } dst.AppMangerLevel = 1 } + dst.JoinTime = src.JoinTime.Unix() } func GroupRequestOpenIMCopyDB(dst *imdb.GroupRequest, src open_im_sdk.GroupRequest) { @@ -70,6 +76,8 @@ func GroupRequestOpenIMCopyDB(dst *imdb.GroupRequest, src open_im_sdk.GroupReque func GroupRequestDBCopyOpenIM(dst *open_im_sdk.GroupRequest, src imdb.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) { @@ -78,6 +86,7 @@ func UserOpenIMCopyDB(dst *imdb.User, src open_im_sdk.UserInfo) { func UserDBCopyOpenIM(dst *open_im_sdk.UserInfo, src imdb.User) { utils.CopyStructFields(dst, src) + dst.CreateTime = src.CreateTime.Unix() } func BlackOpenIMCopyDB(dst *imdb.Black, src open_im_sdk.BlackInfo) { From 28cfc2a9c14a389de64d62c39542144bccebe23f Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:01:57 +0800 Subject: [PATCH 02/22] tidy code --- internal/api/auth/auth.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index b31384cf8..51e1c7614 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -26,7 +26,7 @@ func UserRegister(c *gin.Context) { return } req := &rpc.UserRegisterReq{} - log.NewInfo("UserRegister args ", req.String()) + log.NewInfo(req.OperationID, "UserRegister args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) client := rpc.NewAuthClient(etcdConn) reply, err := client.UserRegister(context.Background(), req) @@ -64,7 +64,7 @@ func UserToken(c *gin.Context) { return } req := &rpc.UserTokenReq{Platform: params.Platform, FromUserID: params.UserID, OperationID: params.OperationID} - log.NewInfo("UserToken args ", req.String()) + log.NewInfo(req.OperationID, "UserToken args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) client := rpc.NewAuthClient(etcdConn) reply, err := client.UserToken(context.Background(), req) From 12c2d18325f944cbba8c54caa3518443fa13923d Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:03:47 +0800 Subject: [PATCH 03/22] tidy code --- internal/api/auth/auth.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 51e1c7614..649b97f66 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -6,6 +6,7 @@ import ( "Open_IM/pkg/common/log" "Open_IM/pkg/grpc-etcdv3/getcdv3" rpc "Open_IM/pkg/proto/auth" + "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" "net/http" @@ -26,6 +27,8 @@ func UserRegister(c *gin.Context) { return } req := &rpc.UserRegisterReq{} + utils.CopyStructFields(req.UserInfo, params) + req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) client := rpc.NewAuthClient(etcdConn) From 8286c10406970d968d123159ca05d903b761e886 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:06:06 +0800 Subject: [PATCH 04/22] tidy code --- internal/rpc/msg/notification.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/rpc/msg/notification.go b/internal/rpc/msg/notification.go index 76023b851..5bb11b21e 100644 --- a/internal/rpc/msg/notification.go +++ b/internal/rpc/msg/notification.go @@ -381,7 +381,7 @@ func MemberEnterNotification(req *pbGroup.GroupApplicationResponseReq) { //} func getFromToUserNickname(operationID, fromUserID, toUserID string) (string, string) { - return + return "", "" from, err1 := imdb.GetUserByUserID(fromUserID) to, err2 := imdb.GetUserByUserID(toUserID) if err1 != nil || err2 != nil { From 817a5e4b648ab2e9549a2f37deb02dca57f4e813 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:23:14 +0800 Subject: [PATCH 05/22] tidy code --- pkg/utils/utils.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 9953227a1..42ae68820 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -2,11 +2,13 @@ package utils import ( "fmt" + "github.com/jinzhu/copier" "reflect" ) // copy a by b b->a func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error) { + copier.Copy(&a, &b) at := reflect.TypeOf(a) av := reflect.ValueOf(a) bt := reflect.TypeOf(b) @@ -34,6 +36,7 @@ func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error for i := 0; i < len(_fields); i++ { name := _fields[i] + f := av.Elem().FieldByName(name) bValue := bv.FieldByName(name) From 1cb7b6a67e3fab53318d8be01ebd5915e53cccee Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:24:45 +0800 Subject: [PATCH 06/22] tidy code --- go.mod | 5 +++-- go.sum | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 663b8e84c..911f68c00 100644 --- a/go.mod +++ b/go.mod @@ -18,17 +18,19 @@ require ( github.com/garyburd/redigo v1.6.2 github.com/gin-gonic/gin v1.7.0 github.com/go-playground/validator/v10 v10.4.1 + github.com/go-sql-driver/mysql v1.6.0 // indirect github.com/golang-jwt/jwt/v4 v4.1.0 github.com/golang/protobuf v1.5.2 github.com/golang/snappy v0.0.4 // indirect github.com/gorilla/websocket v1.4.2 + github.com/jinzhu/copier v0.3.4 github.com/jinzhu/gorm v1.9.16 + github.com/jinzhu/now v1.1.3 // indirect github.com/jonboulle/clockwork v0.2.2 // indirect github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible github.com/lestrrat-go/strftime v1.0.4 // indirect github.com/lib/pq v1.2.0 // indirect github.com/mattn/go-sqlite3 v1.14.6 // indirect - github.com/mitchellh/mapstructure v1.4.2 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/olivere/elastic/v7 v7.0.23 github.com/pierrec/lz4 v2.6.1+incompatible // indirect @@ -47,7 +49,6 @@ require ( gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b - gorm.io/driver/mysql v1.2.2 sigs.k8s.io/yaml v1.2.0 // indirect ) diff --git a/go.sum b/go.sum index 3a6600edb..a708e28db 100644 --- a/go.sum +++ b/go.sum @@ -279,6 +279,8 @@ github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKEN github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jinzhu/copier v0.3.4 h1:mfU6jI9PtCeUjkjQ322dlff9ELjGDu975C2p/nrubVI= +github.com/jinzhu/copier v0.3.4/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o= github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= @@ -878,10 +880,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gorm.io/driver/mysql v1.2.2 h1:2qoqhOun1maoJOfLtnzJwq+bZlHkEF34rGntgySqp48= -gorm.io/driver/mysql v1.2.2/go.mod h1:qsiz+XcAyMrS6QY+X3M9R6b/lKM1imKmcuK9kac5LTo= -gorm.io/gorm v1.22.4 h1:8aPcyEJhY0MAt8aY6Dc524Pn+pO29K+ydu+e/cXSpQM= -gorm.io/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= From 2293253d528bf13f8e719ab7d118c9d0720fa245 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:26:59 +0800 Subject: [PATCH 07/22] tidy code --- pkg/utils/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 42ae68820..fac9f4365 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -8,7 +8,7 @@ import ( // copy a by b b->a func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error) { - copier.Copy(&a, &b) + copier.Copy(a, &b) at := reflect.TypeOf(a) av := reflect.ValueOf(a) bt := reflect.TypeOf(b) From 6f92fa006983c32a7e4334bea2e075d57f89598b Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:30:00 +0800 Subject: [PATCH 08/22] tidy code --- internal/api/auth/auth.go | 2 +- pkg/utils/utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 649b97f66..9836cd853 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -27,7 +27,7 @@ func UserRegister(c *gin.Context) { return } req := &rpc.UserRegisterReq{} - utils.CopyStructFields(req.UserInfo, params) + utils.CopyStructFields(*req.UserInfo, params) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index fac9f4365..42ae68820 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -8,7 +8,7 @@ import ( // copy a by b b->a func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error) { - copier.Copy(a, &b) + copier.Copy(&a, &b) at := reflect.TypeOf(a) av := reflect.ValueOf(a) bt := reflect.TypeOf(b) From 508ccf4f9c9dbf2c47cb503e00a6cbfc212b3af1 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:31:38 +0800 Subject: [PATCH 09/22] tidy code --- pkg/utils/utils.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 42ae68820..dacdb012d 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -9,6 +9,7 @@ import ( // copy a by b b->a func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error) { copier.Copy(&a, &b) + return nil at := reflect.TypeOf(a) av := reflect.ValueOf(a) bt := reflect.TypeOf(b) From f43e1a10181804ffac781df401957df652e0274d Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:36:02 +0800 Subject: [PATCH 10/22] tidy code --- internal/api/auth/auth.go | 3 ++- pkg/utils/utils.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 9836cd853..d56390a77 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -6,6 +6,7 @@ import ( "Open_IM/pkg/common/log" "Open_IM/pkg/grpc-etcdv3/getcdv3" rpc "Open_IM/pkg/proto/auth" + open_im_sdk "Open_IM/pkg/proto/sdk_ws" "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" @@ -26,7 +27,7 @@ func UserRegister(c *gin.Context) { c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": "not authorized"}) return } - req := &rpc.UserRegisterReq{} + req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} utils.CopyStructFields(*req.UserInfo, params) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index dacdb012d..3d4a595fe 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -8,8 +8,8 @@ import ( // copy a by b b->a func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error) { - copier.Copy(&a, &b) - return nil + return copier.Copy(&a, &b) + at := reflect.TypeOf(a) av := reflect.ValueOf(a) bt := reflect.TypeOf(b) From 8e4f3b4f0619b536a0faaf4261b8b2b1ed8416a5 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:48:20 +0800 Subject: [PATCH 11/22] tidy code --- internal/api/auth/auth.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index d56390a77..912dc2157 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -7,9 +7,9 @@ import ( "Open_IM/pkg/grpc-etcdv3/getcdv3" rpc "Open_IM/pkg/proto/auth" open_im_sdk "Open_IM/pkg/proto/sdk_ws" - "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" + "github.com/jinzhu/copier" "net/http" "strings" ) @@ -28,7 +28,8 @@ func UserRegister(c *gin.Context) { return } req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} - utils.CopyStructFields(*req.UserInfo, params) + //utils.CopyStructFields(*req.UserInfo, params) + copier.Copy(req.UserInfo, ¶ms) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) From 166ec71a288772dd48394c07fa77fde058cd9a0f Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:50:05 +0800 Subject: [PATCH 12/22] tidy code --- internal/api/auth/auth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 912dc2157..5dde76778 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -37,7 +37,7 @@ func UserRegister(c *gin.Context) { reply, err := client.UserRegister(context.Background(), req) if err != nil || reply.CommonResp.ErrCode != 0 { - log.NewError("0", "UserRegister failed ", err.Error(), req.String()) + log.NewError("0", "UserRegister failed ", err, reply.CommonResp.ErrCode) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) return } From eb640157f2c5f277b7284ea6a47916e4c55e66e6 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:58:01 +0800 Subject: [PATCH 13/22] tidy code --- internal/api/auth/auth.go | 6 +++--- pkg/utils/utils.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 5dde76778..4ab27e3f4 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -7,6 +7,7 @@ import ( "Open_IM/pkg/grpc-etcdv3/getcdv3" rpc "Open_IM/pkg/proto/auth" open_im_sdk "Open_IM/pkg/proto/sdk_ws" + "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" "github.com/jinzhu/copier" @@ -28,16 +29,15 @@ func UserRegister(c *gin.Context) { return } req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} - //utils.CopyStructFields(*req.UserInfo, params) + utils.CopyStructFields(*req.UserInfo, params) copier.Copy(req.UserInfo, ¶ms) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) client := rpc.NewAuthClient(etcdConn) reply, err := client.UserRegister(context.Background(), req) - if err != nil || reply.CommonResp.ErrCode != 0 { - log.NewError("0", "UserRegister failed ", err, reply.CommonResp.ErrCode) + log.NewError(req.OperationID, "UserRegister failed ", err, reply.CommonResp.ErrCode) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) return } diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 3d4a595fe..d5dc0254a 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -8,7 +8,7 @@ import ( // copy a by b b->a func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error) { - return copier.Copy(&a, &b) + return copier.Copy(a, b) at := reflect.TypeOf(a) av := reflect.ValueOf(a) From dbd3ed49ed2cc41795a248f99483b74f04b5707a Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 16:59:17 +0800 Subject: [PATCH 14/22] tidy code --- internal/api/auth/auth.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 4ab27e3f4..5e77ea9de 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -38,7 +38,7 @@ func UserRegister(c *gin.Context) { reply, err := client.UserRegister(context.Background(), req) if err != nil || reply.CommonResp.ErrCode != 0 { log.NewError(req.OperationID, "UserRegister failed ", err, reply.CommonResp.ErrCode) - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": reply.CommonResp.ErrMsg}) return } From 2b60430c55336de2f75949d8c95738b72cf71991 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 17:03:37 +0800 Subject: [PATCH 15/22] tidy code --- pkg/common/db/mysql_model/im_mysql_model/model_struct.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/common/db/mysql_model/im_mysql_model/model_struct.go b/pkg/common/db/mysql_model/im_mysql_model/model_struct.go index 150aedd70..ac6ea4f86 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/model_struct.go +++ b/pkg/common/db/mysql_model/im_mysql_model/model_struct.go @@ -137,7 +137,7 @@ type GroupRequest struct { type User struct { UserID string `gorm:"column:user_id;primaryKey;"` Nickname string `gorm:"column:name"` - FaceUrl string `gorm:"column:icon"` + FaceUrl string `gorm:"column:face_url"` Gender int32 `gorm:"column:gender"` PhoneNumber string `gorm:"column:phone_number"` Birth string `gorm:"column:birth"` From eeee9a54d78ec5239675a5a5b950fa1672a5fce6 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 17:13:31 +0800 Subject: [PATCH 16/22] tidy code --- internal/api/auth/auth.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 5e77ea9de..2b3420d90 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -10,7 +10,6 @@ import ( "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" - "github.com/jinzhu/copier" "net/http" "strings" ) @@ -30,7 +29,7 @@ func UserRegister(c *gin.Context) { } req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} utils.CopyStructFields(*req.UserInfo, params) - copier.Copy(req.UserInfo, ¶ms) + // copier.Copy(req.UserInfo, ¶ms) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) From 62d0a7e6ffd149c6646bab74c6f8474a04002a9d Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 17:15:51 +0800 Subject: [PATCH 17/22] tidy code --- internal/api/auth/auth.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 2b3420d90..8881e27b1 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -7,9 +7,9 @@ import ( "Open_IM/pkg/grpc-etcdv3/getcdv3" rpc "Open_IM/pkg/proto/auth" open_im_sdk "Open_IM/pkg/proto/sdk_ws" - "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" + "github.com/jinzhu/copier" "net/http" "strings" ) @@ -28,8 +28,8 @@ func UserRegister(c *gin.Context) { return } req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} - utils.CopyStructFields(*req.UserInfo, params) - // copier.Copy(req.UserInfo, ¶ms) + // utils.CopyStructFields(*req.UserInfo, params) + copier.Copy(req.UserInfo, ¶ms) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) From 16e276d08ea8a600f9ad3dc5d8a67e3d0f6248af Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 17:45:57 +0800 Subject: [PATCH 18/22] tidy code --- internal/api/auth/auth.go | 3 ++- pkg/utils/utils.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 8881e27b1..5e77ea9de 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -7,6 +7,7 @@ import ( "Open_IM/pkg/grpc-etcdv3/getcdv3" rpc "Open_IM/pkg/proto/auth" open_im_sdk "Open_IM/pkg/proto/sdk_ws" + "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" "github.com/jinzhu/copier" @@ -28,7 +29,7 @@ func UserRegister(c *gin.Context) { return } req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} - // utils.CopyStructFields(*req.UserInfo, params) + utils.CopyStructFields(*req.UserInfo, params) copier.Copy(req.UserInfo, ¶ms) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index d5dc0254a..3d4a595fe 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -8,7 +8,7 @@ import ( // copy a by b b->a func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error) { - return copier.Copy(a, b) + return copier.Copy(&a, &b) at := reflect.TypeOf(a) av := reflect.ValueOf(a) From 848510d4ca50d87b58721ac144c67aa989b1c2cc Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 17:48:21 +0800 Subject: [PATCH 19/22] tidy code --- internal/api/auth/auth.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 5e77ea9de..813ff34de 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -10,7 +10,6 @@ import ( "Open_IM/pkg/utils" "context" "github.com/gin-gonic/gin" - "github.com/jinzhu/copier" "net/http" "strings" ) @@ -30,7 +29,7 @@ func UserRegister(c *gin.Context) { } req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} utils.CopyStructFields(*req.UserInfo, params) - copier.Copy(req.UserInfo, ¶ms) + //copier.Copy(req.UserInfo, ¶ms) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) etcdConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImAuthName) From ec95f0a7af0d26be51f510ac49121480cea6db75 Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 17:49:52 +0800 Subject: [PATCH 20/22] tidy code --- internal/api/auth/auth.go | 2 +- pkg/utils/utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 813ff34de..4b218f263 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -28,7 +28,7 @@ func UserRegister(c *gin.Context) { return } req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} - utils.CopyStructFields(*req.UserInfo, params) + utils.CopyStructFields(req.UserInfo, ¶ms) //copier.Copy(req.UserInfo, ¶ms) req.OperationID = params.OperationID log.NewInfo(req.OperationID, "UserRegister args ", req.String()) diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go index 3d4a595fe..d5dc0254a 100644 --- a/pkg/utils/utils.go +++ b/pkg/utils/utils.go @@ -8,7 +8,7 @@ import ( // copy a by b b->a func CopyStructFields(a interface{}, b interface{}, fields ...string) (err error) { - return copier.Copy(&a, &b) + return copier.Copy(a, b) at := reflect.TypeOf(a) av := reflect.ValueOf(a) From 188a90f97d0f670bf5d91fb5b54418239a2dbfcc Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 18:01:40 +0800 Subject: [PATCH 21/22] tidy code --- internal/api/auth/auth.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 4b218f263..315849aa2 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -36,8 +36,9 @@ func UserRegister(c *gin.Context) { client := rpc.NewAuthClient(etcdConn) reply, err := client.UserRegister(context.Background(), req) if err != nil || reply.CommonResp.ErrCode != 0 { - log.NewError(req.OperationID, "UserRegister failed ", err, reply.CommonResp.ErrCode) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": reply.CommonResp.ErrMsg}) + log.NewError(req.OperationID, "UserRegister failed ", err, reply.CommonResp.ErrCode) return } From 141936e609917a6e398029fed98627be4d17981e Mon Sep 17 00:00:00 2001 From: wenxu12345 <44203734@qq.com> Date: Tue, 28 Dec 2021 18:03:51 +0800 Subject: [PATCH 22/22] tidy code --- internal/api/auth/auth.go | 6 +++--- pkg/base_info/auth_api_struct.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/api/auth/auth.go b/internal/api/auth/auth.go index 315849aa2..4a912beca 100644 --- a/internal/api/auth/auth.go +++ b/internal/api/auth/auth.go @@ -36,9 +36,8 @@ func UserRegister(c *gin.Context) { client := rpc.NewAuthClient(etcdConn) reply, err := client.UserRegister(context.Background(), req) if err != nil || reply.CommonResp.ErrCode != 0 { - - c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": reply.CommonResp.ErrMsg}) log.NewError(req.OperationID, "UserRegister failed ", err, reply.CommonResp.ErrCode) + c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": reply.CommonResp.ErrMsg}) return } @@ -51,8 +50,9 @@ func UserRegister(c *gin.Context) { } resp := api.UserRegisterResp{CommResp: api.CommResp{ErrCode: replyToken.CommonResp.ErrCode, ErrMsg: replyToken.CommonResp.ErrMsg}, UserToken: api.UserTokenInfo{UserID: req.UserInfo.UserID, Token: replyToken.Token, ExpiredTime: replyToken.ExpiredTime}} - c.JSON(http.StatusOK, resp) log.NewInfo(req.OperationID, "UserRegister return ", resp) + c.JSON(http.StatusOK, resp) + } func UserToken(c *gin.Context) { diff --git a/pkg/base_info/auth_api_struct.go b/pkg/base_info/auth_api_struct.go index 8dd3923a4..a4db08f84 100644 --- a/pkg/base_info/auth_api_struct.go +++ b/pkg/base_info/auth_api_struct.go @@ -17,7 +17,7 @@ type UserRegisterReq struct { } type UserTokenInfo struct { - UserID string `json:"secret"` + UserID string `json:"userID"` Token string `json:"token"` ExpiredTime int64 `json:"expiredTime"` }