From f2745bf15654216cd45f850555304c224aacb31c Mon Sep 17 00:00:00 2001
From: jiangyong27 <yong27@163.com>
Date: Thu, 6 Mar 2025 13:42:54 +0800
Subject: [PATCH] worker/server

---
 Dockerfile                              |  3 ++-
 cmd/{enterprise.go => server/server.go} |  3 ---
 cmd/worker/worker.go                    | 17 +++++++++++++++++
 start.sh                                |  2 +-
 4 files changed, 20 insertions(+), 5 deletions(-)
 rename cmd/{enterprise.go => server/server.go} (87%)
 create mode 100644 cmd/worker/worker.go

diff --git a/Dockerfile b/Dockerfile
index 89542e7..5fac293 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,8 @@ RUN export GOROOT=/usr/local/go1.21.4 && \
     export GOPRIVATE=gitlab.batiao8.com && \
     export PATH=$PATH:$GOROOT/bin && \
     go mod tidy && \
-    go build cmd/enterprise.go && \
+    go build cmd/worker/worker.go && \
+    go build cmd/server/server.go && \
     mv enterprise /app/bin && \
     cp -r conf /app && \
     cp start.sh /app && \
diff --git a/cmd/enterprise.go b/cmd/server/server.go
similarity index 87%
rename from cmd/enterprise.go
rename to cmd/server/server.go
index 11341e1..754cc1a 100644
--- a/cmd/enterprise.go
+++ b/cmd/server/server.go
@@ -5,7 +5,6 @@ import (
 	"enterprise/common/global"
 	"enterprise/server"
 	_ "enterprise/service/salary_calculator"
-	"enterprise/worker"
 )
 
 func main() {
@@ -13,8 +12,6 @@ func main() {
 	config.LoadAliPay()
 	global.InitGlobal()
 
-	worker.InitCorp()
-
 	if err := server.Start(); err != nil {
 		panic(err)
 	}
diff --git a/cmd/worker/worker.go b/cmd/worker/worker.go
new file mode 100644
index 0000000..44f07e8
--- /dev/null
+++ b/cmd/worker/worker.go
@@ -0,0 +1,17 @@
+package main
+
+import (
+	"enterprise/common/config"
+	"enterprise/common/global"
+	_ "enterprise/service/salary_calculator"
+	"enterprise/worker"
+)
+
+func main() {
+	config.LoadServerConfig()
+	config.LoadAliPay()
+	global.InitGlobal()
+
+	worker.InitCorp()
+	select {}
+}
diff --git a/start.sh b/start.sh
index f02e71f..b48159d 100644
--- a/start.sh
+++ b/start.sh
@@ -4,7 +4,7 @@ ROOT=$(cd `dirname $0`; pwd)
 cd $ROOT
 
 if [ "$BINARY" = "" ];then
-    BINARY="enterprise"
+    BINARY="server"
 fi
 
 while [ true ];do