From 3c48b4c71f08d9d1d0f6ba5b1b71cd77ef747724 Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Sun, 3 Apr 2022 22:12:57 +0800
Subject: [PATCH] [manager,webapp]feature:api monitor support http headers
 (#58)

---
 manager/src/main/resources/define/app/api.yml |  3 ++
 .../main/resources/define/param/A-example.yml |  2 +-
 .../src/main/resources/define/param/api.yml   | 38 +++++++++++--------
 .../key-value-input.component.less            |  4 +-
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/manager/src/main/resources/define/app/api.yml b/manager/src/main/resources/define/app/api.yml
index 5302527..e475d20 100644
--- a/manager/src/main/resources/define/app/api.yml
+++ b/manager/src/main/resources/define/app/api.yml
@@ -26,6 +26,8 @@ configmap:
     type: 1
   - key: payload
     type: 1
+  - key: headers
+    type: 3
 # 指标组列表
 metrics:
   # 第一个监控指标组 cpu
@@ -58,6 +60,7 @@ metrics:
       # 请求头内容
       headers:
         content-type: ^_^contentType^_^
+        ^_^headers^_^: ^_^headers^_^
       # 认证
       authorization:
         # 认证方式: Basic Auth, Digest Auth, Bearer Token
diff --git a/manager/src/main/resources/define/param/A-example.yml b/manager/src/main/resources/define/param/A-example.yml
index bfde8aa..c6d0530 100644
--- a/manager/src/main/resources/define/param/A-example.yml
+++ b/manager/src/main/resources/define/param/A-example.yml
@@ -50,7 +50,7 @@ param:
       - label: DELETE请求
         value: DELETE
   - field: headers
-    name: 请求头
+    name: 请求Headers
     type: key-value
     required: false
     keyAlias: Header Name
diff --git a/manager/src/main/resources/define/param/api.yml b/manager/src/main/resources/define/param/api.yml
index 77a008e..6828adc 100644
--- a/manager/src/main/resources/define/param/api.yml
+++ b/manager/src/main/resources/define/param/api.yml
@@ -17,13 +17,6 @@ param:
     range: '[0,65535]'
     required: true
     defaultValue: 80
-  - field: uri
-    name: 相对路径
-    type: text
-    # 当type为text时,用limit表示字符串限制大小
-    limit: 200
-    required: false
-    placeholder: 'API地址除IP端口外的路径 例如:/v2/book/bar'
   - field: method
     name: 请求方式
     type: radio
@@ -38,21 +31,24 @@ param:
         value: PUT
       - label: DELETE请求
         value: DELETE
+  - field: uri
+    name: 相对路径
+    type: text
+    # 当type为text时,用limit表示字符串限制大小
+    limit: 200
+    required: false
+    placeholder: 'API地址除IP端口外的路径 例如:/v2/book/bar'
   - field: ssl
     name: 启用HTTPS
     # 当type为boolean时,前端用switch展示开关
     type: boolean
     required: true
-  - field: username
-    name: 用户名
-    type: text
-    # 当type为text时,用limit表示字符串限制大小
-    limit: 20
-    required: false
-  - field: password
-    name: 密码
-    type: password
+  - field: headers
+    name: 请求Headers
+    type: key-value
     required: false
+    keyAlias: Header Name
+    valueAlias: Header Value
   - field: contentType
     name: Content-Type
     type: text
@@ -63,3 +59,13 @@ param:
     type: textarea
     placeholder: 'POST PUT请求时有效'
     required: false
+  - field: username
+    name: 用户名
+    type: text
+    # 当type为text时,用limit表示字符串限制大小
+    limit: 20
+    required: false
+  - field: password
+    name: 密码
+    type: password
+    required: false
diff --git a/web-app/src/app/shared/components/key-value-input/key-value-input.component.less b/web-app/src/app/shared/components/key-value-input/key-value-input.component.less
index f7997e4..4e8c769 100644
--- a/web-app/src/app/shared/components/key-value-input/key-value-input.component.less
+++ b/web-app/src/app/shared/components/key-value-input/key-value-input.component.less
@@ -1,10 +1,10 @@
 .dynamic-button {
   cursor: pointer;
   position: relative;
-  top: 4px;
+  top: 20%;
   font-size: 15px;
   transition: all 0.3s;
-  margin-left: 6%;
+  margin-left: 12%;
 }
 
 .dynamic-button:hover {