IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-04-28 14:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.3.0release' into v2.3.0release

Browse Source
This commit is contained in:
Gordon
2023-02-28 16:36:21 +08:00
parent 70502685ce a2fe6ffc7a
commit 0e03c5f89e
18 changed files with 61 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy_k8s/admin_cms/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
deploy_k8s/api/deployment.yaml
+3 -3
View File
@@ -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 # 滚动更新
---
deploy_k8s/auth/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
deploy_k8s/cache/deployment.yaml
Vendored
+2 -2
View File
@@ -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: #更新策略
deploy_k8s/cms_api/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
---
deploy_k8s/conversation/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
deploy_k8s/demo/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
---
deploy_k8s/friend/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
deploy_k8s/group/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
deploy_k8s/k8s_openim_deploy.md
+1 -1
View File
@@ -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
```
deploy_k8s/msg/deployment.yaml
+3 -3
View File
@@ -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 # 滚动更新
deploy_k8s/msg_gateway/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
---
deploy_k8s/msg_transfer/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
deploy_k8s/office/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
deploy_k8s/organization/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
deploy_k8s/push/deployment.yaml
+3 -3
View File
@@ -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 # 滚动更新
deploy_k8s/user/deployment.yaml
+4 -4
View File
@@ -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 # 滚动更新
internal/msg_transfer/logic/modify_msg_handler.go
+1
View File
@@ -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)
}