From 0e64eef762f0a1826b5931d960f4cddc4e5f29ed Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <59896149+AndrewZuo01@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:55:26 +0800
Subject: [PATCH 1/5] Update openim.yaml
---
deployments/templates/openim.yaml | 276 +++++++++++++++---------------
1 file changed, 138 insertions(+), 138 deletions(-)
diff --git a/deployments/templates/openim.yaml b/deployments/templates/openim.yaml
index 801c6bb50..ff2fa896d 100644
--- a/deployments/templates/openim.yaml
+++ b/deployments/templates/openim.yaml
@@ -314,189 +314,189 @@ iosPush:
callback:
url: ""
beforeSendSingleMsg:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterSendSingleMsg:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeSendGroupMsg:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterSendGroupMsg:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
msgModify:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
userOnline:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
userOffline:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
userKickOff:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
offlinePush:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
onlinePush:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
superGroupOnlinePush:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeAddFriend:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeUpdateUserInfo:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeCreateGroup:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterCreateGroup:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeMemberJoinGroup:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeSetGroupMemberInfo:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterSetGroupMemberInfo:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
setMessageReactionExtensions:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
quitGroup:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
killGroupMember:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
dismissGroup:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
joinGroup:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
groupMsgRead:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
singleMsgRead:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
updateUserInfo:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeUserRegister:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterUserRegister:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
transferGroupOwner:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeSetFriendRemark:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterSetFriendRemark:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterGroupMsgRead:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterGroupMsgRevoke:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
afterJoinGroup:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
beforeInviteUserToGroup:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
joinGroupAfter:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
setGroupInfoAfter:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
setGroupInfoBefore:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
revokeMsgAfter:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
addBlackBefore:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
addFriendAfter:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
addFriendAgreeBefore:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
deleteFriendAfter:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
importFriendsBefore:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
importFriendsAfter:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
removeBlackAfter:
- enable: false
- timeout: 5
- failedContinue: true
+ enable: ${CALLBACK_ENABLE}
+ timeout: ${CALLBACK_TIMEOUT}
+ failedContinue: ${CALLBACK_FAILED_CONTINUE}
###################### Prometheus ######################
# Prometheus configuration for various services
# The number of Prometheus ports per service needs to correspond to rpcPort
From 2701f1cf9ecbc9ea997a2e430562c3cb8054fd16 Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <59896149+AndrewZuo01@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:56:07 +0800
Subject: [PATCH 2/5] Update environment.sh
---
scripts/install/environment.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh
index 6a87b44a6..b70e5b94c 100755
--- a/scripts/install/environment.sh
+++ b/scripts/install/environment.sh
@@ -376,7 +376,10 @@ def "FRIEND_VERIFY" "false" # 朋友验证
def "IOS_PUSH_SOUND" "xxx" # IOS推送声音
def "IOS_BADGE_COUNT" "true" # IOS徽章计数
def "IOS_PRODUCTION" "false" # IOS生产
-
+# callback 配置
+def "CALLBACK_ENABLE" "true" # 是否开启 Callback
+def "CALLBACK_TIMEOUT" "5" # 最长超时时间
+def "CALLBACK_FAILED_CONTINUE" "true" # 失败后是否继续
###################### Prometheus 配置信息 ######################
# 是否启用 Prometheus
readonly PROMETHEUS_ENABLE=${PROMETHEUS_ENABLE:-'false'}
From e3010bc87f1208c71c046f27729feebd1270e26b Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <59896149+AndrewZuo01@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:57:31 +0800
Subject: [PATCH 3/5] Update environment.md
---
docs/contrib/environment.md | 3 +++
1 file changed, 3 insertions(+)
diff --git a/docs/contrib/environment.md b/docs/contrib/environment.md
index 8de602d99..ff62629de 100644
--- a/docs/contrib/environment.md
+++ b/docs/contrib/environment.md
@@ -500,6 +500,9 @@ This section involves setting up additional configuration variables for Websocke
| TOKEN_EXPIRE | "90" | Token Expiry Time |
| FRIEND_VERIFY | "false" | Friend Verification Enable |
| IOS_PUSH_SOUND | "xxx" | iOS |
+| CALLBACK_ENABLE | "true" | Enable callback |
+| CALLBACK_TIMEOUT | "5" | Maximum timeout for callback call |
+| CALLBACK_FAILED_CONTINUE| "true" | fails to continue to the next step |
### 2.20. Prometheus Configuration
This section involves configuring Prometheus, including enabling/disabling it and setting up ports for various services.
From 583bea53994c84c1e3b871a14d6e06ddb14cbd95 Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <59896149+AndrewZuo01@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:00:13 +0800
Subject: [PATCH 4/5] Update environment.md
---
docs/contrib/environment.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/contrib/environment.md b/docs/contrib/environment.md
index ff62629de..b82ec0f45 100644
--- a/docs/contrib/environment.md
+++ b/docs/contrib/environment.md
@@ -500,7 +500,7 @@ This section involves setting up additional configuration variables for Websocke
| TOKEN_EXPIRE | "90" | Token Expiry Time |
| FRIEND_VERIFY | "false" | Friend Verification Enable |
| IOS_PUSH_SOUND | "xxx" | iOS |
-| CALLBACK_ENABLE | "true" | Enable callback |
+| CALLBACK_ENABLE | "false" | Enable callback |
| CALLBACK_TIMEOUT | "5" | Maximum timeout for callback call |
| CALLBACK_FAILED_CONTINUE| "true" | fails to continue to the next step |
### 2.20. Prometheus Configuration
From 7d486ad4a0769f0ed851aa88b07ad9000e9148ed Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <59896149+AndrewZuo01@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:00:56 +0800
Subject: [PATCH 5/5] Update environment.sh
---
scripts/install/environment.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/install/environment.sh b/scripts/install/environment.sh
index b70e5b94c..b0fd1b65c 100755
--- a/scripts/install/environment.sh
+++ b/scripts/install/environment.sh
@@ -377,7 +377,7 @@ def "IOS_PUSH_SOUND" "xxx" # IOS推送声音
def "IOS_BADGE_COUNT" "true" # IOS徽章计数
def "IOS_PRODUCTION" "false" # IOS生产
# callback 配置
-def "CALLBACK_ENABLE" "true" # 是否开启 Callback
+def "CALLBACK_ENABLE" "false" # 是否开启 Callback
def "CALLBACK_TIMEOUT" "5" # 最长超时时间
def "CALLBACK_FAILED_CONTINUE" "true" # 失败后是否继续
###################### Prometheus 配置信息 ######################