Adjust configuration settings

2 years ago · 069cc580a6
parent e352bbafa1
commit 069cc580a6
27 changed files with 178 additions and 184 deletions
--- a/config/kafka-config.yaml
+++ b/config/kafka-config.yaml
@ -1,15 +0,0 @@
-kafka:
-  username: ''
-  password: ''
-  addr: [ 172.28.0.1:19094 ]
-  latestMsgToRedis:
-    topic: "latestMsgToRedis"
-  offlineMsgToMongo:
-    topic: "offlineMsgToMongoMysql"
-  msgToPush:
-    topic: "msgToPush"
-  consumerGroupID:
-    msgToRedis: redis
-    msgToMongo: mongo
-    msgToMySql: mysql
-    msgToPush: push
--- a/config/kafka.yml
+++ b/config/kafka.yml
@ -0,0 +1,14 @@
+username: ''
+password: ''
+addr: [ 172.28.0.1:19094 ]
+latestMsgToRedis:
+  topic: "latestMsgToRedis"
+offlineMsgToMongo:
+  topic: "offlineMsgToMongoMysql"
+msgToPush:
+  topic: "msgToPush"
+consumerGroupID:
+  msgToRedis: redis
+  msgToMongo: mongo
+  msgToMySql: mysql
+  msgToPush: push
--- a/config/log.yml
+++ b/config/log.yml
@ -0,0 +1,7 @@
+storageLocation: /data/workspaces/open-im-server/_output/logs/
+rotationTime: 24
+remainRotationCount: 2
+remainLogLevel: 6
+isStdout: false
+isJson: false
+withStack: false
--- a/config/minio-config.yaml
+++ b/config/minio-config.yaml
@ -1,10 +0,0 @@
-minio:
-  bucket: "openim"
-  port: 10005
-  accessKeyID: "root"
-  secretAccessKey: "openIM123"
-  sessionToken: ''
-  internalIP: 172.28.0.1
-  externalIP: 150.109.93.151
-  url: https://image.rentsoft.cn/
-  publicRead: false
--- a/config/minio.yml
+++ b/config/minio.yml
@ -0,0 +1,9 @@
+bucket: "openim"
+port: 10005
+accessKeyID: "root"
+secretAccessKey: "openIM123"
+sessionToken: ''
+internalIP: 172.28.0.1
+externalIP: 150.109.93.151
+url: https://image.rentsoft.cn/
+publicRead: false
--- a/config/mongo-config.yaml
+++ b/config/mongo-config.yaml
@ -1,7 +0,0 @@
-mongo:
-  uri: ''
-  address: [ 172.28.0.1:37017 ]
-  database: openim_v3
-  username: openIM
-  password: openIM123
-  maxPoolSize: 100
--- a/config/mongo.yml
+++ b/config/mongo.yml
@ -0,0 +1,6 @@
+uri: ''
+address: [ 172.28.0.1:37017 ]
+database: openim_v3
+username: openIM
+password: openIM123
+maxPoolSize: 100
--- a/config/object-storage-config.yaml
+++ b/config/object-storage-config.yaml
@ -1,31 +0,0 @@
-object:
-  enable: "minio"
-  cos:
-    bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com
-    secretID: ''
-    secretKey: ''
-    sessionToken: ''
-    publicRead: false
-  oss:
-    endpoint: "https://oss-cn-chengdu.aliyuncs.com"
-    bucket: "demo-9999999"
-    bucketURL: "https://demo-9999999.oss-cn-chengdu.aliyuncs.com"
-    accessKeyID: ''
-    accessKeySecret: ''
-    sessionToken: ''
-    publicRead: false
-  kodo:
-    endpoint: "http://s3.cn-east-1.qiniucs.com"
-    bucket: "demo-9999999"
-    bucketURL: "http://your.domain.com"
-    accessKeyID: ''
-    accessKeySecret: ''
-    sessionToken: ''
-    publicRead: false
-  aws:
-    endpoint: "''"
-    region: "us-east-1"
-    bucket: "demo-9999999"
-    accessKeyID: ''
-    accessKeySecret: ''
-    publicRead: false
--- a/config/openim-api.yml
+++ b/config/openim-api.yml
@ -1,7 +1,8 @@
 api:
-  openImApiPort: [ 10002 ]
  listenIP: 0.0.0.0
+  ports: [ 10002 ]
+
 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [20100]
+  ports: [20100]
+  grafanaURL: http://127.0.0.1:13000/
--- a/config/openim-cmdutils.yml
+++ b/config/openim-cmdutils.yml
@ -1,3 +0,0 @@
-cmdUtils:
-  toolName:
-    configOption: value
--- a/config/openim-crontask.yml
+++ b/config/openim-crontask.yml
@ -1,8 +1,3 @@
-cronTasks:
-  chatRecordsClearTime: "0 2 * * 3"
-  msgDestructTime: "0 2 * * *"
-
-
-  retainChatRecords: 365
-
-
+chatRecordsClearTime: "0 2 * * 3"
+msgDestructTime: "0 2 * * *"
+retainChatRecords: 365
--- a/config/openim-msggateway.yml
+++ b/config/openim-msggateway.yml
@ -1,13 +1,19 @@
+rpc:
+  registerIP: ''
+  ports: [ 10140 ]
+
+prometheus:
+  enable: true
+  ports: [ 20140 ]
+
+listenIP: 0.0.0.0
+
 longConnSvr:
-  openImWsPort: [ 10001 ]
+  ports: [ 10001 ]
  websocketMaxConnNum: 100000
-  openImMessageGatewayPort: [ 10140 ]
  websocketMaxMsgLen: 4096
  websocketTimeout: 10
-prometheus:
-  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 20140 ]
+
 multiLoginPolicy: 1


--- a/config/openim-msgtransfer.yml
+++ b/config/openim-msgtransfer.yml
@ -1,5 +1,7 @@
 # msgtransfer
 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 21400, 21401, 21402, 21403 ] # List of ports
+  ports: [ 21400, 21401, 21402, 21403 ] # List of ports
+
+
+msgCacheTimeout: 86400
--- a/config/openim-push.yml
+++ b/config/openim-push.yml
@ -1,27 +1,37 @@
-push:
-  enable: getui
-  geTui:
-    pushUrl: "https://restapi.getui.com/v2/$appId"
-    masterSecret: ''
-    appKey: ''
-    intent: ''
-    channelID: ''
-    channelName: ''
-  fcm:
-    serviceAccount: "x.json"
-  jpns:
-    appKey: ''
-    masterSecret: ''
-    pushUrl: ''
-    pushIntent: ''
+rpc:
+  registerIP: ''
+  listenIP: 0.0.0.0
+  ports: [ 10170 ]
+
+prometheus:
+  enable: true
+  ports: [ 20170 ]
+
+
+enable: getui
+geTui:
+  pushUrl: "https://restapi.getui.com/v2/$appId"
+  masterSecret: ''
+  appKey: ''
+  intent: ''
+  channelID: ''
+  channelName: ''
+fcm:
+  serviceAccount: "x.json"
+jpns:
+  appKey: ''
+  masterSecret: ''
+  pushURL: ''
+  pushIntent: ''

 iosPush:
      pushSound: "xxx"
      badgeCount: true
      production: false

-prometheus:
-  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 20170 ]
+
+
+
+
+

--- a/config/openim-rpc-auth.yml
+++ b/config/openim-rpc-auth.yml
@ -1,11 +1,11 @@
 rpc:
  registerIP: ''
  listenIP: 0.0.0.0
-rpcPort:
-  openImAuthPort: [ 10160 ]
-rpcRegisterName:
-  openImAuthName: Auth
+  ports: [ 10160 ]
+
 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [20160]
+  ports: [20160]
+
+tokenPolicy:
+  expire: 90
--- a/config/openim-rpc-conversation.yml
+++ b/config/openim-rpc-conversation.yml
@ -1,12 +1,11 @@
 rpc:
  registerIP: ''
  listenIP: 0.0.0.0
-rpcPort:
-  openImConversationPort: [ 10180 ]
-rpcRegisterName:
-  openImConversationName: Conversation
+  ports: [ 10180 ]
+
 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 20230 ]
+  ports: [20230]
+
+

--- a/config/openim-rpc-friend.yml
+++ b/config/openim-rpc-friend.yml
@ -1,11 +1,8 @@
 rpc:
  registerIP: ''
  listenIP: 0.0.0.0
-rpcPort:
-  openImFriendPort: [ 10120 ]
-rpcRegisterName:
-  openImFriendName: Friend
+  ports: [ 10120 ]
+
 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 20120 ]
+  ports: [ 20120 ]
--- a/config/openim-rpc-group.yml
+++ b/config/openim-rpc-group.yml
@ -1,12 +1,9 @@
 rpc:
  registerIP: ''
  listenIP: 0.0.0.0
-rpcPort:
-  openImGroupPort: [ 10150 ]
-rpcRegisterName:
-  openImGroupName: Group
+  ports: [ 10150 ]
+
 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 20150 ]
+  ports: [20150]

--- a/config/openim-rpc-msg.yml
+++ b/config/openim-rpc-msg.yml
@ -1,14 +1,13 @@
 rpc:
  registerIP: ''
  listenIP: 0.0.0.0
-rpcPort:
-  openImMessagePort: [ 10130 ]
-rpcRegisterName:
-  openImMsgName: Msg
+  ports: [ 10130 ]
+
 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 20130 ]
+  ports: [20130]
+
+

 messageVerify:
  friendVerify: false
--- a/config/openim-rpc-third.yml
+++ b/config/openim-rpc-third.yml
@ -1,14 +1,40 @@
 rpc:
  registerIP: ''
  listenIP: 0.0.0.0
-rpcPort:
-  openImThirdPort: [ 10190 ]
-rpcRegisterName:
-  openImThirdName: Third
+  ports: [ 10190 ]

 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 21301 ]
-
+  ports: [21301]

+object:
+  enable: "minio"
+  cos:
+    bucketURL: https://temp-1252357374.cos.ap-chengdu.myqcloud.com
+    secretID: ''
+    secretKey: ''
+    sessionToken: ''
+    publicRead: false
+  oss:
+    endpoint: "https://oss-cn-chengdu.aliyuncs.com"
+    bucket: "demo-9999999"
+    bucketURL: "https://demo-9999999.oss-cn-chengdu.aliyuncs.com"
+    accessKeyID: ''
+    accessKeySecret: ''
+    sessionToken: ''
+    publicRead: false
+  kodo:
+    endpoint: "http://s3.cn-east-1.qiniucs.com"
+    bucket: "demo-9999999"
+    bucketURL: "http://your.domain.com"
+    accessKeyID: ''
+    accessKeySecret: ''
+    sessionToken: ''
+    publicRead: false
+  aws:
+    endpoint: "''"
+    region: "us-east-1"
+    bucket: "demo-9999999"
+    accessKeyID: ''
+    accessKeySecret: ''
+    publicRead: false
--- a/config/openim-rpc-user.yml
+++ b/config/openim-rpc-user.yml
@ -1,13 +1,10 @@
 rpc:
  registerIP: ''
  listenIP: 0.0.0.0
-rpcPort:
-  openImUserPort: [ 10110 ]
-rpcRegisterName:
-  openImUserName: User
+  ports: [ 10110 ]

 prometheus:
  enable: true
-  grafanaUrl: http://127.0.0.1:13000/
-  prometheusPort: [ 20110 ]
+  ports: [20110]
+

--- a/config/openim.yaml
+++ b/config/openim.yaml
@ -1,31 +0,0 @@
-# openim.yaml 作为存放一些通用配置或特殊配置的文件，我们将包含日志、消息缓存、多登录策略、消息验证策略等配置。
-# 这些配置是跨多个服务的共享配置，它们对于整个系统的运行至关重要。
-log:
-  storageLocation: /data/workspaces/open-im-server/_output/logs/
-  rotationTime: 24
-  remainRotationCount: 2
-  remainLogLevel: 6
-  isStdout: false
-  isJson: false
-  withStack: false
-
-msgCacheTimeout: 86400
-
-
-
-
-
-tokenPolicy:
-  expire: 90
-
-
-
-
-
-
-
-secret: openIM123
-
-
-
-
--- a/config/redis-config.yaml
+++ b/config/redis-config.yaml
--- a/config/share.yml
+++ b/config/share.yml
@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+secret: openIM123
+
+
+
+im-admin:
+  userID: [ "imAdmin" ]
+  nickname: [ "imAdmin" ]
--- a/config/callback.yaml
+++ b/config/callback.yaml
--- a/config/zookeeper-config.yaml
+++ b/config/zookeeper-config.yaml
@ -1,5 +0,0 @@
-zookeeper:
-  schema: openim
-  address: [ 172.28.0.1:12181 ]
-  username: ''
-  password: ''
--- a/config/zookeeper.yml
+++ b/config/zookeeper.yml
@ -0,0 +1,16 @@
+
+schema: openim
+address: [ 172.28.0.1:12181 ]
+username: ''
+password: ''
+
+rpcRegisterName:
+  User: User
+  Friend: Friend
+  Msg: Msg
+  Push: Push
+  MessageGateway: MessageGateway
+  Group: Group
+  Auth: Auth
+  Conversation: Conversation
+  Third: Third