LingxinMeng 1 năm trước cách đây
mục cha
commit
d92a552497

+ 7 - 0
aarch64/pji/common/variable/application.go

@@ -0,0 +1,7 @@
+package variable
+
+var (
+	LogDir = "/root/cicv-data-closedloop/log/"
+
+	LocalConfigPath = "/root/cicv-data-closedloop/config/local-config.yaml"
+)

+ 4 - 7
aarch64/pji/control/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
 	commonService "cicv-data-closedloop/aarch64/pji/common/service"
+	"cicv-data-closedloop/aarch64/pji/common/variable"
 	controlConfig "cicv-data-closedloop/aarch64/pji/control/package/config"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
@@ -12,18 +13,14 @@ import (
 	"time"
 )
 
-var (
-	LogDir          = "/root/cicv-data-closedloop/log/"
-	LogPrefix       = "pji-control"
-	LocalConfigPath = "/root/cicv-data-closedloop/config/local-config.yaml"
-)
+var applicationName = "pji-control"
 
 func init() {
 	runtime.GOMAXPROCS(1)
 	// 初始化日志配置
-	c_log.InitLog(LogDir, LogPrefix)
+	c_log.InitLog(variable.LogDir, applicationName)
 	// 初始化本地配置文件(第1处配置,在本地文件)
-	commonConfig.InitLocalConfig(LocalConfigPath)
+	commonConfig.InitLocalConfig(variable.LocalConfigPath)
 	// 初始化Oss连接信息
 	commonConfig.InitOssConfig()
 	// 初始化业务逻辑配置信息,配置文件在oss上(第2处配置,在oss文件)

+ 5 - 2
aarch64/pji/master/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	commonConfig "cicv-data-closedloop/aarch64/pji/common/config"
 	commonService "cicv-data-closedloop/aarch64/pji/common/service"
+	"cicv-data-closedloop/aarch64/pji/common/variable"
 	masterConfig "cicv-data-closedloop/aarch64/pji/master/package/config"
 	masterService "cicv-data-closedloop/aarch64/pji/master/package/service"
 	"cicv-data-closedloop/common/config/c_log"
@@ -11,12 +12,14 @@ import (
 	"time"
 )
 
+var applicationName = "pji-master"
+
 func init() {
 	runtime.GOMAXPROCS(1)
 	// 初始化日志配置
-	c_log.InitLog("/root/cicv-data-closedloop/log/", "pji-master")
+	c_log.InitLog(variable.LogDir, applicationName)
 	// 初始化本地配置文件(第1处配置,在本地文件)
-	commonConfig.InitLocalConfig()
+	commonConfig.InitLocalConfig(variable.LocalConfigPath)
 	// 初始化Oss连接信息
 	commonConfig.InitOssConfig()
 	// 初始化业务逻辑配置信息,配置文件在oss上(第2处配置,在oss文件)