From 52830a58e2907f83e8f891728b8ba3080ca59fb1 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 05 六月 2024 17:40:28 +0800
Subject: [PATCH] 修改切图的判断条件
---
config/config.go | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/config/config.go b/config/config.go
index 9eaad86..f5e1c8b 100644
--- a/config/config.go
+++ b/config/config.go
@@ -13,10 +13,14 @@
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 {
+ ServerId string `mapstructure:"server-id"`
DeviceID string `mapstructure:"device-id"`
Username string `mapstructure:"username"`
Password string `mapstructure:"password"`
@@ -27,6 +31,7 @@
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"`
}
@@ -42,8 +47,21 @@
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"`
+
+ Enable bool `mapstructure:"enable"`
+}
+
+type image struct {
+ CutFaceImage bool `mapstructure:"cut-face-image"`
+ OriginWidth float64 `mapstructure:"origin-width"`
+ OriginHeight float64 `mapstructure:"origin-height"`
+}
+
+// 姊帶璁惧
+type nvcs struct {
+ Model string `mapstructure:"model"` // 鍨嬪彿
+ Port string `mapstructure:"port"` // 绔彛
+ OSD string `mapstructure:"osd"`
}
type rateLimitConfig struct {
@@ -56,6 +74,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 +84,7 @@
v := viper.New()
v.SetConfigType("yaml")
v.SetConfigName("gat1400")
+ v.AddConfigPath("./")
v.AddConfigPath("./config/")
v.AddConfigPath("../config/")
err = v.ReadInConfig()
@@ -84,6 +105,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"
--
Gitblit v1.8.0