ip白名单

app/cmd/dtgateway/desc/dtgateway.api

@@ -35,11 +35,11 @@ service dtgateway {
 	
 	@doc "点位历史数据查询"
 	@handler ItemHistoryDataList
-	post /item-history/list (ItemHistoryDataListResq) returns (MultiAddItemHistoryDataReq)
+	get /item-history/list (ItemHistoryDataListResq) returns (MultiAddItemHistoryDataReq)
 	
 	@doc "按时间点位历史数据查询"
 	@handler ItemHistoryDataInfo
-	post /item-history/info (ItemHistoryDataByTimeResq) returns (MultiAddItemHistoryDataReq)
+	get /item-history/info (ItemHistoryDataByTimeResq) returns (MultiAddItemHistoryDataReq)
 	
 	@doc "按时间点位历史数据最大值最小值查询"
 	@handler ItemHistoryDataMaxMin

app/cmd/dtgateway/desc/dtgateway/dtgateway.api

@@ -162,20 +162,20 @@ type (
 
 type (
     ItemHistoryDataListResq{
-        ProjectId   int64     `json:"project_id"`
-        ItemName    string    `json:"item_name"`
-        Size        int64     `json:"size"`         //结果间隔
-        Interval    string    `json:"interval"`     //时间单位 s,minute,h,day
-        Aggregator  string    `json:"aggregator"`   //聚合方式 min,max,avg，sum，realtime, new
-        STime       string    `json:"stime"`
-        ETime       string    `json:"etime"`
+        ProjectId   int64     `form:"project_id"`
+        ItemName    string    `form:"item_name"`
+        Size        int64     `form:"size"`         //结果间隔
+        Interval    string    `form:"interval"`     //时间单位 s,minute,h,day
+        Aggregator  string    `form:"aggregator"`   //聚合方式 min,max,avg，sum，realtime, new
+        STime       string    `form:"stime"`
+        ETime       string    `form:"etime"`
     }
 
     ItemHistoryDataByTimeResq{
-        ProjectId   int64     `json:"project_id"`
-        ItemName    string    `json:"item_name"`
-        STime       string    `json:"stime"`
-        ETime       string    `json:"etime"`
+        ProjectId   int64     `form:"project_id"`
+        ItemName    string    `form:"item_name"`
+        STime       string    `form:"stime"`
+        ETime       string    `form:"etime"`
     }
 
     ItemHistoryDataMaxMinByTimeReq{

app/cmd/dtgateway/internal/handler/routes.go

@@ -44,12 +44,12 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Handler: dtgateway.ItemHistoryDataMultiAddHandler(serverCtx),
 			},
 			{
-				Method:  http.MethodPost,
+				Method:  http.MethodGet,
 				Path:    "/item-history/list",
 				Handler: dtgateway.ItemHistoryDataListHandler(serverCtx),
 			},
 			{
-				Method:  http.MethodPost,
+				Method:  http.MethodGet,
 				Path:    "/item-history/info",
 				Handler: dtgateway.ItemHistoryDataInfoHandler(serverCtx),
 			},

app/cmd/dtgateway/internal/types/types.go

@@ -164,20 +164,20 @@ type MultiAddItemHistoryDataResq struct {
 }
 
 type ItemHistoryDataListResq struct {
-	ProjectId  int64  `json:"project_id"`
-	ItemName   string `json:"item_name"`
-	Size       int64  `json:"size"`       //结果间隔
-	Interval   string `json:"interval"`   //时间单位 s,minute,h,day
-	Aggregator string `json:"aggregator"` //聚合方式 min,max,avg，sum，realtime, new
-	STime      string `json:"stime"`
-	ETime      string `json:"etime"`
+	ProjectId  int64  `form:"project_id"`
+	ItemName   string `form:"item_name"`
+	Size       int64  `form:"size"`       //结果间隔
+	Interval   string `form:"interval"`   //时间单位 s,minute,h,day
+	Aggregator string `form:"aggregator"` //聚合方式 min,max,avg，sum，realtime, new
+	STime      string `form:"stime"`
+	ETime      string `form:"etime"`
 }
 
 type ItemHistoryDataByTimeResq struct {
-	ProjectId int64  `json:"project_id"`
-	ItemName  string `json:"item_name"`
-	STime     string `json:"stime"`
-	ETime     string `json:"etime"`
+	ProjectId int64  `form:"project_id"`
+	ItemName  string `form:"item_name"`
+	STime     string `form:"stime"`
+	ETime     string `form:"etime"`
 }
 
 type ItemHistoryDataMaxMinByTimeReq struct {

common/middleware/whiteList.go

@@ -1,7 +1,6 @@
 package middleware
 
 import (
-	"fmt"
 	"log"
 	"net"
 	"net/http"
@@ -55,7 +54,6 @@ func getClientIP(r *http.Request) string {
 // 判断IP是否在白名单中
 func isAllowedIP(ip string, ipNets []*net.IPNet) bool {
 	clientIP := net.ParseIP(ip)
-	fmt.Println("clientIP：", clientIP)
 	for _, ipNet := range ipNets {
 		if ipNet.Contains(clientIP) {
 			return true
@@ -82,6 +80,5 @@ func parseIPNets(allowedIPs []string) ([]*net.IPNet, error) {
 		}
 		ipNets = append(ipNets, ipNet)
 	}
-	fmt.Println("ipNets：", ipNets)
 	return ipNets, nil
 }