fix conflict

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>

cmd/openim-api/main.go

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

config/config.yaml

@@ -25,7 +25,7 @@ zookeeper:
 mysql:
   address: [ 127.0.0.1:13306 ]            #目前仅支持单机
   username: root                          #用户名
-  password:                      #密码
+  password: openIM123                     #密码
   database: openIM_v3                     #不建议修改
   maxOpenConn: 1000                       #最大连接数
   maxIdleConn: 100                        #最大空闲连接数

pkg/common/cmd/rpc.go

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