From 83dfee8c7a0e6a792a84cb2edf9835a92be76f87 Mon Sep 17 00:00:00 2001
From: oil-oil <2228586315@qq.com>
Date: Fri, 11 Feb 2022 16:04:59 +0800
Subject: [PATCH 1/3] fix: add rejected msg field to limit-req plugin form

---
 web/src/components/Plugin/UI/limit-req.tsx | 8 ++++++++
 web/src/components/Plugin/locales/en-US.ts | 2 ++
 web/src/components/Plugin/locales/zh-CN.ts | 1 +
 3 files changed, 11 insertions(+)

diff --git a/web/src/components/Plugin/UI/limit-req.tsx b/web/src/components/Plugin/UI/limit-req.tsx
index f055f6e9a9..9b3015e43b 100644
--- a/web/src/components/Plugin/UI/limit-req.tsx
+++ b/web/src/components/Plugin/UI/limit-req.tsx
@@ -102,6 +102,14 @@ const LimitReq: React.FC<Props> = ({ form, schema }) => {
           max={properties.rejected_code.maximum}
         />
       </Form.Item>
+      <Form.Item
+        label="rejected_msg"
+        name="rejected_msg"
+        initialValue={properties.rejected_msg.default}
+        tooltip={formatMessage({ id: 'component.pluginForm.limit-req.rejected_msg.tooltip' })}
+      >
+        <Input />
+      </Form.Item>
       <Form.Item
         label="nodelay"
         name="nodelay"
diff --git a/web/src/components/Plugin/locales/en-US.ts b/web/src/components/Plugin/locales/en-US.ts
index 1ec4b1b012..365e5b3546 100644
--- a/web/src/components/Plugin/locales/en-US.ts
+++ b/web/src/components/Plugin/locales/en-US.ts
@@ -111,6 +111,8 @@ export default {
   'component.pluginForm.limit-req.key.tooltip': 'The user specified key to limit the rate.',
   'component.pluginForm.limit-req.rejected_code.tooltip':
     'The HTTP status code returned when the request exceeds the threshold is rejected.',
+  'component.pluginForm.limit-req.rejected_msg.tooltip':
+    'The response body returned when the request exceeds the threshold is rejected.',
   'component.pluginForm.limit-req.nodelay.tooltip':
     'If nodelay flag is true, bursted requests will not get delayed',
 
diff --git a/web/src/components/Plugin/locales/zh-CN.ts b/web/src/components/Plugin/locales/zh-CN.ts
index 094af63248..43f38c40cd 100644
--- a/web/src/components/Plugin/locales/zh-CN.ts
+++ b/web/src/components/Plugin/locales/zh-CN.ts
@@ -104,6 +104,7 @@ export default {
   'component.pluginForm.limit-req.key.tooltip': '用来做请求计数的依据',
   'component.pluginForm.limit-req.rejected_code.tooltip':
     '当请求超过阈值被拒绝时，返回的 HTTP 状态码。',
+  'component.pluginForm.limit-req.rejected_msg.tooltip': '当请求超过阈值被拒绝时，返回的响应体。',
   'component.pluginForm.limit-req.nodelay.tooltip': '开启后突发的请求不会延迟',
 
   'component.plugin.form': '表单',

From 6a57c4c4f0b2a8801deb96f98080df7714a5e5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?oil=E6=AC=A7=E5=91=A6?= <2228586315@qq.com>
Date: Mon, 14 Feb 2022 10:56:15 +0800
Subject: [PATCH 2/3] fix: add test case for rejected_msg

---
 .../integration/route/create-route-with-limit-req-form.spec.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/cypress/integration/route/create-route-with-limit-req-form.spec.js b/web/cypress/integration/route/create-route-with-limit-req-form.spec.js
index d8f8c22c8f..a6fd8a57bf 100644
--- a/web/cypress/integration/route/create-route-with-limit-req-form.spec.js
+++ b/web/cypress/integration/route/create-route-with-limit-req-form.spec.js
@@ -34,6 +34,7 @@ context('Create and delete route with limit-req form', () => {
     rate: '#rate',
     burst: '#burst',
     key: '#key',
+    rejected_msg: '#rejected_msg',
   };
 
   const data = {
@@ -42,6 +43,7 @@ context('Create and delete route with limit-req form', () => {
     port: '80',
     weight: 1,
     key: 'remote_addr',
+    rejected_msg: 'Requests are too frequent, please try again later.',
   };
 
   beforeEach(() => {
@@ -92,6 +94,7 @@ context('Create and delete route with limit-req form', () => {
     cy.get(selector.rate).type(1);
     cy.get(selector.burst).type(0);
     cy.get(selector.key).type(data.key);
+    cy.get(selector.rejected_msg).type(data.rejected_msg);
     cy.get(selector.drawer).within(() => {
       cy.contains('Submit').click({
         force: true,

From 9856ad2801543a8c7edd104ca3fbfec7fff49166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?oil=E6=AC=A7=E5=91=A6?= <2228586315@qq.com>
Date: Tue, 15 Feb 2022 10:12:03 +0800
Subject: [PATCH 3/3] fix: remote rejected_msg default value

---
 web/src/components/Plugin/UI/limit-req.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/src/components/Plugin/UI/limit-req.tsx b/web/src/components/Plugin/UI/limit-req.tsx
index 9b3015e43b..529340ac83 100644
--- a/web/src/components/Plugin/UI/limit-req.tsx
+++ b/web/src/components/Plugin/UI/limit-req.tsx
@@ -105,7 +105,6 @@ const LimitReq: React.FC<Props> = ({ form, schema }) => {
       <Form.Item
         label="rejected_msg"
         name="rejected_msg"
-        initialValue={properties.rejected_msg.default}
         tooltip={formatMessage({ id: 'component.pluginForm.limit-req.rejected_msg.tooltip' })}
       >
         <Input />