IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-17 07:19:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into v0926_project_layout

Browse Source 
# Conflicts:
#	cmd/open_im_api/main.go
#	internal/rpc/auth/rpcAuth.go
#	internal/rpc/chat/rpcChat.go
#	src/common/log/logrus.go
This commit is contained in:
xmcy0011
2021-10-11 22:50:24 +08:00
parent 1ec9486452 7d7818bc38
commit a2e204667f
22 changed files with 83 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/common/config/config.go
+4 -3
View File
@@ -14,7 +14,7 @@ type config struct {
GinPort []int `yaml:"openImApiPort"`
}
Sdk struct {
WsPort []int `yaml:"sdkWsPort"`
WsPort []int `yaml:"openImSdkWsPort"`
}
Credential struct {
Tencent struct {
@@ -71,7 +71,7 @@ type config struct {
OpenImPushName string `yaml:"openImPushName"`
OpenImOnlineMessageRelayName string `yaml:"openImOnlineMessageRelayName"`
OpenImGroupName string `yaml:"openImGroupName"`
RpcGetTokenName string `yaml:"rpcGetTokenName"`
OpenImAuthName string `yaml:"openImAuthName"`
}
Etcd struct {
EtcdSchema string `yaml:"etcdSchema"`
@@ -81,6 +81,7 @@ type config struct {
StorageLocation string `yaml:"storageLocation"`
RotationTime int `yaml:"rotationTime"`
RemainRotationCount uint `yaml:"remainRotationCount"`
RemainLogLevel uint `yaml:"remainLogLevel"`
ElasticSearchSwitch bool `yaml:"elasticSearchSwitch"`
ElasticSearchAddr []string `yaml:"elasticSearchAddr"`
ElasticSearchUser string `yaml:"elasticSearchUser"`
@@ -92,7 +93,7 @@ type config struct {
PushName string `yaml:"pushName"`
}
LongConnSvr struct {
WebsocketPort []int `yaml:"websocketPort"`
WebsocketPort []int `yaml:"openImWsPort"`
WebsocketMaxConnNum int `yaml:"websocketMaxConnNum"`
WebsocketMaxMsgLen int `yaml:"websocketMaxMsgLen"`
WebsocketTimeOut int `yaml:"websocketTimeOut"`