diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java
index fb58f7986..f6db8a7d8 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java
@@ -326,9 +326,9 @@ public class ManipulatPolicyController extends BaseController {
BeanUtils.copyProperties(source, str);
if(str.getUserRegion5().equals("85")) {
- str.setActionExport("Hijack");
+ str.setActionExport("action_hijack");
}else if(str.getUserRegion5().equals("90")) {
- str.setActionExport("Insert");
+ str.setActionExport("action_insert");
}else {
str.setActionExport(str.getUserRegion5());
}
diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
index 9e1a0af23..c25383e1c 100644
--- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
@@ -189,6 +189,9 @@
AND a.ACTION=#{action,jdbcType=INTEGER}
+
+ AND a.USER_REGION5=#{userRegion5,jdbcType=VARCHAR}
+
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 21903e8e6..4ab5934a7 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1578,4 +1578,8 @@ decrypt_mirror=Decrypt Mirror
enable=Enable
forward=Forward
decrypt_mirror_enable_on=if the enable option value is '1', the Mirror profile is needed
-ssl_ver_mirror_client_on=if the mirror client option value is '1', the min SSL version and the max SSL version will be ignored
\ No newline at end of file
+ssl_ver_mirror_client_on=if the mirror client option value is '1', the min SSL version and the max SSL version will be ignored
+profile_info=Profile Info
+http_manipulation=HTTP(S) Manipulate
+action_hijack=Hijack
+action_insert=Insert
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 2bc86110b..34928983c 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1580,4 +1580,8 @@ decrypt_mirror=Decrypt Mirror
enable=Enable
forward=Forward
decrypt_mirror_enable_on=if the enable option value is '1', the Mirror profile is needed
-ssl_ver_mirror_client_on=if the mirror client option value is '1', the min SSL version and the max SSL version will be ignored
\ No newline at end of file
+ssl_ver_mirror_client_on=if the mirror client option value is '1', the min SSL version and the max SSL version will be ignored
+profile_info=Profile Info
+http_manipulation=HTTP(S) Manipulate
+action_hijack=Hijack
+action_insert=Insert
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 8cfe35628..e34fca1b4 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1543,7 +1543,7 @@ target_name=\u76EE\u6807\u540D\u79F0
traffic_mirror_address=\u6D41\u91CF\u8F6C\u53D1\u76EE\u7684\u5730\u5740
content_name=\u5185\u5BB9\u540D\u79F0
visit_response_page=\u8BBF\u95EE\u963B\u65AD\u9875\u9762
-none_profile_tip=Please Choose Profile Info!
+none_profile_tip=\u8BF7\u9009\u62E9\u6587\u4EF6!
#---------------------------pxy intercept------------------------------------
min_should_less_than_max=\u6700\u5C0FSSL\u7248\u672C\u5E94\u5C0F\u4E8E\u6700\u5927SSL\u7248\u672C
exclusions_ev_cert=\u6392\u9664EV\u8BC1\u4E66
@@ -1578,4 +1578,8 @@ decrypt_mirror=\u89E3\u5BC6\u955C\u50CF
enable=\u542F\u7528
forward=Forward
decrypt_mirror_enable_on=\u5982\u679C\u542F\u52A8\u9009\u9879\u7684\u503C\u662F1\uFF0C\u5219\u955C\u50CF\u6587\u4EF6\u9009\u9879\u9700\u8981\u9009\u62E9
-ssl_ver_mirror_client_on=\u5982\u679C\u955C\u50CF\u5BA2\u6237\u7AEF\u9009\u9879\u7684\u503C\u662F1\uFF0C\u5219\u6700\u5927\u6700\u5C0FSSL\u7248\u672C\u53F7\u4F1A\u88AB\u5FFD\u7565
\ No newline at end of file
+ssl_ver_mirror_client_on=\u5982\u679C\u955C\u50CF\u5BA2\u6237\u7AEF\u9009\u9879\u7684\u503C\u662F1\uFF0C\u5219\u6700\u5927\u6700\u5C0FSSL\u7248\u672C\u53F7\u4F1A\u88AB\u5FFD\u7565
+profile_info=\u6587\u4EF6
+http_manipulation=HTTP(S)\u64CD\u63A7
+action_hijack=\u52AB\u6301
+action_insert=\u6CE8\u5165
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/include/excel/importModal.jsp b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
index 23a81603e..d1548ac3e 100644
--- a/src/main/webapp/WEB-INF/include/excel/importModal.jsp
+++ b/src/main/webapp/WEB-INF/include/excel/importModal.jsp
@@ -109,11 +109,11 @@
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyForm.jsp
index d167c44f1..5677eb916 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyForm.jsp
@@ -118,12 +118,11 @@
$(this).removeAttr("disabled");
});
$("select[name='httpResHdrList[0].district']").selectpicker("refresh");
- $("select[name='httpResHdrList[0].district']").change();
// 域配置隐藏/显示
- if(selValue == 48){ // Redirect 隐藏响应体
+ if(selValue == 48){ // Redirect 隐藏响应体
$(".resBodyCfg").addClass("hidden");
- }else if(selValue == 80){ // Replace 隐藏请求响应体
+ }else if(selValue == 80){ // Replace 隐藏请求响应体
$(".reqBodyCfg").addClass("hidden");
$(".resBodyCfg").addClass("hidden");
}else if(selValue == 85 || selValue == 90){ // Hijack/Insert 隐藏请求头、请求体和响应体
@@ -327,13 +326,13 @@
<%-- Insert标识为90 --%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp
index ae52474d9..010ece7d5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/manipulatPolicyList.jsp
@@ -204,11 +204,19 @@