blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-13 07:09:01 +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
commit 0e03c5f89e
18 changed files with 61 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deploy_k8s/admin_cms/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,10 +34,10 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

6
deploy_k8s/api/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -35,9 +35,9 @@ spec:
- name: config - name: config
configMap: configMap:
name: openim-config name: openim-config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新
--- ---

8
deploy_k8s/auth/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,9 +34,9 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

4
deploy_k8s/cache/deployment.yaml vendored
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -35,7 +35,7 @@ spec:
- name: config - name: config
configMap: configMap:
name: openim-config name: openim-config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: openim-usualConfig
strategy: #更新策略 strategy: #更新策略

8
deploy_k8s/cms_api/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,10 +34,10 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新
--- ---

8
deploy_k8s/conversation/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -35,10 +35,10 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

8
deploy_k8s/demo/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,10 +34,10 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新
--- ---

8
deploy_k8s/friend/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,10 +34,10 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

8
deploy_k8s/group/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,9 +34,9 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

2
deploy_k8s/k8s_openim_deploy.md
View File

@ -20,7 +20,7 @@
2. 在项目根目录通过config/config.yaml 2. 在项目根目录通过config/config.yaml
``` ```
kubectl -n openim create configmap config --from-file=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 查看configmap
``` ```

6
deploy_k8s/msg/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,9 +34,9 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualConfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

8
deploy_k8s/msg_gateway/deployment.yaml
View File

@ -26,7 +26,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -37,10 +37,10 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新
--- ---

8
deploy_k8s/msg_transfer/deployment.yaml
View File

@ -21,7 +21,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -32,9 +32,9 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

8
deploy_k8s/office/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,9 +34,9 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

8
deploy_k8s/organization/deployment.yaml
View File

@ -23,7 +23,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -34,9 +34,9 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

6
deploy_k8s/push/deployment.yaml
View File

@ -34,9 +34,9 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

8
deploy_k8s/user/deployment.yaml
View File

@ -21,7 +21,7 @@ spec:
- name: config - name: config
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
- name: usualConfig - name: usualconfig
mountPath: /Open-IM-Server/config mountPath: /Open-IM-Server/config
readOnly: true readOnly: true
env: env:
@ -32,9 +32,9 @@ spec:
volumes: volumes:
- name: config - name: config
configMap: configMap:
name: openim-config name: config
- name: usualConfig - name: usualconfig
configMap: configMap:
name: openim-usualConfig name: usualconfig
strategy: #更新策略 strategy: #更新策略
type: RollingUpdate # 滚动更新 type: RollingUpdate # 滚动更新

1
internal/msg_transfer/logic/modify_msg_handler.go
View File

@ -92,6 +92,7 @@ func (mmc *ModifyMsgConsumerHandler) ModifyMsg(cMsg *sarama.ConsumerMessage, msg
msg = msgs[0] msg = msgs[0]
index = indexes[msg.Seq] index = indexes[msg.Seq]
} }
msg.IsReact = true
if err := db.DB.ReplaceMsgByIndex(notification.SourceID, msg, index); err != nil { if err := db.DB.ReplaceMsgByIndex(notification.SourceID, msg, index); err != nil {
log.NewError(msgDataToMQ.OperationID, "ReplaceMsgByIndex failed", notification.SourceID, *msg) log.NewError(msgDataToMQ.OperationID, "ReplaceMsgByIndex failed", notification.SourceID, *msg)
} }