commit

deploy/exe/application.yaml

@@ -0,0 +1,63 @@
+application-name: dispatch_server
+temp-dir: "/mnt/disk001/dcl_dispatch_server/temp/"
+web:
+  ip-private: 10.14.85.237
+  port: 12342
+  route-prefix: /dispatch_server
+  token: U9yKpD6kZZDDe4LFKK6myAxBUT1XRrDM
+  white-list:
+    - "/simulation/resource/scheduler/confirm"
+    - "/simulation/resource/scheduler/tick"
+    - "/simulation/resource/scheduler/state"
+log:
+  dir: ./log/
+  prefix: dispatch_server
+
+redis:
+#  addr: 36.110.106.156:6379
+  addr: 10.14.85.240:6379
+  password: 1qaz2wsx!
+  db: 3
+
+kafka:
+  partition: 0
+  broker: 10.14.85.239:9092
+
+oss-cicv:
+  type: Aliyun # Minio 或 Aliyun
+  is-user-cname: false #  is-user-cname: true
+  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com #  endpoint: open-bucket.oss.icvdc.com
+  access-key-id: n8glvFGS25MrLY7j
+  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
+  bucket-name: open-bucket
+
+oss-pji:
+  type: Aliyun # Minio 或 Aliyun
+  is-user-cname: false #  is-user-cname: true
+  endpoint: oss-cn-beijing-gqzl-d01-a.ops.gqzl-cloud.com #  endpoint: pji-bucket1.oss.icvdc.com
+  access-key-id: n8glvFGS25MrLY7j
+  access-key-secret: xZ2Fozoarpfw0z28FUhtg8cu0yDc5d
+  bucket-name: pji-bucket1
+
+gpu-node-list:
+  - hostname: gpu002
+    ip: 10.14.85.236
+    parallelism: 6
+
+k8s:
+  pod-yaml-dir: /mnt/disk001/dcl_dispatch_server/pod-yaml/
+  vtd-pod-template-yaml-pjisuv: /mnt/disk001/dcl_dispatch_server/resource/vtd_pod_template-pjisuv.yaml
+  vtd-pod-template-yaml-pjibot: /mnt/disk001/dcl_dispatch_server/resource/vtd_pod_template-pjibot.yaml
+  algorithm-tar-temp-dir: /mnt/disk001/dcl_dispatch_server/temp/algorithm/
+  registry-uri: 10.14.85.237:5000
+  namespace-name: cicvdcl
+  vtd-image: 10.14.85.237:5000/vtd.run.perception.release:latest
+#  vtd-command: /Controller/config/docker_cloud_algContest.ini
+  vtd-command-pjisuv: /Controller/config/docker_cloud.ini
+  vtd-command-pjibot: /Controller/config/docker_cloud_robot.ini
+  callback-uri-cicv: http://10.14.86.127:9081/project/task/callback
+  callback-uri-pji: http://10.14.86.147:9081/project/task/callback
+  platform-type: 2
+
+docker:
+  host: "tcp://10.14.85.237:2375"

src/package/infra/i_application.go

@@ -7,6 +7,7 @@ import (
 	"errors"
 	"fmt"
 	"gopkg.in/yaml.v2"
+	"os"
 )
 
 type ApplicationYamlStruct struct {
@@ -81,17 +82,33 @@ type DockerStruct struct {
 }
 
 var (
-	//go:embed application.yaml
+	// 使用外部配置文件 go:embed application.yaml
 	applicationYamlBytes []byte
 	ApplicationYaml      ApplicationYamlStruct
 )
 
+//// 使用embed加载
+//func InitApplication() {
+//	_ = yaml.Unmarshal(applicationYamlBytes, &ApplicationYaml)
+//	fmt.Println("加载配置文件内容为：", ApplicationYaml)
+//	// 创建镜像下载目录
+//	util.CreateDir(ApplicationYaml.K8s.AlgorithmTarTempDir)
+//}
+
+// 使用外部文件加载
 func InitApplication() {
+	var err error
+	applicationYamlBytes, err = os.ReadFile("./application.yaml")
+	if err != nil {
+		fmt.Println("Error reading file:", err)
+		return
+	}
 	_ = yaml.Unmarshal(applicationYamlBytes, &ApplicationYaml)
 	fmt.Println("加载配置文件内容为：", ApplicationYaml)
 	// 创建镜像下载目录
 	util.CreateDir(ApplicationYaml.K8s.AlgorithmTarTempDir)
 }
+
 func JsonToGpuNode(jsonData string) (GpuNode, error) {
 	// 创建一个 Person 类型的变量
 	var taskCache GpuNode