|
@@ -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)
|