From 7a9506f61658577f5e5f10f76e0f4a50f226e943 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 27 Feb 2023 12:47:18 +0800 Subject: [PATCH 1/2] modify msg --- internal/msg_transfer/logic/modify_msg_handler.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/msg_transfer/logic/modify_msg_handler.go b/internal/msg_transfer/logic/modify_msg_handler.go index 30086c9dc..6bb4f9313 100644 --- a/internal/msg_transfer/logic/modify_msg_handler.go +++ b/internal/msg_transfer/logic/modify_msg_handler.go @@ -92,6 +92,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg msg = msgs[0] index = indexes[msg.Seq] } + msg.IsReact = true if err := db.DB.ReplaceMsgByIndex(notification.SourceID, msg, index); err != nil { log.NewError(msgDataToMQ.OperationID, "ReplaceMsgByIndex failed", notification.SourceID, *msg) } From 1c724aa89b2e5ff95f8868fa3530356292811ea0 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Tue, 28 Feb 2023 16:32:02 +0800 Subject: [PATCH 2/2] deploy --- deploy_k8s/admin_cms/deployment.yaml | 8 ++++---- deploy_k8s/api/deployment.yaml | 6 +++--- deploy_k8s/auth/deployment.yaml | 8 ++++---- deploy_k8s/cache/deployment.yaml | 4 ++-- deploy_k8s/cms_api/deployment.yaml | 8 ++++---- deploy_k8s/conversation/deployment.yaml | 8 ++++---- deploy_k8s/demo/deployment.yaml | 8 ++++---- deploy_k8s/friend/deployment.yaml | 8 ++++---- deploy_k8s/group/deployment.yaml | 8 ++++---- deploy_k8s/k8s_openim_deploy.md | 2 +- deploy_k8s/msg/deployment.yaml | 6 +++--- deploy_k8s/msg_gateway/deployment.yaml | 8 ++++---- deploy_k8s/msg_transfer/deployment.yaml | 8 ++++---- deploy_k8s/office/deployment.yaml | 8 ++++---- deploy_k8s/organization/deployment.yaml | 8 ++++---- deploy_k8s/push/deployment.yaml | 6 +++--- deploy_k8s/user/deployment.yaml | 8 ++++---- 17 files changed, 60 insertions(+), 60 deletions(-) diff --git a/deploy_k8s/admin_cms/deployment.yaml b/deploy_k8s/admin_cms/deployment.yaml index ea02fd80c..cfee86a69 100644 --- a/deploy_k8s/admin_cms/deployment.yaml +++ b/deploy_k8s/admin_cms/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,10 +34,10 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/api/deployment.yaml b/deploy_k8s/api/deployment.yaml index 4359a9062..e2c1a451b 100644 --- a/deploy_k8s/api/deployment.yaml +++ b/deploy_k8s/api/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -35,9 +35,9 @@ spec: - name: config configMap: name: openim-config - - name: usualConfig + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 --- diff --git a/deploy_k8s/auth/deployment.yaml b/deploy_k8s/auth/deployment.yaml index 3df74836a..733c52306 100644 --- a/deploy_k8s/auth/deployment.yaml +++ b/deploy_k8s/auth/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,9 +34,9 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/cache/deployment.yaml b/deploy_k8s/cache/deployment.yaml index 9dd2129da..c17749e10 100644 --- a/deploy_k8s/cache/deployment.yaml +++ b/deploy_k8s/cache/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -35,7 +35,7 @@ spec: - name: config configMap: name: openim-config - - name: usualConfig + - name: usualconfig configMap: name: openim-usualConfig strategy: #更新策略 diff --git a/deploy_k8s/cms_api/deployment.yaml b/deploy_k8s/cms_api/deployment.yaml index b55c0b4f7..2af5d3377 100644 --- a/deploy_k8s/cms_api/deployment.yaml +++ b/deploy_k8s/cms_api/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,10 +34,10 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 --- diff --git a/deploy_k8s/conversation/deployment.yaml b/deploy_k8s/conversation/deployment.yaml index b64ced25c..993761195 100644 --- a/deploy_k8s/conversation/deployment.yaml +++ b/deploy_k8s/conversation/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -35,10 +35,10 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/demo/deployment.yaml b/deploy_k8s/demo/deployment.yaml index 205bb0d51..a7f5550a1 100644 --- a/deploy_k8s/demo/deployment.yaml +++ b/deploy_k8s/demo/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,10 +34,10 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 --- diff --git a/deploy_k8s/friend/deployment.yaml b/deploy_k8s/friend/deployment.yaml index 9d8db0e87..dde9cbd4c 100644 --- a/deploy_k8s/friend/deployment.yaml +++ b/deploy_k8s/friend/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,10 +34,10 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/group/deployment.yaml b/deploy_k8s/group/deployment.yaml index dc9ccebee..96c3fe848 100644 --- a/deploy_k8s/group/deployment.yaml +++ b/deploy_k8s/group/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,9 +34,9 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/k8s_openim_deploy.md b/deploy_k8s/k8s_openim_deploy.md index 114a43c0b..4dad2c077 100644 --- a/deploy_k8s/k8s_openim_deploy.md +++ b/deploy_k8s/k8s_openim_deploy.md @@ -20,7 +20,7 @@ 2. 在项目根目录通过config/config.yaml ``` kubectl -n openim create configmap config --from-file=config/config.yaml - kubectl -n openim create configmap usualConfig --from-file=config/usualConfig.yaml + kubectl -n openim create configmap usualconfig --from-file=config/usualConfig.yaml ``` 查看configmap ``` diff --git a/deploy_k8s/msg/deployment.yaml b/deploy_k8s/msg/deployment.yaml index e8b3d6775..5538203f6 100644 --- a/deploy_k8s/msg/deployment.yaml +++ b/deploy_k8s/msg/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,9 +34,9 @@ spec: volumes: - name: config configMap: - name: openim-config + name: config - name: usualConfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/msg_gateway/deployment.yaml b/deploy_k8s/msg_gateway/deployment.yaml index e73070946..18ad66ca3 100644 --- a/deploy_k8s/msg_gateway/deployment.yaml +++ b/deploy_k8s/msg_gateway/deployment.yaml @@ -26,7 +26,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -37,10 +37,10 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 --- diff --git a/deploy_k8s/msg_transfer/deployment.yaml b/deploy_k8s/msg_transfer/deployment.yaml index a0d63a0d5..f47583b05 100644 --- a/deploy_k8s/msg_transfer/deployment.yaml +++ b/deploy_k8s/msg_transfer/deployment.yaml @@ -21,7 +21,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -32,9 +32,9 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 diff --git a/deploy_k8s/office/deployment.yaml b/deploy_k8s/office/deployment.yaml index e95b46a76..4e819971b 100644 --- a/deploy_k8s/office/deployment.yaml +++ b/deploy_k8s/office/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,9 +34,9 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/organization/deployment.yaml b/deploy_k8s/organization/deployment.yaml index 7a5174cd0..0b60fb4c2 100644 --- a/deploy_k8s/organization/deployment.yaml +++ b/deploy_k8s/organization/deployment.yaml @@ -23,7 +23,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -34,9 +34,9 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/push/deployment.yaml b/deploy_k8s/push/deployment.yaml index a3c03b974..1382e5a12 100644 --- a/deploy_k8s/push/deployment.yaml +++ b/deploy_k8s/push/deployment.yaml @@ -34,9 +34,9 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新 \ No newline at end of file diff --git a/deploy_k8s/user/deployment.yaml b/deploy_k8s/user/deployment.yaml index 6212524f1..c0c2d53bf 100644 --- a/deploy_k8s/user/deployment.yaml +++ b/deploy_k8s/user/deployment.yaml @@ -21,7 +21,7 @@ spec: - name: config mountPath: /Open-IM-Server/config readOnly: true - - name: usualConfig + - name: usualconfig mountPath: /Open-IM-Server/config readOnly: true env: @@ -32,9 +32,9 @@ spec: volumes: - name: config configMap: - name: openim-config - - name: usualConfig + name: config + - name: usualconfig configMap: - name: openim-usualConfig + name: usualconfig strategy: #更新策略 type: RollingUpdate # 滚动更新