From 650851a1b10ba1e622469ecc46f7d6f5a2564eb5 Mon Sep 17 00:00:00 2001
From: Gordon <46924906+FGadvancer@users.noreply.github.com>
Date: Wed, 3 Apr 2024 14:33:21 +0800
Subject: [PATCH] refactor: config change.

---
 config/openim-api.yml        |  2 +-
 config/openim-crontask.yml   |  5 ++++
 config/openim-msggateway.yml |  1 +
 config/openim-push.yml       |  6 +++++
 config/openim-rpc-msg.yml    |  7 ++++++
 config/openim.yaml           | 48 +++++-------------------------------
 6 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/config/openim-api.yml b/config/openim-api.yml
index f0f94de44..bc9309b11 100644
--- a/config/openim-api.yml
+++ b/config/openim-api.yml
@@ -6,4 +6,4 @@ api:
 prometheus:
   enable: true
   grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [20100]
\ No newline at end of file
+  prometheusPort: [20100]
diff --git a/config/openim-crontask.yml b/config/openim-crontask.yml
index bdc2f9e1a..52e14e34e 100644
--- a/config/openim-crontask.yml
+++ b/config/openim-crontask.yml
@@ -1,3 +1,8 @@
 cronTasks:
   chatRecordsClearTime: "0 2 * * 3"
   msgDestructTime: "0 2 * * *"
+
+
+  retainChatRecords: 365
+
+
diff --git a/config/openim-msggateway.yml b/config/openim-msggateway.yml
index 370a96ffb..610c61c4e 100644
--- a/config/openim-msggateway.yml
+++ b/config/openim-msggateway.yml
@@ -8,5 +8,6 @@ prometheus:
   enable: true
   grafanaUrl: http://127.0.0.1:13000/
   prometheusPort: [ 20140 ]
+multiLoginPolicy: 1
 
 
diff --git a/config/openim-push.yml b/config/openim-push.yml
index 69ab6eef4..d35ccd1f2 100644
--- a/config/openim-push.yml
+++ b/config/openim-push.yml
@@ -14,6 +14,12 @@ push:
     masterSecret: ''
     pushUrl: ''
     pushIntent: ''
+
+iosPush:
+      pushSound: "xxx"
+      badgeCount: true
+      production: false
+
 prometheus:
   enable: true
   grafanaUrl: http://127.0.0.1:13000/
diff --git a/config/openim-rpc-msg.yml b/config/openim-rpc-msg.yml
index 761e71162..57ae9d274 100644
--- a/config/openim-rpc-msg.yml
+++ b/config/openim-rpc-msg.yml
@@ -10,3 +10,10 @@ prometheus:
   grafanaUrl: http://127.0.0.1:13000/
   prometheusPort: [ 20130 ]
 
+messageVerify:
+  friendVerify: false
+
+  groupMessageHasReadReceiptEnable: true
+
+  singleMessageHasReadReceiptEnable: true
+
diff --git a/config/openim.yaml b/config/openim.yaml
index b3c8afc71..182088597 100644
--- a/config/openim.yaml
+++ b/config/openim.yaml
@@ -11,57 +11,21 @@ log:
 
 msgCacheTimeout: 86400
 
-multiLoginPolicy: 1
 
-messageVerify:
-  friendVerify: false
+
+
 
 tokenPolicy:
   expire: 90
 
-groupMessageHasReadReceiptEnable: true
 
-singleMessageHasReadReceiptEnable: true
 
-retainChatRecords: 365
 
-chatRecordsClearTime: "0 2 * * 3"
 
-msgDestructTime: "0 2 * * *"
+
 
 secret: openIM123
 
-iosPush:
-  pushSound: "xxx"
-  badgeCount: true
-  production: false
-
-
-###################### Third-party service configuration ######################
-# Callback configuration
-#
-# Callback URL
-# Whether to enable this callback event
-# Timeout in seconds
-# Whether to continue execution if callback fails
-
-
-###################### Prometheus ######################
-# Prometheus configuration for various services
-# The number of Prometheus ports per service needs to correspond to rpcPort
-# The number of ports needs to be consistent with msg_transfer_service_num in script/path_info.sh
-prometheus:
-  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  apiPrometheusPort: [20100]
-  userPrometheusPort: [ 20110 ]
-  friendPrometheusPort: [ 20120 ]
-  messagePrometheusPort: [ 20130 ]
-  messageGatewayPrometheusPort: [ 20140 ]
-  groupPrometheusPort: [ 20150 ]
-  authPrometheusPort: [ 20160 ]
-  pushPrometheusPort: [ 20170 ]
-  conversationPrometheusPort: [ 20230 ]
-  rtcPrometheusPort: [ 21300 ]
-  thirdPrometheusPort: [ 21301 ]
-  messageTransferPrometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports
+
+
+