LingxinMeng 1 éve
szülő
commit
a42c9e62ea

+ 2 - 7
aarch64/kinglong/master/package/config/master_trigger_cfg.go

@@ -7,7 +7,6 @@ import (
 	"cicv-data-closedloop/kinglong_msgs"
 	"plugin"
 	"strconv"
-	"strings"
 )
 
 var (
@@ -28,12 +27,8 @@ func InitTriggerConfig() {
 	c_log.GlobalLogger.Info("主节点加载触发器插件 - 开始。")
 	// 下载所有触发器的文件
 	for _, trigger := range config.PlatformConfig.TaskTriggers {
-		// 获取文件名
-		pathSplit := strings.Split(trigger.TriggerScriptPath, "/")
-		fileName := pathSplit[len(pathSplit)-1]
-		// 下载
-		triggerLocalPath := config.CloudConfig.TriggersDir + fileName
-		util.CreateParentDir(triggerLocalPath)
+		triggerLocalPath := config.CloudConfig.TriggersDir + trigger.TriggerScriptPath
+		_ = util.CreateParentDir(triggerLocalPath)
 		c_log.GlobalLogger.Info("下载触发器插件从 ", trigger.TriggerScriptPath, " 到 ", triggerLocalPath)
 		config.OssMutex.Lock()
 		err := config.OssBucket.GetObjectToFile(trigger.TriggerScriptPath, triggerLocalPath)

+ 1 - 1
aarch64/pji/master/package/config/master_trigger_cfg.go

@@ -41,7 +41,7 @@ func InitTriggerConfig() {
 	// 下载所有触发器的文件
 	for _, trigger := range config.PlatformConfig.TaskTriggers {
 		// 下载
-		triggerLocalPath := config.CloudConfig.TriggersDir + "/" + trigger.TriggerScriptPath
+		triggerLocalPath := config.CloudConfig.TriggersDir + trigger.TriggerScriptPath
 		_ = util.CreateParentDir(triggerLocalPath)
 		c_log.GlobalLogger.Info("下载触发器插件从", trigger.TriggerScriptPath, "到", triggerLocalPath)
 		config.OssMutex.Lock()

+ 1 - 6
aarch64/pjisuv/master/package/config/master_trigger_config.go

@@ -12,7 +12,6 @@ import (
 	"github.com/bluenviron/goroslib/v2/pkg/msgs/visualization_msgs"
 	"plugin"
 	"strconv"
-	"strings"
 	"sync"
 )
 
@@ -168,11 +167,7 @@ func InitTriggerConfig() {
 	c_log.GlobalLogger.Info("主节点加载触发器插件 - 开始。")
 	// 下载所有触发器的文件
 	for _, trigger := range config.PlatformConfig.TaskTriggers {
-		// 获取文件名
-		pathSplit := strings.Split(trigger.TriggerScriptPath, "/")
-		fileName := pathSplit[len(pathSplit)-1]
-		// 下载
-		triggerLocalPath := config.CloudConfig.TriggersDir + fileName
+		triggerLocalPath := config.CloudConfig.TriggersDir + trigger.TriggerScriptPath
 		_ = util.CreateParentDir(triggerLocalPath)
 		c_log.GlobalLogger.Info("下载触发器插件从 ", trigger.TriggerScriptPath, " 到 ", triggerLocalPath)
 		config.OssMutex.Lock()