From 7571fb7c7277f409a666e1664486390f38bf1f90 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 18 Jul 2018 17:03:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Speed=20Limit=E4=B8=BARatelim?=
 =?UTF-8?q?it=20=E4=BF=AE=E6=94=B9app=20byte=E3=80=81cfg=E3=80=81domain?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=85=8D=E7=BD=AE=E6=8F=8F=E8=BF=B0=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties          | 6 +++---
 src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp   | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp | 2 +-
 src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp           | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index e54cf3e66..288761358 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -748,8 +748,8 @@ policy_group_manage=Policy Group Management
 ip_Reuse_policy=IP Reuse Policy
 target_ip_protectTarget IP Protect
 ratelimit_config=Ratelimit
-ip_ratelimit=IP Speed Limit
-domain_ratelimit=Domain Speed Limit
+ip_ratelimit=IP Ratelimit
+domain_ratelimit=Domain Ratelimit
 ratelimit=Limit Rate
 ir_type=Reuse type
 dns_strategy_id=DNS Policy ID
@@ -935,7 +935,7 @@ proxy_http_req_body_replace=HTTP Request Content Replacement
 proxy_http_res_body_replace=HTTP Response Content Replacement
 dns_fake_ip_reject=DNS Spoofing IP Control
 app_strategy_reject=APP Strategy Control
-app_strategy_ratelimit=APP Strategy Speed Limit
+app_strategy_ratelimit=APP Strategy Ratelimit
 proxy_ip_redirect=IP Redirect
 proxy_ip_forward=IP Forward
 app_protocol_ip_reject=APP Protocol IP Control
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index af2857327..442549211 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -100,7 +100,7 @@ $(function(){
 											<label class="control-label col-md-3">
 											<spring:message code="config_describe" /></label>
 											<div class="col-md-6">
-												<input class="form-control required" type="text"
+												<input class="form-control" type="text"
 													name="cfgDesc"
 													value="${_cfg.cfgDesc}">
 											</div>
@@ -154,7 +154,7 @@ $(function(){
 											<label class="control-label col-md-3"><font color="red">*</font>
 												<spring:message code="expression_type" /></label>
 											<div class="col-md-6">
-												<label class="radio-inline"> <input type="radio"
+												<label class="radio-inline hidden"> <input type="radio"
 													name="exprType" value="1"
 													class="required"
 													<c:if test="${_cfg.exprType==1}">checked</c:if>> <spring:message
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index e575f20ec..56d065618 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -83,7 +83,7 @@
 								</div>
 								
 								<div class="pull-left">
-									<c:set var="spec_service_id"><spring:message code="protocol_name"/></c:set>
+									<c:set var="spec_service_id"><spring:message code="social_app"/></c:set>
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index b2166547b..692a4da7e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -115,9 +115,9 @@ $(function(){
 						    </div>
                             <div class="col-md-6">
 						        <div class="form-group">
-						            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="config_describe"/></label>
+						            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
 						            <div class="col-md-6">
-						                <input class="required form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+						                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
 						            </div>
 						            <div for="cfgDesc"></div>
 						        </div>