diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 5befecc38..f43e8953f 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -391,6 +391,7 @@ protocol_code=Protocol No
 protocol_name=Protocol Name
 group_id=Configuration Group ID
 input_protocol_id=Please enter protocol ID
+input_protocol_name=Please enter protocol name
 input_integer=Please enter correct Number
 protocol_desc=Protocol Description
 max_value=The maximum value should not be greater than
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 00f4d9408..84520f86f 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -391,6 +391,7 @@ protocol_code=\u534F\u8BAE\u53F7
 protocol_name=\u534F\u8BAE\u540D\u79F0
 group_id=\u914D\u7F6E\u5206\u7EC4ID
 input_protocol_id=\u8BF7\u8F93\u5165\u534F\u8BAEID
+input_protocol_name=\u8BF7\u8F93\u5165\u534F\u8BAE\u540D\u79F0
 input_integer=\u8BF7\u8F93\u5165\u6B63\u786E\u7684\u6574\u6570\u503C
 protocol_desc=\u534F\u8BAE\u63CF\u8FF0
 max_value=\u6700\u5927\u503C\u4E0D\u5F97\u8D85\u8FC7
diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index b641b49ba..8fdf0d777 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -47,7 +47,7 @@
 		// 正常打开	
 		top.$.jBox.open("iframe:${ctx}/tag/treeselect?url="+encodeURIComponent("${url}")+"&selectIds="+$("#${id}Id").val()+"&module=${module}&checked=${checked}&extId=${extId}&isAll=${isAll}", "<spring:message code='choose'/> <spring:message code='${title}'/>", 320, 420, {
 			ajaxData:{selectIds: $("#${id}Id").val()},buttons:{"<spring:message code='ok'/>":"ok", "<spring:message code='clear'/>":"clear","<spring:message code='close'/>":true}, submit:function(v, h, f){
-				if (v=="ok"){
+				if (v == "ok"){
 					var tree = h.find("iframe")[0].contentWindow.tree;//h.find("iframe").contents();
 					var ids = [], names = [], nodes = [],types =[];
 					if ("${checked}" == "true"){
@@ -114,13 +114,12 @@
 					}
 					$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
 					$("#${id}Name").val(names.join(","));
-				}//<c:if test="${allowClear}">
-				else if (v=="clear"){
+				}else if (v == "clear"){
 					$("#${id}Id").val("");
 					$("#${id}Id").removeAttr('cfgtype');
 					$("#${id}Id").change();//手动触发change事件，使Id的值得变化可以被监听到
 					$("#${id}Name").val("");
-                }//</c:if>
+                }
 				if(typeof ${id}TreeselectCallBack == 'function'){
 					${id}TreeselectCallBack(v, h, f);
 				}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 3632484cb..8544e0ca6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -228,7 +228,13 @@
 											<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<td>${log.deviceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.deviceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
 													<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 1d73f8cee..f210ab613 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -240,7 +240,13 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-								<%--<td>${log.deviceId}</td>
+								<%--<td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
+												<c:if test="${dict.itemCode eq log.deviceId}">
+													<spring:message code="${dict.itemValue}"/>
+												</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index ca4ffd013..210d9822f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -240,7 +240,13 @@ $(document).ready(function(){
 									<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<%-- <td>${log.deviceId}</td>
+									<%-- <td>
+										<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.deviceId}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 058fb42c8..e3502ae60 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -300,7 +300,13 @@
 											<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<%-- <td>${log.deviceId}</td>
+											<%-- <td>
+												<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.deviceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 886f15d95..0d28fcae0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -238,7 +238,13 @@ $(document).ready(function(){
 											<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<%-- <td>${log.deviceId}</td>
+											<%-- <td>
+												<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.deviceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 71f44cae6..bddd18c16 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -240,7 +240,13 @@ $(document).ready(function(){
 											<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<%-- <td>${log.deviceId}</td>
+											<%-- <td>
+												<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.deviceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index f807c33e6..7c2284d31 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -224,7 +224,13 @@
 											<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<td>${log.deviceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.deviceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
 													<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index 8565eb683..0c315899c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -52,7 +52,7 @@
 								<div class="col-md-12">
 									<div class="pull-left">
 										<form:select path="action" class="selectpicker select2 input-small">
-											<form:option value="" ><spring:message code="action"/></form:option>
+											<form:option value="" disabled="disabled" ><spring:message code="action"/></form:option>
 											<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
 												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
 													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
@@ -195,7 +195,7 @@
 								<tbody>
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
-											<td>${log.cfgId}
+											<td>${log.cfgId}9999999999
 												<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 											</td>
 											<td>
@@ -230,7 +230,13 @@
 											<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<td>${log.deviceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('DEVICE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.deviceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
 													<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index dd4de147d..ca7a1f5c4 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -172,7 +172,7 @@
 													<option value="specServiceName"><spring:message code="protocol_name"/></option>
 												</select>
                                             </div>
-                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input'/><spring:message code='protocol_name'/>" type="text" onchange="casec()" maxlength="60">
+                                            <input id="intype" class="form-control input-medium" placeholder="<spring:message code='input_protocol_name'/>" type="text" onchange="casec()" maxlength="60">
                                     
                                             
                                         </div>