From 2bc5d81e43dfd02b827fc578fb60bf31b353f903 Mon Sep 17 00:00:00 2001 From: GuoYL Date: Wed, 12 Feb 2020 14:53:45 +0800 Subject: [PATCH] rename insID --- server/resource/v1/kv_resource.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/server/resource/v1/kv_resource.go b/server/resource/v1/kv_resource.go index 85a03959..27d064bb 100644 --- a/server/resource/v1/kv_resource.go +++ b/server/resource/v1/kv_resource.go @@ -116,14 +116,14 @@ func (r *KVResource) GetByKey(rctx *restful.Context) { WriteErrResponse(rctx, http.StatusBadRequest, err.Error(), common.ContentTypeText) return } - insId := rctx.ReadHeader("insId") + insID := rctx.ReadHeader("insId") statusStr := rctx.ReadQueryParameter("status") status, err := checkStatus(statusStr) if err != nil { WriteErrResponse(rctx, http.StatusBadRequest, err.Error(), common.ContentTypeText) return } - returnData(rctx, domain, project, labels, limit, offset, status, insId) + returnData(rctx, domain, project, labels, limit, offset, status, insID) } //List response kv list @@ -147,20 +147,20 @@ func (r *KVResource) List(rctx *restful.Context) { WriteErrResponse(rctx, http.StatusBadRequest, err.Error(), common.ContentTypeText) return } - insId := rctx.ReadHeader("insId") + insID := rctx.ReadHeader("insId") statusStr := rctx.ReadQueryParameter("status") status, err := checkStatus(statusStr) if err != nil { WriteErrResponse(rctx, http.StatusBadRequest, err.Error(), common.ContentTypeText) return } - returnData(rctx, domain, project, labels, limit, offset, status, insId) + returnData(rctx, domain, project, labels, limit, offset, status, insID) } -func returnData(rctx *restful.Context, domain interface{}, project string, labels map[string]string, limit, offset int64, status, insId string) { +func returnData(rctx *restful.Context, domain interface{}, project string, labels map[string]string, limit, offset int64, status, insID string) { revStr := rctx.ReadQueryParameter(common.QueryParamRev) wait := rctx.ReadQueryParameter(common.QueryParamWait) - go RecordPollingDetail(rctx, revStr, wait, domain.(string), project, labels, limit, offset, insId) + go RecordPollingDetail(rctx, revStr, wait, domain.(string), project, labels, limit, offset, insID) if revStr == "" { if wait == "" { queryAndResponse(rctx, domain, project, "", labels, limit, offset, status) @@ -218,11 +218,11 @@ func returnData(rctx *restful.Context, domain interface{}, project string, label } //RecordPollingDetail to record data after get or list -func RecordPollingDetail(context *restful.Context, revStr, wait, domain, project string, labels map[string]string, limit, offset int64, insId string) { +func RecordPollingDetail(context *restful.Context, revStr, wait, domain, project string, labels map[string]string, limit, offset int64, insID string) { Wg.Add(1) data := &model.PollingDetail{} data.ID = uuid.NewV4().String() - data.SessionID = insId + domain + data.SessionID = insID + domain data.IP = iputil.ClientIP(context.Req.Request) dataMap := map[string]interface{}{ "revStr": revStr,