commit

aarch64/kinglong/common/config/c_local.go

@@ -1,7 +1,7 @@
 package config
 
 import (
-	"cicv-data-closedloop/common/config/c_log"
+	"fmt"
 	"gopkg.in/yaml.v2"
 	"os"
 )
@@ -25,30 +25,31 @@ type localConfig struct {
 	CloudConfigFilename  string     `yaml:"cloud-config-filename"`   // 云端配置文件名称
 	CloudConfigLocalPath string     `yaml:"cloud-config-local-path"` // 将 oss 的配置文件下载到本地的位置
 	SecretKey            string     `yaml:"secret-key"`              // 当前设备的密钥
+	LogDir               string     `yaml:"log-dir"`                 // 日志目录
 	RestartCmd           restartCmd `yaml:"restart-cmd"`             // 重启命令
 }
 
 var (
 	LocalConfig     localConfig
-	localConfigPath = "/mnt/media/sda1/cicv-data-closedloop/config/local-config.yaml"
+	localConfigPath = "./config/local-config.yaml"
 )
 
 func InitLocalConfig() {
-	c_log.GlobalLogger.Info("初始化本地配置文件 - 开始：", localConfigPath)
+	fmt.Println("初始化本地配置文件 - 开始：", localConfigPath)
 	// 读取YAML文件内容
 	content, err := os.ReadFile(localConfigPath)
 	if err != nil {
-		c_log.GlobalLogger.Error("读取本地配置文件失败。", err)
+		fmt.Println("读取本地配置文件失败。", err)
 		os.Exit(-1)
 	}
 
 	// 解析YAML内容
 	err = yaml.Unmarshal(content, &LocalConfig)
 	if err != nil {
-		c_log.GlobalLogger.Error("解析本地配置文件失败。", err)
+		fmt.Println("解析本地配置文件失败。", err)
 		os.Exit(-1)
 	}
 
-	c_log.GlobalLogger.Info("初始化本地配置文件 - 成功：", LocalConfig)
+	fmt.Println("初始化本地配置文件 - 成功：", LocalConfig)
 
 }

aarch64/kinglong/control/main/control.go → aarch64/kinglong/control/main.go

@@ -1,26 +1,25 @@
 package main
 
 import (
-	"cicv-data-closedloop/aarch64/kinglong/common/config"
+	commonConfig "cicv-data-closedloop/aarch64/kinglong/common/config"
 	"cicv-data-closedloop/aarch64/kinglong/common/service"
 	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"net/rpc"
 	"os"
-	"runtime"
 	"time"
 )
 
 func init() {
-	runtime.GOMAXPROCS(1)
-	// 初始化日志配置
-	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/log/", "kinglong-control")
+	//runtime.GOMAXPROCS(1)
 	// 初始化本地配置文件（第1处配置，在本地文件）
-	config.InitLocalConfig()
+	commonConfig.InitLocalConfig()
+	// 初始化日志配置
+	c_log.InitLog(commonConfig.LocalConfig.LogDir, "kinglong-control")
 	// 初始化Oss连接信息
-	config.InitOssConfig()
+	commonConfig.InitOssConfig()
 	// 初始化业务逻辑配置信息，配置文件在oss上（第2处配置，在oss文件）
-	config.InitCloudConfig()
+	commonConfig.InitCloudConfig()
 }
 
 func main() {
@@ -29,7 +28,7 @@ func main() {
 	for {
 		time.Sleep(time.Duration(2) * time.Second)
 		// 1 获取当前设备的任务的 status
-		status, err := config.GetStatus(config.PlatformConfig.TaskConfigId)
+		status, err := commonConfig.GetStatus(commonConfig.PlatformConfig.TaskConfigId)
 		if err != nil {
 			c_log.GlobalLogger.Error("获取配置status失败：", err)
 			continue
@@ -43,7 +42,7 @@ func main() {
 			continue
 		} else if status == "CHANGE" || status == "NONE" {
 			if lastStatus == "CHANGE" && status == "CHANGE" { // 供更新使用
-				config.InitPlatformConfig()
+				commonConfig.InitPlatformConfig()
 				continue
 			}
 			if lastStatus == "NONE" && status == "NONE" {
@@ -51,27 +50,27 @@ func main() {
 			}
 			// 3 发送rpc信号杀死两个服务，并重启程序
 			if lastStatus == "NONE" && status == "CHANGE" {
-				if _, err := util.ExecuteWithPath(config.LocalConfig.RestartCmd.Dir, config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args...); err != nil {
-					c_log.GlobalLogger.Info("启动新程序失败,【path】=", config.LocalConfig.RestartCmd.Dir, "【cmd】=", config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args, "：", err)
+				if _, err := util.ExecuteWithPath(commonConfig.LocalConfig.RestartCmd.Dir, commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args...); err != nil {
+					c_log.GlobalLogger.Info("启动新程序失败,【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args, "：", err)
 					os.Exit(-1)
 				}
-				c_log.GlobalLogger.Info("启动任务，本地执行启动命令：【path】=", config.LocalConfig.RestartCmd.Dir, "【cmd】=", config.LocalConfig.RestartCmd.Name, config.LocalConfig.RestartCmd.Args)
+				c_log.GlobalLogger.Info("启动任务，本地执行启动命令：【path】=", commonConfig.LocalConfig.RestartCmd.Dir, "【cmd】=", commonConfig.LocalConfig.RestartCmd.Name, commonConfig.LocalConfig.RestartCmd.Args)
 				lastStatus = status
 				c_log.GlobalLogger.Info("获取数据闭环平台最新配置。")
-				config.InitPlatformConfig()
+				commonConfig.InitPlatformConfig()
 				continue
 			}
 			var killArgs service.KillSignal
 			if lastStatus == "UN_CHANGE" && status == "CHANGE" {
-				killArgs = service.KillSignal{NodeName: config.LocalConfig.Node.Name, DropUploadData: config.PlatformConfig.DropUploadData, Restart: true}
-				c_log.GlobalLogger.Info("更新任务，发送rpc重启信号到本地"+config.LocalConfig.Node.Name+"：", killArgs)
+				killArgs = service.KillSignal{NodeName: commonConfig.LocalConfig.Node.Name, DropUploadData: commonConfig.PlatformConfig.DropUploadData, Restart: true}
+				c_log.GlobalLogger.Info("更新任务，发送rpc重启信号到本地"+commonConfig.LocalConfig.Node.Name+"：", killArgs)
 			}
 			if lastStatus == "UN_CHANGE" && status == "NONE" {
-				killArgs = service.KillSignal{NodeName: config.LocalConfig.Node.Name, DropUploadData: config.PlatformConfig.DropUploadData, Restart: false}
-				c_log.GlobalLogger.Info("杀死任务，发送rpc结束信号到本地"+config.LocalConfig.Node.Name+"：", killArgs)
+				killArgs = service.KillSignal{NodeName: commonConfig.LocalConfig.Node.Name, DropUploadData: commonConfig.PlatformConfig.DropUploadData, Restart: false}
+				c_log.GlobalLogger.Info("杀死任务，发送rpc结束信号到本地"+commonConfig.LocalConfig.Node.Name+"：", killArgs)
 			}
 
-			KillRpcClient, err := rpc.Dial("tcp", config.LocalConfig.Node.Ip+":"+config.CloudConfig.RpcPort)
+			KillRpcClient, err := rpc.Dial("tcp", commonConfig.LocalConfig.Node.Ip+":"+commonConfig.CloudConfig.RpcPort)
 			if err != nil {
 				// 此处如果连接失败说明采集程序已经停止了
 				lastStatus = "NONE"
@@ -88,7 +87,7 @@ func main() {
 			}
 			lastStatus = status
 			c_log.GlobalLogger.Info("结束任务后，将数据闭环平台配置置空。")
-			config.PlatformConfig = config.PlatformConfigStruct{}
+			commonConfig.PlatformConfig = commonConfig.PlatformConfigStruct{}
 			if err = KillRpcClient.Close(); err != nil {
 				// 不做处理
 			}

aarch64/kinglong/master/main/master.go → aarch64/kinglong/master/main.go

@@ -9,12 +9,11 @@ import (
 )
 
 func init() {
-	// 初始化日志配置
 	//runtime.GOMAXPROCS(1)
-	// 初始化日志配置
-	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/log/", "kinglong-master")
 	// 初始化本地配置文件（第1处配置，在本地文件）
 	commonConfig.InitLocalConfig()
+	// 初始化日志配置
+	c_log.InitLog(commonConfig.LocalConfig.LogDir, "kinglong-soc1")
 
 	// 初始化Oss连接信息
 	commonConfig.InitOssConfig()

aarch64/kinglong/slave/main/slave.go → aarch64/kinglong/slave/main.go

@@ -11,9 +11,10 @@ import (
 // init 初始化函数
 func init() {
 	//runtime.GOMAXPROCS(1)
-	c_log.InitLog("/mnt/media/sda1/cicv-data-closedloop/log/", "kinglong-master")
 	// 初始化本地配置文件（第1处配置，在本地文件）
 	commonConfig.InitLocalConfig()
+	// 初始化日志配置
+	c_log.InitLog(commonConfig.LocalConfig.LogDir, "kinglong-soc2")
 
 	// 初始化Oss连接信息
 	commonConfig.InitOssConfig()

build.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 
 # 金龙车
-go build -o ./exe/kinglong-master.exe ./aarch64/kinglong/master/main/master.go
-go build -o ./exe/kinglong-slave.exe ./aarch64/kinglong/slave/main/slave.go
-go build -o ./exe/kinglong-control.exe ./aarch64/kinglong/control/main/control.go
+go build -o ./exe/kinglong-master.exe ./aarch64/kinglong/master/main.go
+go build -o ./exe/kinglong-slave.exe ./aarch64/kinglong/slave/main.go
+go build -o ./exe/kinglong-control.exe ./aarch64/kinglong/control/main.go
 
 # 朴津多功能车
-go build -o ./exe/pjisuv-master.exe ./aarch64/pjisuv/master/main/master.go
-go build -o ./exe/pjisuv-slave.exe ./aarch64/pjisuv/slave/main/slave.go
-go build -o ./exe/pjisuv-control.exe ./aarch64/pjisuv/control/main/control.go
+go build -o ./exe/pjisuv-master.exe ./aarch64/pjisuv/master/main.go
+go build -o ./exe/pjisuv-slave.exe ./aarch64/pjisuv/slave/main.go
+go build -o ./exe/pjisuv-control.exe ./aarch64/pjisuv/control/main.go
 
 
 # 朴津机器人
-go build -o ./exe/pji-master.exe ./aarch64/pji/master/main/master.go
-go build -o ./exe/pji-control.exe ./aarch64/pji/control/main/control.go
+go build -o ./exe/pji-master.exe ./aarch64/pji/master/main.go
+go build -o ./exe/pji-control.exe ./aarch64/pji/control/main.go
 
 # 插件编译接口
 go build -o ./exe/plugin-vaildate.exe ./aarch64/plugin-vaildate/main/main.go