Organization

pull/455/head
skiffer-git 3 years ago committed by Xinwei Xiong(cubxxw-openim)
parent 066fae0b74
commit 2d57f742e2

@ -204,6 +204,9 @@ secret: tuoyun
# 1多平台登录Android、iOS、Windows、Mac 每种平台只能一个在线web端可以多个同时在线 # 1多平台登录Android、iOS、Windows、Mac 每种平台只能一个在线web端可以多个同时在线
multiloginpolicy: 1 multiloginpolicy: 1
#chat log insert to db
chatPersistenceMysql: true
#token config #token config
tokenpolicy: tokenpolicy:
accessSecret: "open_im_server" #token生成相关默认即可 accessSecret: "open_im_server" #token生成相关默认即可

@ -23,8 +23,9 @@ func UserRegister(c *gin.Context) {
} }
if params.Secret != config.Config.Secret { if params.Secret != config.Config.Secret {
log.NewError(params.OperationID, "params.Secret != config.Config.Secret", params.Secret, config.Config.Secret) errMsg := " params.Secret != config.Config.Secret "
c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": "not authorized"}) log.NewError(params.OperationID, errMsg, params.Secret, config.Config.Secret)
c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": errMsg})
return return
} }
req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}} req := &rpc.UserRegisterReq{UserInfo: &open_im_sdk.UserInfo{}}
@ -36,7 +37,7 @@ func UserRegister(c *gin.Context) {
client := rpc.NewAuthClient(etcdConn) client := rpc.NewAuthClient(etcdConn)
reply, err := client.UserRegister(context.Background(), req) reply, err := client.UserRegister(context.Background(), req)
if err != nil { if err != nil {
log.NewError(req.OperationID, "call rpc err ", err) log.NewError(req.OperationID, "call rpc err ", err.Error())
c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "internal service err"}) c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": "internal service err"})
return return
} }

@ -56,10 +56,14 @@ func (pc *PersistentConsumerHandler) handleChatWs2Mysql(msg []byte, msgKey strin
} }
} }
if tag { if tag {
log.NewInfo(msgFromMQ.OperationID, "msg_transfer msg persisting", string(msg)) if config.Config.ChatPersistenceMysql == true {
if err = im_mysql_msg_model.InsertMessageToChatLog(msgFromMQ); err != nil { log.NewInfo(msgFromMQ.OperationID, "msg_transfer msg persisting", string(msg))
log.NewError(msgFromMQ.OperationID, "Message insert failed", "err", err.Error(), "msg", msgFromMQ.String()) if err = im_mysql_msg_model.InsertMessageToChatLog(msgFromMQ); err != nil {
return log.NewError(msgFromMQ.OperationID, "Message insert failed", "err", err.Error(), "msg", msgFromMQ.String())
return
}
} else {
log.Debug(msgFromMQ.OperationID, "don't insert to db", string(msg))
} }
} }

@ -176,6 +176,7 @@ type config struct {
AppManagerUid []string `yaml:"appManagerUid"` AppManagerUid []string `yaml:"appManagerUid"`
Secrets []string `yaml:"secrets"` Secrets []string `yaml:"secrets"`
} }
Kafka struct { Kafka struct {
Ws2mschat struct { Ws2mschat struct {
Addr []string `yaml:"addr"` Addr []string `yaml:"addr"`
@ -191,9 +192,11 @@ type config struct {
MsgToPush string `yaml:"msgToPush"` MsgToPush string `yaml:"msgToPush"`
} }
} }
Secret string `yaml:"secret"` Secret string `yaml:"secret"`
MultiLoginPolicy int `yaml:"multiloginpolicy"` MultiLoginPolicy int `yaml:"multiloginpolicy"`
TokenPolicy struct { ChatPersistenceMysql bool `yaml:"chatPersistenceMysql"`
TokenPolicy struct {
AccessSecret string `yaml:"accessSecret"` AccessSecret string `yaml:"accessSecret"`
AccessExpire int64 `yaml:"accessExpire"` AccessExpire int64 `yaml:"accessExpire"`
} }

Loading…
Cancel
Save