From 7fbdff391c107bdcb76b62523f41e49f9555783b Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 17 Jun 2022 11:09:48 +0800 Subject: [PATCH 1/3] fix bug --- internal/demo/register/onboarding_process.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/demo/register/onboarding_process.go b/internal/demo/register/onboarding_process.go index a4da17259..62630e126 100644 --- a/internal/demo/register/onboarding_process.go +++ b/internal/demo/register/onboarding_process.go @@ -261,7 +261,7 @@ func randomEnglishName() string { } func randomPosition() string { - l := []string{"Golang工程师", "前端工程师", "后端工程师", "产品经理", "测试开发工程师", "运维开发工程师"} + l := []string{"后端工程师", "前端工程师", "设计师"} rand.Seed(time.Now().UnixNano()) index := rand.Intn(len(l) - 1) return l[index] From 9443ed5d49d74f9002acfe155d1ecf9f34c869dc Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 17 Jun 2022 11:49:29 +0800 Subject: [PATCH 2/3] log for etcd --- pkg/grpc-etcdv3/getcdv3/register.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/grpc-etcdv3/getcdv3/register.go b/pkg/grpc-etcdv3/getcdv3/register.go index 7d877e058..4d9e3ee27 100644 --- a/pkg/grpc-etcdv3/getcdv3/register.go +++ b/pkg/grpc-etcdv3/getcdv3/register.go @@ -83,9 +83,9 @@ func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName strin select { case pv, ok := <-kresp: if ok == true { - log.Debug(operationID, "KeepAlive kresp ok", pv) + log.Debug(operationID, "KeepAlive kresp ok", pv, args) } else { - log.Error(operationID, "KeepAlive kresp failed", pv) + log.Error(operationID, "KeepAlive kresp failed ", pv, args) t := time.NewTicker(time.Duration(ttl/2) * time.Second) for { select { @@ -94,15 +94,15 @@ func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName strin ctx, _ := context.WithCancel(context.Background()) resp, err := cli.Grant(ctx, int64(ttl)) if err != nil { - log.Error(operationID, "Grant failed ", err.Error()) + log.Error(operationID, "Grant failed ", err.Error(), args) continue } if _, err := cli.Put(ctx, serviceKey, serviceValue, clientv3.WithLease(resp.ID)); err != nil { - log.Error(operationID, "etcd Put failed ", err.Error(), args, "resp ID: ", resp.ID) + log.Error(operationID, "etcd Put failed ", err.Error(), args, " resp ID: ", resp.ID) continue } else { - log.Info(operationID, "etcd Put ok ", args, "resp ID: ", resp.ID) + log.Info(operationID, "etcd Put ok ", args, " resp ID: ", resp.ID) } } } From c5eb8a3f9bf2f72430ce89b15a57b9f8a83caf79 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Fri, 17 Jun 2022 12:09:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=A5=E8=81=8C=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.yaml | 1 + internal/rpc/msg/group_notification.go | 20 +++++++++++-------- pkg/common/config/config.go | 5 +++-- .../mysql_model/im_mysql_model/user_model.go | 6 +++++- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index a12f8af3d..fcf70aaf6 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -222,6 +222,7 @@ manager: #app管理员userID和对应的secret 建议修改。 用于管理后台登录，也可以用户管理后台对应的api appManagerUid: [ "openIM123456","openIM654321", "openIM333", "openIMAdmin"] secrets: [ "openIM1","openIM2", "openIM333", "openIMAdmin"] + appSysNotificationName: "系统通知" secret: tuoyun # 多端互踢策略 diff --git a/internal/rpc/msg/group_notification.go b/internal/rpc/msg/group_notification.go index 65aabffb9..d2c6172fa 100644 --- a/internal/rpc/msg/group_notification.go +++ b/internal/rpc/msg/group_notification.go @@ -117,15 +117,19 @@ func groupNotification(contentType int32, m proto.Message, sendID, groupID, recv } tips.JsonDetail, _ = marshaler.MarshalToString(m) + var nickname string + if utils.IsContain(sendID, config.Config.Manager.AppManagerUid) { + nickname = sendID + } else { + from, err := imdb.GetUserByUserID(sendID) + if err != nil { + log.Error(operationID, "GetUserByUserID failed ", err.Error(), sendID) + } + if from != nil { + nickname = from.Nickname + } + } - from, err := imdb.GetUserByUserID(sendID) - if err != nil { - log.Error(operationID, "GetUserByUserID failed ", err.Error(), sendID) - } - nickname := "" - if from != nil { - nickname = from.Nickname - } to, err := imdb.GetUserByUserID(recvUserID) if err != nil { log.NewWarn(operationID, "GetUserByUserID failed ", err.Error(), recvUserID) diff --git a/pkg/common/config/config.go b/pkg/common/config/config.go index 780ecee9c..2163e7619 100644 --- a/pkg/common/config/config.go +++ b/pkg/common/config/config.go @@ -191,8 +191,9 @@ type config struct { } } Manager struct { - AppManagerUid []string `yaml:"appManagerUid"` - Secrets []string `yaml:"secrets"` + AppManagerUid []string `yaml:"appManagerUid"` + Secrets []string `yaml:"secrets"` + AppSysNotificationName string `yaml:"appSysNotificationName"` } Kafka struct { diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_model.go index 8882f6931..1598bac4e 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/user_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/user_model.go @@ -22,7 +22,11 @@ func init() { } var appMgr db.User appMgr.UserID = v - appMgr.Nickname = "AppManager" + utils.IntToString(k+1) + if k == 0 { + appMgr.Nickname = config.Config.Manager.AppSysNotificationName + } else { + appMgr.Nickname = "AppManager" + utils.IntToString(k+1) + } appMgr.AppMangerLevel = constant.AppAdmin err = UserRegister(appMgr) if err != nil {