blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #543 from hanzhixiao/fix/v3-error2

Browse Source 
fix conflict
This commit is contained in:
Xinwei Xiong 2023-07-13 10:39:35 +00:00 committed by GitHub
commit ab406bea3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/openim-api/main.go
View File

@ -56,7 +56,6 @@ func startPprof() {
} }
func run(port int) error { func run(port int) error {
port = 10002
if port == 0 { if port == 0 {
return fmt.Errorf("port is empty") return fmt.Errorf("port is empty")
} }

6
config/config.yaml
View File

@ -23,9 +23,9 @@ zookeeper:
password: #密码 password: #密码
mysql: mysql:
address: [ 127.0.0.1:3306 ] #目前仅支持单机 address: [ 127.0.0.1:13306 ] #目前仅支持单机
username: root #用户名 username: root #用户名
password: #密码 password: openIM123 #密码
database: openIM_v3 #不建议修改 database: openIM_v3 #不建议修改
maxOpenConn: 1000 #最大连接数 maxOpenConn: 1000 #最大连接数
maxIdleConn: 100 #最大空闲连接数 maxIdleConn: 100 #最大空闲连接数
@ -42,7 +42,7 @@ mongo:
maxPoolSize: 100 maxPoolSize: 100
redis: redis:
address: [ 127.0.0.1:6379 ] # address: [ 127.0.0.1:16379 ] #
username: #only redis version 6.0+ need username username: #only redis version 6.0+ need username
password: openIM123 #密码 password: openIM123 #密码

1
pkg/common/cmd/rpc.go
View File

@ -45,7 +45,6 @@ func (a *RpcCmd) StartSvr(
name string, name string,
rpcFn func(discov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error, rpcFn func(discov discoveryregistry.SvcDiscoveryRegistry, server *grpc.Server) error,
) error { ) error {
a.port = 10030
if a.GetPortFlag() == 0 { if a.GetPortFlag() == 0 {
return errors.New("port is required") return errors.New("port is required")
} }