From 987da3fa8122f09b0b437b4a4059097915199d1b Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Thu, 9 Aug 2018 21:07:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E5=AF=BC=E8=87=B4=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=8C=89=E9=92=AE=E4=B8=8B=E6=B2=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specific/specificServiceHostCfgForm.jsp   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
index 7dfb4251e..89d3c70c1 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgForm.jsp
@@ -53,7 +53,7 @@ function selectP(){
 										form.submit();
 									},
 									errorContainer : "#messageBox",
-									errorPlacement : function(error, element) {
+									/* errorPlacement : function(error, element) {
 										$("#messageBox").text("<spring:message code='enter_error'/>");
 										if (element.is(":checkbox")
 												|| element.is(":radio")
@@ -64,6 +64,9 @@ function selectP(){
 										} else {
 											error.insertAfter(element);
 										}
+									} */
+									errorPlacement: function(error,element){
+										$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
 									}
 								});
 			});
@@ -109,28 +112,30 @@ function selectP(){
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='protocol_name' />:</label>
-												<c:set var="spec_service_id"></c:set>
+									            <c:set var="spec_service_id"></c:set>
 									           <div class="col-md-6">
 									            <sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
 												 labelName="parent.specServiceName" 
 												 labelValue="${empty specificServiceHostCfg.specServiceId?spec_service_id:fns:getBySpecServiceId(specificServiceHostCfg.specServiceId).specServiceName}"
 												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
 												 cssClass="form-control required"/>
+												<div for="parent.specServiceName"></div>
 												</div>
-
 										</div>
 										
 									</div>
+									
 									<div class="col-md-6">
 										<div class="form-group">
-											<label class="col-md-3 control-label"><spring:message code='direction' />:</label>
+											<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='direction' />:</label>
 											<div class="col-md-6">
-												<form:select path="direction" class="select2 form-control required" >
+												<form:select name="direction" path="direction" class="select2 form-control required" >
 												    <form:option value=""><spring:message code='select' /></form:option>
 													<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
 									                   <form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option>
 									                </c:forEach>
 												</form:select>
+												<div for="direction"></div>
 											</div>
 										</div>
 									</div>
@@ -141,12 +146,13 @@ function selectP(){
 										<div class="form-group">
 											<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='protocol' />:</label>
 											<div class="col-md-6">
-												<form:select path="protocol" class="select2 form-control required" >
+												<form:select name="protocol" path="protocol" class="select2 form-control required" >
 												    <form:option value=""><spring:message code='select' /></form:option>
 													<c:forEach items="${fns:getDictList('PROTOCOL')}" var="dict">
 									                   <form:option value="${dict.itemCode}"><spring:message code='${dict.itemValue}' /></form:option>
 									                </c:forEach>
 												</form:select>
+												<div for="protocol"></div>
 											</div>
 										</div>
 									</div>
@@ -186,6 +192,7 @@ function selectP(){
 											<label class="col-md-3 control-label"><font color="red">*</font><spring:message code='server_ip' />:</label>
 											<div class="col-md-6">
 												<form:input class="form-control required ipCheck" type="text" path="destIpAddress" />
+											<div for="destIpAddress"></div>
 											</div>
 										</div>
 									</div>
@@ -213,6 +220,7 @@ function selectP(){
 											<div class="col-md-6">
 												<form:input class="form-control required portCheck" type="text"
 													path="destPort" />
+											<div for="destPort"></div>
 											</div>
 										</div>
 									</div>

From 8fdc98f583efd0f6ea27b89bbea83f6639183b81 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Thu, 9 Aug 2018 21:27:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 00e1431a1..582d19ce3 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -222,7 +222,7 @@ task_time=Submitted Time
 #==========laihan end=====================
 
 #==========message begin=====================
-required=Can't be empty!
+required=This field is required
 select=Please Select
 date_list=Data List
 confirm_message=Confirm\uFF1F
@@ -689,7 +689,7 @@ client_locate=Client Locate
 user_region=User Region
 version=Version
 encrypt_mode=Encrypt Mode
-hmac=Is There Any HMAC
+hmac=Has HMAC
 tunnel_type=Tunnel Type
 log_total=Log Total Amount
 host_key=Host Key
@@ -725,12 +725,12 @@ contrl_message=Control Message
 data_message=Data Message
 user_name=User Name
 attack_type=Attack Type
-attack_start_time=Attack Start Time
+attack_start_time=Start Attack Time
 last_attack_time=Last Attack Time
-attack_max_pps=Attack Max Pps PKT/s
-attack_max_bps=Attack Max Bps Bit/s
-attack_total_pkt=Attack Total PKT
-attack_total_byte=Attack Total Byte
+attack_max_pps=Max Attack Pps PKT/S
+attack_max_bps=Max Attack Bps Bit/S
+attack_total_pkt=Total Attack PKT
+attack_total_byte=Total Attack Byte
 is_blcok=Is Blcok
 firstPage=First Page
 dk_behavior=Behavior
@@ -742,7 +742,7 @@ s2c_byte_num=S2cByteNum
 voip_recv_time=VoIP Receive Time
 voip_protocol=VoIP Protocol
 av_protocol=AV Protocol
-duation=Duation(s)
+duation=Duation(S)
 calling_account=Calling Account
 called_account=Called Account
 calling_number=Calling Number