Skip to content

Commit

Permalink
Merge branch 'main' of github.com:openimsdk/open-im-server
Browse files Browse the repository at this point in the history
  • Loading branch information
mo3et committed Aug 21, 2024
2 parents d4a4d67 + a559bfe commit d63c5b7
Show file tree
Hide file tree
Showing 28 changed files with 310 additions and 264 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cla-assistant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ jobs:
remote-repository-name: cla
create-file-commit-message: 'Creating file for storing CLA Signatures'
# signed-commit-message: '$contributorName has signed the CLA in $owner/$repo#$pullRequestNo'
custom-notsigned-prcomment: '💕 Thank you for your contribution and please kindly read and sign our [CLA Docs](https://github.com/OpenIM-Robot/cla/blob/main/README.md)'
custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
custom-allsigned-prcomment: '🤖 All Contributors have signed the [CLA](https://github.com/OpenIM-Robot/cla/blob/main/README.md).<br> The signed information is recorded [🤖here](https://github.com/openim-sigs/cla/tree/main/signatures/cla.json)'
custom-notsigned-prcomment: '💕 Thank you for your contribution and please kindly read and sign our CLA. [CLA Docs](https://github.com/OpenIM-Robot/cla/blob/main/README.md)'
custom-pr-sign-comment: 'I have read the CLA Document and I hereby sign the CLA'
custom-allsigned-prcomment: '🤖 All Contributors have signed the [CLA](https://github.com/OpenIM-Robot/cla/blob/main/README.md).<br> The signed information is recorded [**here**](https://github.com/OpenIM-Robot/cla/blob/main/signatures/cla.json)'
#lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
#use-dco-flag: true - If you are using DCO instead of CLA
2 changes: 1 addition & 1 deletion CONTRIBUTING-zh_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ git push origin fix-bug-123
### 9. 签署 CLA
如果这是你第一次提交 PR,你需要在 PR 的评论中回复:
```
The signature to be committed in order to sign the CLA
I have read the CLA Document and I hereby sign the CLA
```

### 编程规范
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Go to your fork on GitHub and click the "Pull Request" button. Ensure the PR des
### 9. Sign the CLA
If this is your first time submitting a PR, you will need to reply in the comments of the PR:
```
The signature to be committed in order to sign the CLA
I have read the CLA Document and I hereby sign the CLA
```

### Programming Standards
Expand Down
2 changes: 1 addition & 1 deletion config/discovery.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
enable: "etcd"
enable: etcd
etcd:
rootDirectory: openim
address: [ localhost:12379 ]
Expand Down
18 changes: 9 additions & 9 deletions config/kafka.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ username: ''
# Password for authentication
password: ''
# Producer acknowledgment settings
producerAck: ""
producerAck:
# Compression type to use (e.g., none, gzip, snappy)
compressType: "none"
compressType: none
# List of Kafka broker addresses
address: [ localhost:19094 ]
# Kafka topic for Redis integration
toRedisTopic: "toRedis"
toRedisTopic: toRedis
# Kafka topic for MongoDB integration
toMongoTopic: "toMongo"
toMongoTopic: toMongo
# Kafka topic for push notifications
toPushTopic: "toPush"
toPushTopic: toPush
# Consumer group ID for Redis topic
toRedisGroupID: redis
# Consumer group ID for MongoDB topic
Expand All @@ -25,12 +25,12 @@ tls:
# Enable or disable TLS
enableTLS: false
# CA certificate file path
caCrt: ""
caCrt:
# Client certificate file path
clientCrt: ""
clientCrt:
# Client key file path
clientKey: ""
clientKey:
# Client key password
clientKeyPwd: ""
clientKeyPwd:
# Whether to skip TLS verification (not recommended for production)
insecureSkipVerify: false
12 changes: 6 additions & 6 deletions config/minio.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Name of the bucket in MinIO
bucket: "openim"
bucket: openim
# Access key ID for MinIO authentication
accessKeyID: "root"
accessKeyID: root
# Secret access key for MinIO authentication
secretAccessKey: "openIM123"
secretAccessKey: openIM123
# Session token for MinIO authentication (optional)
sessionToken: ''
sessionToken:
# Internal address of the MinIO server
internalAddress: "localhost:10005"
internalAddress: localhost:10005
# External address of the MinIO server, accessible from outside. Supports both HTTP and HTTPS using a domain name
externalAddress: "http://external_ip:10005"
externalAddress: http://external_ip:10005
# Flag to enable or disable public read access to the bucket
publicRead: false

Expand Down
2 changes: 1 addition & 1 deletion config/mongodb.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# URI for database connection, leave empty if using address and credential settings directly
uri: ''
uri:
# List of MongoDB server addresses
address: [ localhost:37017 ]
# Name of the database
Expand Down
Loading

0 comments on commit d63c5b7

Please sign in to comment.