diff --git a/src/main/java/com/nis/web/service/LogService.java b/src/main/java/com/nis/web/service/LogService.java
index 87216ef73..fd2e53d37 100644
--- a/src/main/java/com/nis/web/service/LogService.java
+++ b/src/main/java/com/nis/web/service/LogService.java
@@ -17,7 +17,11 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
 	public Page<SysLog> findPage(Page<SysLog> page, SysLog sysLog) {
 		// 设置默认时间范围，默认当前月
 		if (sysLog.getEndDate() == null){
-			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate()));
+			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate("yyyy-MM-dd HH:mm:ss")));
+		}else{
+			sysLog.setEndDate(DateUtils.setHours(sysLog.getEndDate(), 23));
+			sysLog.setEndDate(DateUtils.setMinutes(sysLog.getEndDate(), 59));
+			sysLog.setEndDate(DateUtils.setSeconds(sysLog.getEndDate(), 59));
 		}
 		if (sysLog.getBeginDate() == null){
 			sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
@@ -29,7 +33,11 @@ public class LogService extends CrudService<SysLogDao, SysLog> {
 	public Page<SysLog> findCfgOperationLogPage(Page<SysLog> page, SysLog sysLog) {
 		// 设置默认时间范围，默认当前月
 		if (sysLog.getEndDate() == null){
-			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate()));
+			sysLog.setEndDate(DateUtils.parseDate(DateUtils.getDate("yyyy-MM-dd HH:mm:ss")));
+		}else{
+			sysLog.setEndDate(DateUtils.setHours(sysLog.getEndDate(), 23));
+			sysLog.setEndDate(DateUtils.setMinutes(sysLog.getEndDate(), 59));
+			sysLog.setEndDate(DateUtils.setSeconds(sysLog.getEndDate(), 59));
 		}
 		if (sysLog.getBeginDate() == null){
 			sysLog.setBeginDate(DateUtils.addMonths(sysLog.getEndDate(), -1));
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp
index ac6105980..f8fdc572e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp
@@ -108,7 +108,6 @@ $(function(){
 								            <div class="col-md-6">
 								                <input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
 								            </div>
-										    <div for="cfgDesc"></div>
 								        </div>
 								    </div>
 								        <div class="col-md-6">
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 1c685233e..9d7605fd7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -97,7 +97,6 @@ $(function(){
 													name="cfgDesc"
 													value="${_cfg.cfgDesc}">
 											</div>
-											<div for="cfgDesc"></div>
 										</div>
 								   </div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 456ccd0e3..1bc39b110 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -96,7 +96,6 @@ $(function(){
 													name="cfgDesc"
 													value="${_cfg.cfgDesc}">
 											</div>
-											<div for="cfgDesc"></div>
 										</div>
 								   </div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
index c26c39196..9b781f404 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
@@ -118,7 +118,6 @@ $(function(){
 													name="cfgDesc"
 													value="${_cfg.cfgDesc}">
 											</div>
-											<div for="cfgDesc"></div>
 										</div>
 								   </div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index e59e5a297..34a981db4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -117,7 +117,6 @@ $(function(){
 													name="cfgDesc"
 													value="${_cfg.cfgDesc}">
 											</div>
-											<div for="cfgDesc"></div>
 										</div>
 								   </div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
index eac7569bc..946e7af20 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
@@ -125,7 +125,6 @@ function changeDistrict(obj){
 													name="cfgDesc"
 													value="${_cfg.cfgDesc}">
 											</div>
-											<div for="cfgDesc"></div>
 										</div>
 								   </div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
index 7ac3c5c5c..88a7fb0d3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
@@ -106,7 +106,6 @@ $(function(){
 													name="cfgDesc"
 													value="${_cfg.cfgDesc}">
 											</div>
-											<div for="cfgDesc"></div>
 										</div>
 								   </div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
index 6c133ecd1..90a523796 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
@@ -196,7 +196,6 @@ $(function(){
 													name="cfgDesc"
 													value="${_cfg.cfgDesc}">
 											</div>
-											<div for="cfgDesc"></div>
 										</div>
 								   </div>
 								</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index 0dc8f568f..e921f837c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -116,7 +116,6 @@ $(function(){
 						            <div class="col-md-6">
 						                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
 						            </div>
-						            <div for="cfgDesc"></div>
 						        </div>
 						    </div>
 						    <c:if test="${isContainFeaturesCfg}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
index bb53a079e..179c452dc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp
@@ -231,11 +231,10 @@ function privateFileValidate(){
 								<div class="row">
 								 <div class="col-md-6">
 								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="keyring_name"/></label>
+								            <label class="control-label col-md-3"><spring:message code="keyring_name"/></label>
 								            <div class="col-md-6">
-								                <input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
 								            </div>
-										    <div for="cfgDesc"></div>
 								        </div>
 								    </div>
 								 <div class="col-md-6">
@@ -249,8 +248,8 @@ function privateFileValidate(){
 													</c:forEach>
 													</select>
 								            </div>
-										    <div for="keyringType"></div>
 								        </div>
+								         <div for="keyringType"></div>
 								    </div>
 								   
 								</div>
@@ -280,6 +279,7 @@ function privateFileValidate(){
 											<div id="publicInfo"></div>
 											<div for="publicKeyFileInfo"></div>
 										</div>
+										<div for="publicKeyFileInfo"></div>
 									</div>
 									<div class="col-md-6">
 										<div class="form-group">
@@ -306,6 +306,7 @@ function privateFileValidate(){
 											&nbsp;&nbsp;<label ><i class='fa fa-info-circle'></i>&nbsp;<spring:message code='private_certificate'/></label>
 											<div for="privateKeyFileInfo"></div>
 										</div>
+										<div for="privateKeyFileInfo"></div>
 									</div>
 								</div>
 								<div class="row ">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp
index 8eb3e5b5f..4c874f623 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertForm.jsp
@@ -139,11 +139,10 @@ function certFileValidate(){
 								<div class="row">
 								 <div class="col-md-6">
 								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="cert_name"/></label>
+								            <label class="control-label col-md-3"><spring:message code="cert_name"/></label>
 								            <div class="col-md-6">
 								                <input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
 								            </div>
-										    <div for="cfgDesc"></div>
 								        </div>
 								    </div>
 								</div>
@@ -171,8 +170,8 @@ function certFileValidate(){
 												</div>
 											</div>
 											<div id="certInfo"></div>
-											<div for="certFileInfo"></div>
 										</div>
+										<div for="certFileInfo"></div>
 									</div>
 									<div class="col-md-6 <c:if test="${isAdd }">hidden</c:if>">
 									        <div class="form-group">
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
index fa60da3b1..0e28b3ec0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
@@ -116,11 +116,10 @@ $(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="policy_name"/></label>
+								            <label class="control-label col-md-3"><spring:message code="policy_name"/></label>
 								            <div class="col-md-6">
-								                <input class="form-control required" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
+								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
 								            </div>
-										    <div for="cfgDesc"></div>
 								        </div>
 								    </div>
 								    <div class="col-md-6">
@@ -135,9 +134,9 @@ $(function(){
 								            <div class="col-md-2">
 								                <input class="form-control required number"  placeholder="<spring:message code="ttl_unit" />" type="text" name="maxTtl" value="${_cfg.maxTtl}" min="0">
 								            </div>
-										    <div for="minTtl"></div>
-										    <div for="maxTtl"></div>
 								        </div>
+								        <div for="minTtl"></div>
+									    <div for="maxTtl"></div>
 								    </div>
 								    <div class="col-md-6 hidden">
 								        <div class="form-group">
@@ -177,8 +176,8 @@ $(function(){
 							              			</c:forEach>
 								                </select>
 								            </div>
-								            <div for="resGroup1Id"></div>
 								        </div>
+								        <div for="resGroup1Id"></div>
 								    </div>
 								    <div class="col-md-6">
 								        <div class="form-group">
@@ -186,8 +185,8 @@ $(function(){
 								            <div class="col-md-6">
 								                <input class="form-control number required" range=[1,128] type="text" name="resGroup1Num" value="${_cfg.resGroup1Num}">
 								            </div>
-										    <div for="resGroup1Num"></div>
 								        </div>
+								        <div for="resGroup1Num"></div>
 								    </div>
 								</div>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 3530888d2..78560ef63 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -30,6 +30,9 @@ $(function(){
 	
 	//增加描述新增时的文字长度限制
 	$("form input[name='cfgDesc']").attr("maxlength","128");
+	$("form input[name='cfgDesc']").addClass("required");
+	$("form input[name='cfgDesc']").parent().prev(".control-label").html("<font color='red'>*</font>"+$("form input[name='cfgDesc']").parent().prev(".control-label").text());
+	$("form input[name='cfgDesc']").parent().append("<div for='cfgDesc'></div>");
 	$("form  input[name$='cfgKeywords']").attr("maxlength","1024");
 	$("form  input[name$='cfgKeywords']").attr("minlength","4");
 	$("form  input[class~='domainCheck']").attr("maxlength","1024");