Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp

@@ -220,6 +220,9 @@
 									</div>
 									<!-- 记录日志end -->
 								</c:if>
+								<c:if test="${action eq 128}"><!-- 白名单不记录日志，默认为：0 -->
+									<input type="hidden" name="dolog" value="0"/>
+								</c:if>
 								<%@include file="/WEB-INF/views/cfg/actionRegionForm.jsp"%>
 								<br>
 								<c:forEach items="${regionList}" var="region" varStatus="status">