From 17c0f9d0b0cefbb3edecb3eef5d10e33d5e1c73e Mon Sep 17 00:00:00 2001
From: yfh <yuan.fenghua@free-sun.com.cn>
Date: Mon, 24 Feb 2025 23:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 containerApp/main.go |  4 +---
 go.work              |  2 +-
 master/go.mod        | 29 ++++++++---------------------
 master/main.go       |  2 +-
 node/go.mod          |  2 +-
 5 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/containerApp/main.go b/containerApp/main.go
index 5928809..2e394c1 100644
--- a/containerApp/main.go
+++ b/containerApp/main.go
@@ -40,7 +40,7 @@ func main() {
 	}
 
 	masterTag := configLoad.LoadConfig().GetString("master.hostNameTag")
-	log.Printf("hostName =[%s],masterTag=[%s]", hostName, masterTag)
+	log.Printf("hostName=[%s],masterTag=[%s]", hostName, masterTag)
 	if hostName == masterTag {
 		log.Printf("启动类型:master => hostName=[%s]", hostName)
 		etMaster.Start()
@@ -53,11 +53,9 @@ func main() {
 		log.Printf("启动类型:node => hostName=[%s]", hostName)
 		etNode.Start()
 	}
-
 }
 
 func pprofRun() {
-
 	pprofAddr := ":10000"
 	log.Printf("性能分析 => pprofAddr=[%s]", pprofAddr)
 	go func() {
diff --git a/go.work b/go.work
index 43eb46b..e3eb6a9 100644
--- a/go.work
+++ b/go.work
@@ -11,7 +11,7 @@ use (
         node
         et_analyze
         et_cache
-        dataSource
         et_print
         containerApp
+		et_rpc
 )
diff --git a/master/go.mod b/master/go.mod
index 08710b9..55cc61d 100644
--- a/master/go.mod
+++ b/master/go.mod
@@ -4,28 +4,15 @@ go 1.23.1
 
 require (
 	gitea.anxinyun.cn/container/common_models v0.0.12
-	gitea.anxinyun.cn/container/common_utils v0.0.13
+	github.com/IBM/sarama v1.43.0
+	github.com/jolestar/go-commons-pool v2.0.0+incompatible
 )
 
 require (
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.18.2 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/fortytw2/leaktest v1.3.0 // indirect
+	github.com/panjf2000/ants/v2 v2.11.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/time v0.10.0 // indirect
 )
diff --git a/master/main.go b/master/main.go
index e84dc92..e89ed66 100644
--- a/master/main.go
+++ b/master/main.go
@@ -6,5 +6,5 @@ import (
 
 func main() {
 	app.Start()
-	println("over=======")
+	println("======= master main over=======")
 }
diff --git a/node/go.mod b/node/go.mod
index d552016..f0369a6 100644
--- a/node/go.mod
+++ b/node/go.mod
@@ -4,7 +4,7 @@ go 1.23.1
 
 require (
 	gitea.anxinyun.cn/container/common_models v0.0.12
-	gitea.anxinyun.cn/container/common_utils v0.0.13
+	gitea.anxinyun.cn/container/common_utils v0.0.14
 	github.com/google/uuid v1.6.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )