From 497bf941bbf895cef4785a143025a2d6fbdfb1e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98hanzhixiao=E2=80=99?= <‘709674996@qq.com’>
Date: Thu, 13 Jul 2023 11:32:00 +0800
Subject: [PATCH] fix conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: ‘hanzhixiao’ <‘709674996@qq.com’>
---
 cmd/api/main.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cmd/api/main.go b/cmd/api/main.go
index 1c947c12b..6f56a7704 100644
--- a/cmd/api/main.go
+++ b/cmd/api/main.go
@@ -42,7 +42,6 @@ func startPprof() {
 }
 
 func run(port int) error {
-	port = 10002
 	if port == 0 {
 		return fmt.Errorf("port is empty")
 	}
@@ -58,7 +57,7 @@ func run(port int) error {
 	if err != nil {
 		return err
 	}
-	if err := client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
+	if client.CreateRpcRootNodes(config.GetServiceNames()); err != nil {
 		return err
 	}
 	fmt.Println("api init discov client success")