From 92dc36f480acde7aaf12490e890504dfd7fc4a66 Mon Sep 17 00:00:00 2001 From: x-shadow-man <1494445739@qq.com> Date: Fri, 22 Jul 2022 09:40:54 +0800 Subject: [PATCH 1/7] config perf --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index c552a954d..145cccb62 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -72,7 +72,7 @@ kafka: serverip: 0.0.0.0 #作为rpc时，注册到etcd的地址，单机默认即可，如果是集群部署，需要修改（具体使用内网地址还是外网地址，要依情况而定，目的是api/gateway能访问到） -rpcRegisterIP: 127.0.0.1 +rpcRegisterIP: #默认即可 listenIP: 0.0.0.0 From 456e2f569306a6834ae857b9ab2f8cd196ee6d47 Mon Sep 17 00:00:00 2001 From: x-shadow-man <1494445739@qq.com> Date: Mon, 25 Jul 2022 10:24:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E8=A7=A3=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index 145cccb62..b96bbaa2a 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -71,7 +71,7 @@ kafka: #如果是单机模式，用0.0.0.0或者不填，默认即可 serverip: 0.0.0.0 -#作为rpc时，注册到etcd的地址，单机默认即可，如果是集群部署，需要修改（具体使用内网地址还是外网地址，要依情况而定，目的是api/gateway能访问到） +#作为rpc时，注册到etcd的地址，单机或内网集群调用默认为空即可(会默认注册本机ip），如果需要注册外网ip，需要修改（目的是api/gateway能访问到） rpcRegisterIP: #默认即可 listenIP: 0.0.0.0 From 5e09e3e07284be4d4aaf24b97fb73dd38d9fb45c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A7=E9=98=B3=E6=B0=8F?= Date: Thu, 11 Aug 2022 17:34:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8Daws=20s3=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index d92f6c9ea..c2b033599 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -130,15 +130,14 @@ credential: #腾讯cos，发送图片、视频、文件时需要，请自行申 stsDurationSeconds: 3600 OssRoleArn: "acs:ram::xxx:role/xxx" aws: - accessKeyID: ******************** #AssumeRole用户关联的accessKeyID - accessKeySecret: **************************************** #AssumeRole用户关联的accessKeySecrect - region: ap-southeast-1 #分区 - bucket: ouyang #桶 - finalHost: ouyang.s3.ap-southeast-1.amazonaws.com #对外Host - roleArn: arn:aws:iam::192209831083:role/AWS_S3_FOR_OUYANG #RoleArn - externalId: AssumeRoleExtend #角色扩展Id - roleSessionName: Required-AWS-ID-OPENIM #角色SESSION名称 - + accessKeyID: AKIASZQEZISVRBN4UEWJ #AssumeRole用户关联的accessKeyID + accessKeySecret: eBS3RyCRD8yUa7I7EGPbxjyBlKtdzN5a6tDnY/wZ #AssumeRole用户关联的accessKeySecrect + region: ap-southeast-1 #分区 + bucket: ouyang #桶 + finalHost: ouyang.s3.ap-southeast-1.amazonaws.com #对外Host + roleArn: arn:aws:iam::192209831083:role/AWS_S3_FOR_OUYANG #RoleArn + externalId: AssumeRoleExtend #角色扩展Id + roleSessionName: Required-AWS-ID-OPENIM #角色SESSION名称 dtm: serverURL: 127.0.0.1:10007 From 5cb3b8cfbf2f64cfa510cd6281a64e3e90c785e3 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 11 Aug 2022 17:49:22 +0800 Subject: [PATCH 4/7] submodule update --- cmd/Open-IM-SDK-Core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index 5e8d3f536..7ce9f1484 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit 5e8d3f5366700f00db7db2905da27189b9353630 +Subproject commit 7ce9f14846f90b42777577774feb869f149da067 From 73118ce447b7e9934d9fe2c59c7176076749c66b Mon Sep 17 00:00:00 2001 From: skiffer-git <44203734@qq.com> Date: Fri, 12 Aug 2022 21:49:54 +0800 Subject: [PATCH 5/7] config recover --- config/config.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/config.yaml b/config/config.yaml index 7192bf255..998a486c5 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -46,9 +46,9 @@ kafka: ws2mschat: addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可 topic: "ws2ms_chat" #用于mongo和mysql保存消息 -# ws2mschatoffline: -# addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可 -# topic: "ws2ms_chat_offline" #原为离线用户消息处理，目前暂时弃用 + ws2mschatoffline: + addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可 + topic: "ws2ms_chat_offline" #原为离线用户消息处理，目前暂时弃用 msgtomongo: addr: [ 127.0.0.1:9092 ] #kafka配置，默认即可 topic: "msg_to_mongo" @@ -63,6 +63,7 @@ kafka: + #---------------Internal service configuration---------------------# # The service ip default is empty, From 8cf7282f468f229046bcee3ad7a9889b1b14e969 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Wed, 24 Aug 2022 18:12:00 +0800 Subject: [PATCH 6/7] add version --- config/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.yaml b/config/config.yaml index 7236c9c32..5fbfe7492 100644 --- a/config/config.yaml +++ b/config/config.yaml @@ -2,7 +2,7 @@ # The class cannot be named by Pascal or camel case. # If it is not used, the corresponding structure will not be set, # and it will not be read naturally. -serverversion: 2.3.0 +serverversion: 2.3.1 #---------------Infrastructure configuration---------------------# etcd: etcdSchema: openim #默认即可 From 4001897338d4a1423330f5fb8c1ee331c27371c2 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Thu, 25 Aug 2022 14:02:18 +0800 Subject: [PATCH 7/7] compose file update --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index aeac41995..115c49f9e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -126,7 +126,7 @@ services: # STORE_PORT: 3306 open_im_server: - image: openim/open_im_server:v2.3.0 + image: openim/open_im_server:v2.3.1 container_name: open_im_server volumes: - ./logs:/Open-IM-Server/logs