commit

aarch64/kinglong/common/config/c_cloud.go

@@ -71,15 +71,19 @@ func InitCloudConfig() {
 	// 3 ------- 获取 yaml 字符串 -------
 	var content []byte
 	cloudConfigObjectKey := LocalConfig.OssBasePrefix + LocalConfig.EquipmentNo + "/" + LocalConfig.CloudConfigFilename
-	OssMutex.Lock()
-	err := OssBucket.GetObjectToFile(cloudConfigObjectKey, LocalConfig.CloudConfigLocalPath)
-	OssMutex.Unlock()
-	if err != nil {
-		c_log.GlobalLogger.Error("下载oss上的配置文件"+cloudConfigObjectKey+"失败。", err)
-		os.Exit(-1)
+	// todo 等待时间同步
+	for {
+		OssMutex.Lock()
+		err := OssBucket.GetObjectToFile(cloudConfigObjectKey, LocalConfig.CloudConfigLocalPath)
+		OssMutex.Unlock()
+		if err != nil {
+			c_log.GlobalLogger.Error("下载oss上的配置文件"+cloudConfigObjectKey+"失败。", err)
+			continue
+		}
+		break
 	}
 
-	content, err = os.ReadFile(LocalConfig.CloudConfigLocalPath)
+	content, err := os.ReadFile(LocalConfig.CloudConfigLocalPath)
 	if err != nil {
 		c_log.GlobalLogger.Error("配置文件 ", LocalConfig.CloudConfigLocalPath, " 读取失败:", err)
 		os.Exit(-1)

aarch64/pji/common/config/c_cloud.go

@@ -66,7 +66,7 @@ var (
 func InitCloudConfig() {
 	c_log.GlobalLogger.Info("初始化OSS配置文件 - 开始。")
 	// 获取文件的目录
-	util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
+	_ = util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
 	// 3 ------- 获取 yaml 字符串 -------
 	var content []byte
 	cloudConfigObjectKey := LocalConfig.OssBasePrefix + LocalConfig.EquipmentNo + "/" + LocalConfig.CloudConfigFilename

aarch64/pjisuv/common/config/c_cloud.go

@@ -68,20 +68,24 @@ func InitCloudConfig() {
 	c_log.GlobalLogger.Info("初始化OSS配置文件 - 开始。")
 	// 获取文件的目录
 	_ = util.CreateParentDir(LocalConfig.CloudConfigLocalPath)
-	// 3 ------- 获取 yaml 字符串 -------
+	// 3 获取 yaml 字符串
 	var content []byte
 	cloudConfigObjectKey := LocalConfig.OssBasePrefix + LocalConfig.EquipmentNo + "/" + LocalConfig.CloudConfigFilename
-	OssMutex.Lock()
-	err := OssBucket.GetObjectToFile(cloudConfigObjectKey, LocalConfig.CloudConfigLocalPath)
-	OssMutex.Unlock()
-	if err != nil {
-		c_log.GlobalLogger.Error("下载oss上的配置文件"+cloudConfigObjectKey+"失败。", err)
-		os.Exit(-1)
+	// todo 等待时间同步
+	for {
+		OssMutex.Lock()
+		err := OssBucket.GetObjectToFile(cloudConfigObjectKey, LocalConfig.CloudConfigLocalPath)
+		OssMutex.Unlock()
+		if err != nil {
+			c_log.GlobalLogger.Error("下载oss上的配置文件"+cloudConfigObjectKey+"失败。", err)
+			continue
+		}
+		break
 	}
 
-	content, err = os.ReadFile(LocalConfig.CloudConfigLocalPath)
+	content, err := os.ReadFile(LocalConfig.CloudConfigLocalPath)
 	if err != nil {
-		c_log.GlobalLogger.Error("配置文件 ", LocalConfig.CloudConfigLocalPath, " 读取失败:", err)
+		c_log.GlobalLogger.Error("程序退出。配置文件 ", LocalConfig.CloudConfigLocalPath, " 读取失败:", err)
 		os.Exit(-1)
 	}
 
@@ -89,7 +93,7 @@ func InitCloudConfig() {
 	var newCloudConfig cloudConfig
 	err = yaml.Unmarshal(content, &newCloudConfig)
 	if err != nil {
-		c_log.GlobalLogger.Error("配置文件 ", LocalConfig.CloudConfigLocalPath, " 解析失败:", err)
+		c_log.GlobalLogger.Error("程序退出。配置文件 ", LocalConfig.CloudConfigLocalPath, " 解析失败:", err)
 		os.Exit(-1)
 	}