From f946512f64f1e2e9aa887f62f04f8ebedb53d810 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 22 五月 2024 15:20:21 +0800
Subject: [PATCH] 优化重传, 修改为每次读取一条记录
---
config/config.go | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/config/config.go b/config/config.go
index 0aa97b4..922d680 100644
--- a/config/config.go
+++ b/config/config.go
@@ -13,7 +13,25 @@
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"`
+ 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"` // 蹇冭烦瓒呮椂娆℃暟
+ Enable bool `mapstructure:"enable"`
}
type logConfig struct {
@@ -28,6 +46,15 @@
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 nvcs struct {
+ Model string `mapstructure:"model"` // 鍨嬪彿
+ Port string `mapstructure:"port"` // 绔彛
+ OSD string `mapstructure:"osd"`
}
type rateLimitConfig struct {
@@ -39,6 +66,8 @@
var LogConf = &logConfig{}
var ForwardConf = &forward{}
var RateLimitConf = &rateLimitConfig{}
+var ClientConf = &client{}
+var NVCSConf = &nvcs{}
// Init is an exported method that takes the environment starts the viper
// (external lib) and returns the configuration struct.
@@ -48,6 +77,7 @@
v.SetConfigType("yaml")
v.SetConfigName("gat1400")
v.AddConfigPath("./config/")
+ v.AddConfigPath("../config/")
err = v.ReadInConfig()
if err != nil {
fmt.Println("error on parsing configuration file", err)
@@ -65,6 +95,8 @@
v.UnmarshalKey("log", LogConf)
v.UnmarshalKey("forward", ForwardConf)
v.UnmarshalKey("rate-limit", RateLimitConf)
+ v.UnmarshalKey("client", ClientConf)
+ v.UnmarshalKey("nvcs", NVCSConf)
if LogConf.Level == "" {
LogConf.Level = "info"
@@ -78,5 +110,13 @@
ForwardConf.RetryInterval = 5
}
+ if ClientConf.HeartbeatInterval == 0 {
+ ClientConf.HeartbeatInterval = 30
+ }
+
+ if ClientConf.Proto == "" {
+ ClientConf.Proto = "http"
+ }
+
logger.SetLogLevel(LogConf.Level)
}
--
Gitblit v1.8.0