From 15dc6df83a839f5913997e4e2a252a0714dc2978 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 13 六月 2024 11:39:33 +0800
Subject: [PATCH] osd 添加上下行
---
config/config.go | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/config/config.go b/config/config.go
index 6802574..cebb37e 100644
--- a/config/config.go
+++ b/config/config.go
@@ -13,21 +13,26 @@
Mode string `mapstructure:"mode"`
Host string `mapstructure:"host"`
Port string `mapstructure:"port"`
+ Realm string `mapstructure:"realm"`
+ Username string `mapstructure:"username"`
Password string `mapstructure:"password"`
+ Role string `mapstructure:"role"` // agent 璁惧绔�, proxy 1400涓浆 涓嶅鐞哾eivce, server 鍏ㄥ姛鑳�
}
type client struct {
- DeviceID string `mapstructure:"device-id"`
- Username string `mapstructure:"username"`
- Password string `mapstructure:"password"`
- ServerAddr string `mapstructure:"server-addr"`
- ServerPort string `mapstructure:"server-port"`
- Proto string `mapstructure:"proto" ` // http, https
- UploadType string `mapstructure:"upload-type"` // binary, url
- ChannelNo string `mapstructure:"channel-number"` // 閫氶亾鍙�, 鍚宨d
- HeartbeatInterval int `mapstructure:"heartbeat-interval"` // 蹇冭烦鍛ㄦ湡
- HeartbeatCount int `mapstructure:"heartbeat-count"` // 蹇冭烦瓒呮椂娆℃暟
- Enable bool `mapstructure:"enable"`
+ ServerId string `mapstructure:"server-id"`
+ DeviceID string `mapstructure:"device-id"`
+ Username string `mapstructure:"username"`
+ Password string `mapstructure:"password"`
+ ServerAddr string `mapstructure:"server-addr"`
+ ServerPort string `mapstructure:"server-port"`
+ Proto string `mapstructure:"proto" ` // http, https
+ UploadType string `mapstructure:"upload-type"` // binary, url
+ ChannelNo string `mapstructure:"channel-number"` // 閫氶亾鍙�, 鍚宨d
+ HeartbeatInterval int `mapstructure:"heartbeat-interval"` // 蹇冭烦鍛ㄦ湡
+ HeartbeatFailCount int `mapstructure:"heartbeat-count"` // 蹇冭烦瓒呮椂娆℃暟
+ AddFloorToFaceId bool `mapstructure:"add-floor-faceId"`
+ Enable bool `mapstructure:"enable"`
}
type logConfig struct {
@@ -42,8 +47,19 @@
ReportServer string `mapstructure:"report-server"`
ReportInterval int `mapstructure:"report-interval"`
RetryInterval int `mapstructure:"retry-interval"`
- CutFaceImage bool `mapstructure:"cut-face-image"`
Enable bool `mapstructure:"enable"`
+}
+
+type image struct {
+ CutFaceImage bool `mapstructure:"cut-face-image"`
+ Enlarge int `mapstructure:"enlarge"`
+}
+
+// 姊帶璁惧
+type nvcs struct {
+ Model string `mapstructure:"model"` // 鍨嬪彿
+ Port string `mapstructure:"port"` // 绔彛
+ OSD string `mapstructure:"osd"`
}
type rateLimitConfig struct {
@@ -56,6 +72,8 @@
var ForwardConf = &forward{}
var RateLimitConf = &rateLimitConfig{}
var ClientConf = &client{}
+var NVCSConf = &nvcs{}
+var ImageConf = &image{}
// Init is an exported method that takes the environment starts the viper
// (external lib) and returns the configuration struct.
@@ -64,6 +82,7 @@
v := viper.New()
v.SetConfigType("yaml")
v.SetConfigName("gat1400")
+ v.AddConfigPath("./")
v.AddConfigPath("./config/")
v.AddConfigPath("../config/")
err = v.ReadInConfig()
@@ -84,6 +103,8 @@
v.UnmarshalKey("forward", ForwardConf)
v.UnmarshalKey("rate-limit", RateLimitConf)
v.UnmarshalKey("client", ClientConf)
+ v.UnmarshalKey("nvcs", NVCSConf)
+ v.UnmarshalKey("image", ImageConf)
if LogConf.Level == "" {
LogConf.Level = "info"
@@ -97,5 +118,17 @@
ForwardConf.RetryInterval = 5
}
+ if ClientConf.HeartbeatInterval == 0 {
+ ClientConf.HeartbeatInterval = 30
+ }
+
+ if ClientConf.Proto == "" {
+ ClientConf.Proto = "http"
+ }
+
+ if ImageConf.Enlarge == 0 {
+ ImageConf.Enlarge = 100
+ }
+
logger.SetLogLevel(LogConf.Level)
}
--
Gitblit v1.8.0