commit

aarch64/kinglong/common/config/c_cloud.go

@@ -71,7 +71,7 @@ func InitCloudConfig() {
 	// 3 ------- 获取 yaml 字符串 -------
 	var content []byte
 	cloudConfigObjectKey := LocalConfig.OssBasePrefix + LocalConfig.EquipmentNo + "/" + LocalConfig.CloudConfigFilename
-	// todo 等待时间同步
+	// 等待时间同步
 	for {
 		OssMutex.Lock()
 		err := OssBucket.GetObjectToFile(cloudConfigObjectKey, LocalConfig.CloudConfigLocalPath)

aarch64/kinglong/common/config/c_oss.go

@@ -7,6 +7,7 @@ import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"os"
 	"sync"
+	"time"
 )
 
 type OssConnectInfoStruct struct {
@@ -23,12 +24,19 @@ var (
 )
 
 func InitOssConfig() {
+	var err error
 	c_log.GlobalLogger.Info("初始化OSS客户端对象 - 开始。")
 	// 1 访问 HTTP 服务获取 OSS 配置
-	get, err := util.HttpGet(LocalConfig.UrlGetOssConfig)
-	if err != nil {
-		c_log.GlobalLogger.Error("http获取oss配置时出错:", err)
-		os.Exit(-1)
+	var get string
+	// 等待网络可达
+	for {
+		get, err = util.HttpGet(LocalConfig.UrlGetOssConfig)
+		if err != nil {
+			c_log.GlobalLogger.Error("http 获取 oss 配置时出错。可能需要等待网络初始化完成:", err)
+			time.Sleep(time.Duration(2) * time.Second)
+			continue
+		}
+		break
 	}
 	var ossConnectInfo OssConnectInfoStruct
 	err = json.Unmarshal([]byte(get), &ossConnectInfo)

aarch64/pjisuv/common/config/c_oss.go

@@ -7,6 +7,7 @@ import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"os"
 	"sync"
+	"time"
 )
 
 type OssConnectInfoStruct struct {
@@ -23,12 +24,19 @@ var (
 )
 
 func InitOssConfig() {
+	var err error
 	c_log.GlobalLogger.Info("初始化OSS客户端对象 - 开始。")
 	// 1 访问 HTTP 服务获取 OSS 配置
-	get, err := util.HttpGet(LocalConfig.UrlGetOssConfig)
-	if err != nil {
-		c_log.GlobalLogger.Error("http获取oss配置时出错:", err)
-		os.Exit(-1)
+	var get string
+	// 等待网络可达
+	for {
+		get, err = util.HttpGet(LocalConfig.UrlGetOssConfig)
+		if err != nil {
+			c_log.GlobalLogger.Error("http 获取 oss 配置时出错。可能需要等待网络初始化完成:", err)
+			time.Sleep(time.Duration(2) * time.Second)
+			continue
+		}
+		break
 	}
 	var ossConnectInfo OssConnectInfoStruct
 	err = json.Unmarshal([]byte(get), &ossConnectInfo)