commit

amd64/dispatch_server/application.yaml

@@ -5,6 +5,9 @@ web:
   token: U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM
   white-list:
     - "/dispatch_server/swagger"
+log:
+  dir: ./log/
+  prefix: dispatch_server
 
 redis:
   addr: 36.110.106.156:6379
@@ -14,11 +17,11 @@ redis:
 oss:
   is-user-cname: true
   endpoint: http://open-bucket.oss.icvdc.com
-#  is-user-cname: false
-#  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
-  accessKeyId: n8glvFGS25MrLY7j
-  accessKeySecret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
-  bucketName: open-bucket
+  #  is-user-cname: false
+  #  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com
+  access-key-id: n8glvFGS25MrLY7j
+  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
+  bucket-name: open-bucket
 
 gpu-node-list:
   - hostname: gpu003

amd64/dispatch_server/main.go

@@ -10,14 +10,16 @@ import (
 	commonHandler "cicv-data-closedloop/common/gin/handler"
 	"cicv-data-closedloop/common/util"
 	_ "embed"
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"gopkg.in/yaml.v3"
 	"os"
 )
 
 type ApplicationYamlStruct struct {
-	ApplicationName string      `yaml:"application"`
+	ApplicationName string      `yaml:"application-name"`
 	Web             WebStruct   `yaml:"web"`
+	Log             LogStruct   `yaml:"log"`
 	Redis           RedisStruct `yaml:"redis"`
 	Oss             OssStruct   `yaml:"oss"`
 	GpuNodeList     []GpuNode   `yaml:"gpu_node_list"`
@@ -30,17 +32,22 @@ type WebStruct struct {
 	WhiteList   []string `yaml:"white-list"`
 }
 
+type LogStruct struct {
+	Dir    string `yaml:"dir"`
+	Prefix string `yaml:"prefix"`
+}
+
 type RedisStruct struct {
 	Addr     string `yaml:"addr"`
 	Password string `yaml:"password"`
 	Db       int    `yaml:"db"`
 }
 type OssStruct struct {
-	IsUseCname      bool   `json:"is-use-cname"`
-	Endpoint        string `json:"endpoint"`
-	AccessKeyId     string `json:"accessKeyId"`
-	AccessKeySecret string `json:"accessKeySecret"`
-	BucketName      string `json:"bucketName"`
+	IsUseCname      bool   `yaml:"is-use-cname"`
+	Endpoint        string `yaml:"endpoint"`
+	AccessKeyId     string `yaml:"access-key-id"`
+	AccessKeySecret string `yaml:"access-key-secret"`
+	BucketName      string `yaml:"bucket-name"`
 }
 
 type GpuNode struct {
@@ -58,8 +65,9 @@ var (
 func init() {
 	// 1 解析YAML内容
 	_ = yaml.Unmarshal(applicationYamlBytes, &ApplicationYaml)
+	fmt.Println("加载配置文件内容为：", ApplicationYaml)
 	// 2 初始化 日志
-	infra.InitLog("./log/", ApplicationYaml.ApplicationName)
+	infra.InitLog(ApplicationYaml.Log.Dir, ApplicationYaml.Log.Prefix)
 	// 3 初始化 阿里云oss 客户端
 	infra.InitOss(
 		ApplicationYaml.Oss.IsUseCname,

amd64/dispatch_server/package/infra/i_oss.go

@@ -1,8 +1,6 @@
 package infra
 
 import (
-	"cicv-data-closedloop/common/config/c_log"
-	"fmt"
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"os"
 )
@@ -20,12 +18,12 @@ func InitOss(isUseCname bool, endpoint string, accessKeyId string, accessKeySecr
 		OssClient, err = oss.New(endpoint, accessKeyId, accessKeySecret, oss.UseCname(false)) // 内网
 	}
 	if err != nil {
-		c_log.GlobalLogger.Error("无法创建阿里云client:", err)
+		GlobalLogger.Error("无法创建阿里云client:", err)
 		os.Exit(-1)
 	}
 	OssBucket, err = OssClient.Bucket(bucketName)
 	if err != nil {
-		fmt.Println("无法创建阿里云bucket:", err)
+		GlobalLogger.Error("无法创建阿里云bucket:", err)
 		os.Exit(-1)
 	}
 }