Merge branch 'test'

Author: guosongsong

model/constant.go

@@ -72,6 +72,7 @@ const (
 	FloatType     = "Float"
 	DoubleType    = "Double"
 	FileType      = "File"
+	FileUrlType   = "FileUrl"
 	DateType      = "Date"
 	DateTimeType  = "DateTime"
 	TimeStampType = "TimeStampType"

model/request.go

@@ -95,12 +95,14 @@ func (b *Body) SetBody(req *fasthttp.Request) string {
 				continue
 			}
 
-			if value.Type == FileType {
+			switch value.Type {
+			case FileType:
 				if value.FileBase64 == nil || len(value.FileBase64) < 1 {
 					continue
 				}
 				for _, base64Str := range value.FileBase64 {
 					by, fileType := tools.Base64DeEncode(base64Str, FileType)
+					log.Logger.Debug(fmt.Sprintf("机器ip:%s, fileType:    ", middlewares.LocalIp), fileType)
 					if by == nil {
 						continue
 					}
@@ -121,7 +123,54 @@ func (b *Body) SetBody(req *fasthttp.Request) string {
 						continue
 					}
 				}
-			} else {
+			case FileUrlType:
+				val, ok := value.Value.(string)
+				if !ok {
+					continue
+				}
+				if strings.HasPrefix(val, "https://") || strings.HasPrefix(val, "http://") {
+					strList := strings.Split(val, "/")
+					if len(strList) < 1 {
+						continue
+					}
+					fileTypeList := strings.Split(strList[len(strList)-1], ".")
+					if len(fileTypeList) < 1 {
+						continue
+					}
+					fc := &fasthttp.Client{}
+					loadReq := fasthttp.AcquireRequest()
+					defer loadReq.ConnectionClose()
+					// set url
+					loadReq.Header.SetMethod("GET")
+					loadReq.SetRequestURI(val)
+					loadResp := fasthttp.AcquireResponse()
+					defer loadResp.ConnectionClose()
+					if err := fc.Do(loadReq, loadResp); err != nil {
+						log.Logger.Error(fmt.Sprintf("机器ip:%s, 下载body上传文件错误：", middlewares.LocalIp), err)
+						continue
+					}
+
+					if loadResp.Body() == nil {
+						continue
+					}
+					h := make(textproto.MIMEHeader)
+					h.Set("Content-Type", fileTypeList[len(fileTypeList)-1])
+					h.Set("Content-Disposition",
+						fmt.Sprintf(`form-data; name="%s"; filename="%s"`,
+							value.Key, strList[len(strList)-1]))
+					fileWriter, err := bodyWriter.CreatePart(h)
+					if err != nil {
+						log.Logger.Error(fmt.Sprintf("机器ip:%s, CreateFormFile失败：%s ", middlewares.LocalIp, err.Error()))
+						continue
+					}
+					file := bytes.NewReader(loadResp.Body())
+					_, err = io.Copy(fileWriter, file)
+					if err != nil {
+						continue
+					}
+				}
+
+			default:
 				filedWriter, err := bodyWriter.CreateFormField(value.Key)
 				by := value.toByte()
 				filed := bytes.NewReader(by)

server/client/http_client_test.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	"fmt"
-	"net/url"
+	"math"
 	"testing"
 )
 
@@ -57,7 +57,56 @@ func TestHTTPRequest(t *testing.T) {
 	//ti := time.Now()
 	//
 	//fmt.Println(ti.Format("2006-01-02 15:04:05"))
-	a, b := url.QueryUnescape("md5%E5%8A%A0%E5%AF%86=902fbdd2b1df0c4f70b4a5d23525e932")
-	fmt.Println("a:   ", a)
-	fmt.Println("b:   ", b)
+	//a, b := url.QueryUnescape("md5%E5%8A%A0%E5%AF%86=902fbdd2b1df0c4f70b4a5d23525e932")
+	//fmt.Println("a:   ", a)
+	//fmt.Println("b:   ", b)
+	param := ModeConf{
+		RoundNum:         0,
+		Concurrency:      1,
+		ThresholdValue:   0,
+		StartConcurrency: 1,
+		Step:             5,
+		StepRunTime:      5,
+		MaxConcurrency:   100,
+		Duration:         200,
+		CreatedTimeSec:   0,
+	}
+
+	fmt.Println(111, GetVumTotalNum(param))
+}
+
+type ModeConf struct {
+	RoundNum         int64 `json:"round_num"`         // 轮次
+	Concurrency      int64 `json:"concurrency"`       // 并发数
+	ThresholdValue   int64 `json:"threshold_value"`   // 阈值
+	StartConcurrency int64 `json:"start_concurrency"` // 起始并发数
+	Step             int64 `json:"step"`              // 步长
+	StepRunTime      int64 `json:"step_run_time"`     // 步长执行时长
+	MaxConcurrency   int64 `json:"max_concurrency"`   // 最大并发数
+	Duration         int64 `json:"duration"`          // 稳定持续时长，持续时长
+	CreatedTimeSec   int64 `json:"created_time_sec"`  // 创建时间
+}
+
+func GetVumTotalNum(modeConf ModeConf) int64 {
+	// 把时长转换为分钟，向上取整
+	startConcurrency := modeConf.StartConcurrency
+	maxConcurrency := modeConf.MaxConcurrency
+	stepRunTimeMinute := int64(math.Ceil(float64(modeConf.StepRunTime) / float64(60)))
+	durationMinute := int64(math.Ceil(float64(modeConf.Duration) / float64(60)))
+	step := modeConf.Step
+
+	vumTemp := startConcurrency*stepRunTimeMinute + maxConcurrency*durationMinute
+	for maxConcurrency > startConcurrency {
+
+		startConcurrency = startConcurrency + step
+		if startConcurrency > maxConcurrency {
+			fmt.Println("start:     ", startConcurrency)
+			startConcurrency = maxConcurrency
+		}
+		if startConcurrency < maxConcurrency {
+			vumTemp += startConcurrency * stepRunTimeMinute
+		}
+	}
+
+	return vumTemp
 }