Эх сурвалжийг харах

feat:测试吉利oss连接

HeWang 2 сар өмнө
parent
commit
071e06a484

+ 26 - 20
aarch64/jili/common/config/c_oss.go

@@ -2,12 +2,9 @@ package config
 
 import (
 	"cicv-data-closedloop/common/config/c_log"
-	"cicv-data-closedloop/common/util"
-	"encoding/json"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"os"
 	"sync"
-	"time"
 )
 
 type OssConnectInfoStruct struct {
@@ -29,26 +26,35 @@ func InitOssConfig() {
 	}
 	var err error
 	c_log.GlobalLogger.Info("初始化OSS客户端对象 - 开始。")
-	// 1 访问 HTTP 服务获取 OSS 配置
-	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)
-	if err != nil {
-		c_log.GlobalLogger.Error("解析json时出错:", err)
-		os.Exit(-1)
+	//// 1 访问 HTTP 服务获取 OSS 配置
+	//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)
+	//if err != nil {
+	//	c_log.GlobalLogger.Error("解析json时出错:", err)
+	//	os.Exit(-1)
+	//}
+
+	ossConnectInfo := OssConnectInfoStruct{
+		Endpoint: "http://dcl.oss.icvdc.com",
+		//Endpoint:        "http://oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com/",
+		AccessKeyId:     "n8glvFGS25MrLY7j",
+		AccessKeySecret: "xZ2Fozoarpfw0z28FUhtg8cu0yDc5d",
+		BucketName:      "dcl",
 	}
 
 	OssClient, err = oss.New(ossConnectInfo.Endpoint, ossConnectInfo.AccessKeyId, ossConnectInfo.AccessKeySecret, oss.UseCname(true))
+	//OssClient, err = oss.New(ossConnectInfo.Endpoint, ossConnectInfo.AccessKeyId, ossConnectInfo.AccessKeySecret, oss.UseCname(false))
 	if err != nil {
 		c_log.GlobalLogger.Error("无法创建阿里云client:", err)
 		os.Exit(-1)

+ 1 - 1
aarch64/jili/多功能车-test-local-config.yaml

@@ -1,5 +1,5 @@
 # 是否联通互联网
-internet: false
+internet: true
 # 节点名称和IP
 node:
   name: node1

+ 30 - 0
test/oss_test.go

@@ -1,6 +1,8 @@
 package test
 
 import (
+	commonConfig "cicv-data-closedloop/aarch64/jili/common/config"
+	"cicv-data-closedloop/common/config/c_log"
 	"cicv-data-closedloop/common/util"
 	"cicv-data-closedloop/tools/plugin-compile/package/config"
 	"fmt"
@@ -9,6 +11,15 @@ import (
 	"testing"
 )
 
+func init() {
+	// 初始化日志配置
+	c_log.InitLog(commonConfig.LogDir, commonConfig.ControlLogPrefix)
+	// 初始化本地配置文件(第1处配置,在本地文件)
+	commonConfig.InitLocalConfig()
+	commonConfig.InitOssConfig()
+	//commonConfig.InitCloudConfig()
+}
+
 func TestCompareSize(t *testing.T) {
 	config.InitOss(true)
 	// 1 下载oss文件到本地
@@ -76,3 +87,22 @@ func TestDeleteDir(t *testing.T) {
 
 	fmt.Println("Finished deleting all objects with prefix.")
 }
+
+func TestOssConnect(t *testing.T) {
+	// 1. 上传文件到oss
+	err := commonConfig.OssBucket.PutObjectFromFile("test/cloud-config.yaml", "D:\\cloud-config.yaml")
+	if err != nil {
+		panic(err)
+	}
+	// 2. 下载oss文件到本地
+	err = commonConfig.OssBucket.GetObjectToFile("test/cloud-config.yaml", "D:\\cloud-config-1.yaml")
+	if err != nil {
+		panic(err)
+	}
+	//// 2 获取oss的Content-Type文件大小
+	//size, _ := util.GetOSSFileSize(config.OssBucket, "1709907833304/demo.py")
+	//fmt.Println("云上文件大小为", size)
+	//// 3 获取本地文件大小
+	//fileSize, err := util.GetFileSize("D:\\demo.py")
+	//fmt.Println("本地文件大小为", fileSize)
+}

+ 9 - 7
test/platform_api_test.go

@@ -7,13 +7,15 @@ import (
 	"testing"
 )
 
-func init() {
-	// 初始化日志配置
-	c_log.InitLog(commonConfig.LogDir, commonConfig.ControlLogPrefix)
-	// 初始化本地配置文件(第1处配置,在本地文件)
-	commonConfig.InitLocalConfig()
-	commonConfig.InitCloudConfig()
-}
+//
+//func init() {
+//	// 初始化日志配置
+//	c_log.InitLog(commonConfig.LogDir, commonConfig.ControlLogPrefix)
+//	// 初始化本地配置文件(第1处配置,在本地文件)
+//	commonConfig.InitLocalConfig()
+//	commonConfig.InitOssConfig()
+//	//commonConfig.InitCloudConfig()
+//}
 
 func TestGetConfig(t *testing.T) {
 	fmt.Println(commonConfig.LocalConfig.EquipmentNo)