From ca1b2ac7edb871df9faf17f8afd9290be63d33df Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期五, 20 十二月 2019 16:44:18 +0800
Subject: [PATCH] update

---
 util/common.go |   34 -----------
 /dev/null      |   32 ----------
 util/data.go   |   61 ++------------------
 3 files changed, 6 insertions(+), 121 deletions(-)

diff --git a/util/common.go b/util/common.go
index 8fe6ab2..c218ff2 100644
--- a/util/common.go
+++ b/util/common.go
@@ -7,43 +7,9 @@
 	"github.com/spf13/viper"
 )
 
-// GetIpcAddress get ipc
-func GetIpcAddress(shm bool, id string) string {
-	if shm {
-		return id
-	}
-	return `ipc:///tmp/` + id + `.ipc`
-}
-
-// SetParams 鏀堕泦鍙傛暟
-func SetParams(param string) {
-	RunParams = append(RunParams, param)
-}
-
 // FillParams 濉厖MapParams
 func FillParams(key, value string) {
 	MapParames[key] = value
-}
-
-// GetParams 鑾峰彇slave params
-func GetParams() *[]string {
-	// if len(RunParams) == 0 {
-	// 	for k, v := range MapParames {
-	// 		param := "-" + k + "=" + v
-	// 		RunParams = append(RunParams, param)
-	// 	}
-	// }
-	// return &RunParams
-
-	var params []string
-	for _, v := range RunParams {
-		params = append(params, v)
-	}
-	for k, v := range MapParames {
-		param := "-" + k + "=" + v
-		params = append(params, param)
-	}
-	return &params
 }
 
 // FindStringInArray find
diff --git a/util/data.go b/util/data.go
index e05173e..53cb696 100644
--- a/util/data.go
+++ b/util/data.go
@@ -8,25 +8,6 @@
 	DataPort int //鏁版嵁绔彛
 }
 
-// SDKFaceInfo face
-type SDKFaceInfo struct {
-	DetectThrd    int
-	DetectNum     int
-	DetectAngle   int
-	PropThrd      int
-	ExtractThrd   int
-	TrackInterval int
-	SampleSize    int
-}
-
-// SDKCarInfo car
-type SDKCarInfo struct {
-	LicenseServerPath string
-	Model             string
-	MaxImageWidth     int
-	MaxImageHeight    int
-}
-
 var (
 	// FSI 鍚屾鏈嶅姟鍣ㄤ俊鎭�
 	FSI = &FetchServerInfo{
@@ -36,32 +17,10 @@
 		DataPort: 50007,
 	}
 
-	// SFI 浜鸿劯淇℃伅
-	SFI = &SDKFaceInfo{
-		DetectThrd:    16,
-		DetectNum:     30,
-		DetectAngle:   60,
-		PropThrd:      16,
-		ExtractThrd:   16,
-		TrackInterval: 3,
-		SampleSize:    720,
-	}
-
-	// SCI sdkcarinfo
-	SCI = &SDKCarInfo{
-		LicenseServerPath: "./vtr.key",
-		Model:             "./data/model",
-		MaxImageWidth:     4096,
-		MaxImageHeight:    2160,
-	}
-
 	// ToRuleIPC to ruleprocess
 	ToRuleIPC = "ipc:///tmp/sdk-2-rules-process.ipc"
 
-	// RunParams slave杩涚▼闇�瑕佺殑鍙傛暟,浠巑aster浼犲叆
-	RunParams []string
-
-	// MapParames 淇濆瓨鍙傛暟map,澶囨洿鏂�
+	// MapParames map params
 	MapParames = make(map[string]string)
 
 	// LogFile log
@@ -77,23 +36,15 @@
 )
 
 const (
-	RuleIPC = "rule-ipc"
+	GPU        = "gpu"
+	SHM        = "shm"
+	LogIt      = "logit"
+	ConfigPath = "config-path"
 
 	FetchSrvIP            = "fetch-server-ip"
 	FetchSrvPort          = "fetch-server-port"
 	FetchSrvHeartbeatPort = "fetch-server-heartbeat-port"
 	FetchSrvDataPort      = "fetch-server-data-port"
 
-	FaceDetectThread   = "face-detect-thread"
-	FaceDetectNum      = "face-detect-num"
-	FaceDetectAngle    = "face-detect-angle"
-	FacePropertyThread = "face-property-thread"
-	FaceExtractThread  = "face-extract-thread"
-	FaceTrackInterval  = "face-track-interval"
-	FaceTrackSample    = "face-track-sample"
-
-	CarSDKLicense     = "car-sdk-license"
-	CarMaxImageWidth  = "car-max-image-width"
-	CarMaxImageHeight = "car-max-image-height"
-	CarSDKModel       = "car-sdk-model"
+	RuleIPC = "rule-ipc"
 )
diff --git a/util/db.go b/util/db.go
deleted file mode 100644
index 80dbde1..0000000
--- a/util/db.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package util
-
-import (
-	"analysis/logo"
-	"analysis/work/cache"
-
-	"basic.com/dbapi.git"
-	"basic.com/pubsub/protomsg.git"
-)
-
-// InitDBAPI init dbapi
-func InitDBAPI() {
-	dbapi.Init(FSI.IP, FSI.HTTPort)
-	var initchan = make(chan bool)
-	go cache.Init(initchan, FSI.IP, FSI.HBPort, FSI.DataPort)
-	logo.Infoln("db init done!", <-initchan)
-}
-
-// TaskInfos get camera infos from sqlite db
-func TaskInfos() []protomsg.TaskSdkInfo {
-	tAPI := dbapi.TaskApi{}
-	tasks := tAPI.FindAll()
-
-	return tasks
-}
-
-// SDKInfo get sdk
-func SDKInfo() []protomsg.SdkRun {
-	sAPI := dbapi.SdkApi{}
-
-	return sAPI.FindAllSdkRun()
-}

--
Gitblit v1.8.0