~suntianyu/webserver.git

			@@ -204,7 +204,7 @@
			"\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
			"\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
			"}"
			//logger.Debug("findEsData.param:",prama)
			logger.Debug("findEsData.param:",prama)
			//数据解析
			tokenRes := esutil.GetEsDataReq(url, prama, true)
			//fmt.Println(tokenRes)

			@@ -21,7 +21,7 @@
			// @Tags es
			// @Success 200 {string} json "{"code":200, msg:"目录结构数据", success:true}"
			// @Failure 500 {string} json "{"code":500, msg:"返回错误信息", success:false}"
			// @Router /data/api-v/es/tagList [POST]
			// @Router /data/api-v/es/taskList [POST]
			func (sc EsSearchController) PostEsTaskList(c gin.Context) {
			localConf, err2 := cache.GetServerInfo()
			if err2 !=nil \|\| localConf.AlarmIp == "" \|\| localConf.ServerId == "" {

			@@ -40,6 +40,10 @@
			}

			type esindexlist struct {
			VideoPersons index `mapstructure:"videopersons"`
			DbTables index `mapstructure:"dbtables"`
			Dbtablepersons index `mapstructure:"dbtablepersons"`
			Personaction index `mapstructure:"personaction"`
			AiOcean index `mapstructure:"aiOcean"`
			}
			type index struct {
			@@ -86,7 +90,7 @@
			viper.AddConfigPath("/opt/vasystem/config/")
			err = viper.ReadInConfig()
			if err != nil {
			log.Fatal("error on parsing configuration file")
			log.Fatal("error on parsing configuration file",err)
			}
			viper.UnmarshalKey("es", EsInfo)
			viper.UnmarshalKey("server", Server)

File was deleted

	controllers/esSearch.go	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	controllers/tasklist.go	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	extend/config/config.go	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service/CameraVideoService.go	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	service/EnableStatusControlService.go	176 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史