fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
pull/543/head
‘hanzhixiao’ 12 months ago
parent fda6cd5354
commit 4bd97149c3

@ -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")
} }

@ -25,7 +25,7 @@ zookeeper:
mysql: mysql:
address: [ 127.0.0.1:13306 ] #目前仅支持单机 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 #最大空闲连接数

@ -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")
} }

Loading…
Cancel
Save