diff --git a/config/kafka-config.yaml b/config/kafka-config.yaml deleted file mode 100644 index 0fcdb0156..000000000 --- a/config/kafka-config.yaml +++ /dev/null @@ -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 diff --git a/config/kafka.yml b/config/kafka.yml new file mode 100644 index 000000000..d0cafd929 --- /dev/null +++ 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 diff --git a/config/log.yml b/config/log.yml new file mode 100644 index 000000000..88d60152b --- /dev/null +++ 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 diff --git a/config/minio-config.yaml b/config/minio-config.yaml deleted file mode 100644 index de4b921c9..000000000 --- a/config/minio-config.yaml +++ /dev/null @@ -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 diff --git a/config/minio.yml b/config/minio.yml new file mode 100644 index 000000000..d22866d70 --- /dev/null +++ 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 diff --git a/config/mongo-config.yaml b/config/mongo-config.yaml deleted file mode 100644 index 1ac9740c7..000000000 --- a/config/mongo-config.yaml +++ /dev/null @@ -1,7 +0,0 @@ -mongo: - uri: '' - address: [ 172.28.0.1:37017 ] - database: openim_v3 - username: openIM - password: openIM123 - maxPoolSize: 100 diff --git a/config/mongo.yml b/config/mongo.yml new file mode 100644 index 000000000..39adbc2ff --- /dev/null +++ b/config/mongo.yml @@ -0,0 +1,6 @@ +uri: '' +address: [ 172.28.0.1:37017 ] +database: openim_v3 +username: openIM +password: openIM123 +maxPoolSize: 100 diff --git a/config/object-storage-config.yaml b/config/object-storage-config.yaml deleted file mode 100644 index 0528f9a28..000000000 --- a/config/object-storage-config.yaml +++ /dev/null @@ -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 diff --git a/config/openim-api.yml b/config/openim-api.yml index 116178ec3..7820f41dc 100644 --- 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/ diff --git a/config/openim-cmdutils.yml b/config/openim-cmdutils.yml deleted file mode 100644 index d57b17b8e..000000000 --- a/config/openim-cmdutils.yml +++ /dev/null @@ -1,3 +0,0 @@ -cmdUtils: - toolName: - configOption: value diff --git a/config/openim-crontask.yml b/config/openim-crontask.yml index 52e14e34e..b40d663da 100644 --- 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 diff --git a/config/openim-msggateway.yml b/config/openim-msggateway.yml index 610c61c4e..f6d9f8322 100644 --- 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 diff --git a/config/openim-msgtransfer.yml b/config/openim-msgtransfer.yml index 3df57d713..0efbeb4d5 100644 --- 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 \ No newline at end of file diff --git a/config/openim-push.yml b/config/openim-push.yml index d35ccd1f2..40314e532 100644 --- 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 ] + + + + + diff --git a/config/openim-rpc-auth.yml b/config/openim-rpc-auth.yml index 91e393fb0..f8d3f9e26 100644 --- 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] \ No newline at end of file + ports: [20160] + +tokenPolicy: + expire: 90 diff --git a/config/openim-rpc-conversation.yml b/config/openim-rpc-conversation.yml index 7c5a9abd6..c427e706f 100644 --- 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] + + diff --git a/config/openim-rpc-friend.yml b/config/openim-rpc-friend.yml index abb3824ac..62de3583c 100644 --- 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 ] diff --git a/config/openim-rpc-group.yml b/config/openim-rpc-group.yml index 841b3242b..bcf524a9a 100644 --- 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] diff --git a/config/openim-rpc-msg.yml b/config/openim-rpc-msg.yml index 57ae9d274..03ee6404d 100644 --- 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 diff --git a/config/openim-rpc-third.yml b/config/openim-rpc-third.yml index 54eba68aa..5b7c75c71 100644 --- 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 diff --git a/config/openim-rpc-user.yml b/config/openim-rpc-user.yml index 3e66088f9..557039ae8 100644 --- 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] + diff --git a/config/openim.yaml b/config/openim.yaml deleted file mode 100644 index 182088597..000000000 --- a/config/openim.yaml +++ /dev/null @@ -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 - - - - diff --git a/config/redis-config.yaml b/config/redis.yml similarity index 100% rename from config/redis-config.yaml rename to config/redis.yml diff --git a/config/share.yml b/config/share.yml new file mode 100644 index 000000000..4b27724c3 --- /dev/null +++ b/config/share.yml @@ -0,0 +1,15 @@ + + + + + + + + +secret: openIM123 + + + +im-admin: + userID: [ "imAdmin" ] + nickname: [ "imAdmin" ] diff --git a/config/callback.yaml b/config/webhooks.yml similarity index 100% rename from config/callback.yaml rename to config/webhooks.yml diff --git a/config/zookeeper-config.yaml b/config/zookeeper-config.yaml deleted file mode 100644 index 74d6c4550..000000000 --- a/config/zookeeper-config.yaml +++ /dev/null @@ -1,5 +0,0 @@ -zookeeper: - schema: openim - address: [ 172.28.0.1:12181 ] - username: '' - password: '' diff --git a/config/zookeeper.yml b/config/zookeeper.yml new file mode 100644 index 000000000..cdd61626d --- /dev/null +++ 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