1.增加do_log字典属性2.cfg_index_info增加do_log字段更新sql文件

3.VoIP IP跟account增加do_log是否显示日志

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -196,6 +196,18 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 */
 	protected Integer functionId;
 	
+	/**
+	 * do_log属性在界面（do_log:0不需要1记录所有日志2只记录结构化日志。默认是2）
+	 */
+	protected Integer doLog;
+	
+	
+	public Integer getDoLog() {
+		return doLog;
+	}
+	public void setDoLog(Integer doLog) {
+		this.doLog = doLog;
+	}
 	/**
 	 * cfgRegionCode
 	 * @return  cfgRegionCode

src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml

@@ -23,6 +23,7 @@
     <result column="lable" property="lable" jdbcType="VARCHAR" />
     <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="AvVoipIpCfgMap" type="com.nis.domain.configuration.AvVoipIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -157,7 +158,7 @@
     r.CFG_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
     r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
-    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id
+    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.do_log
   </sql>
   <sql id="AvVoipIp_Column" >
     r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
@@ -545,7 +546,8 @@
     ATTRIBUTE,
     LABLE,
     AREA_EFFECTIVE_IDS,
-    function_id
+    function_id,
+    do_log
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -565,7 +567,8 @@
     	#{attribute,jdbcType=VARCHAR},
     	#{lable,jdbcType=VARCHAR},    
    	 	#{areaEffectiveIds,jdbcType=VARCHAR},
-    	#{functionId,jdbcType=INTEGER}
+    	#{functionId,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
     )
   </insert>
   <!-- insert AV_VOIP_IP_CFG表信息 -->
@@ -804,6 +807,9 @@
       <if test="serviceId != null" >
         service_id =  #{serviceId,jdbcType=INTEGER},
       </if>
+      <if test="doLog != null" >
+        do_log =  #{doLog,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     <where>

src/main/resources/messages/message_en.properties

@@ -617,7 +617,7 @@ val_dst_ip=Server IP format is incorrect or inconsistent with IP type
 val_dst_mask=Server IP mask format is incorrect or inconsistent with IP type
 val_dst_port=Server port is empty or incorrectly formatting(0-65535)
 val_dst_port_mask=Server port mask format is incorrect(0-65535)
-val_protocol=Protocol Can't be empty,and should be 6(TCP),17(UDP),0(\u4efb\u610f)
+val_protocol=Protocol Can't be empty,and should be 6(TCP),17(UDP),0(\u4EFB\u610F)
 val_direction=Direction should be 0(bidirectional) or 1(unidirectional)
 #===============protocol IP Import end=================
 
@@ -1077,7 +1077,9 @@ domain_intercepter_replace=Domain Intercept Replace
 ip_intercepter_ratelimit=IP Intercept Ratelimit
 domain_intercepter_ratelimit=Domain Intercept Ratelimit
 app_built_in_features_config=APP Built-in Features
-app_ssl_config=APP SSL Cert Feature
 PXY_INTERCEPT_PKT_BIN=Intercept Messages
 certificate=Certificate
-app_ssl_config=APP SSL Cert Feature
+do_log=Do Log
+no_log=Not Do Log
+all_log=Log All Logs
+framework_log=Only Framework Logs

src/main/resources/messages/message_zh_CN.properties

@@ -1075,6 +1075,9 @@ domain_intercepter_replace=\u57DF\u540D\u62E6\u622A\u66FF\u6362
 ip_intercepter_ratelimit=IP\u62E6\u622A\u9650\u901F
 domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F
 app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4
-app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81
 PXY_INTERCEPT_PKT_BIN=\u62E6\u622A\u62A5\u6587
 certificate=\u8BC1\u4E66
+do_log=\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7
+no_log=\u4E0D\u8BB0\u5F55
+all_log=\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7
+framework_log=\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7

src/main/resources/sql/update_cfg_index_info-20180820.sql

@@ -0,0 +1 @@
+alter table task_info add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'

src/main/resources/sql/字典修改记录.txt

@@ -2,4 +2,11 @@
 \u4FEE\u6539\u5B57\u5178LOG_STREAM_TYPE\uFF0C\u5C06\u6807\u8BC60\u30011\u30012\u6539\u4E3A1\u30012\u30013
 
 2018-08-03
-\u589E\u52A0\u5B57\u5178ATTACK_TYPE\uFF0C\u4F9D\u636E\u534F\u8BAE\u7EDF\u8BA1\u5DF2\u6709\u7C7B\u578B \uFF1AUDP-Flood: 1069 \uFF0CSYN-Flood: 1070
+\u589E\u52A0\u5B57\u5178ATTACK_TYPE\uFF0C\u4F9D\u636E\u534F\u8BAE\u7EDF\u8BA1\u5DF2\u6709\u7C7B\u578B \uFF1AUDP-Flood: 1069 \uFF0CSYN-Flood: 1070
+
+2018-08-20\uFF08do_log:0\u4E0D\u9700\u89811\u8BB0\u5F55\u6240\u6709\u65E5\u5FD72\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7\u3002\u9ED8\u8BA4\u662F2\uFF09
+\u65B0\u589E\u662F\u5426\u8BB0\u5F55\u65E5\u5FD7 DO_LOG	
+\u6807\u8BC6	\u503C	describe	\u662F\u5426\u53EF\u7528	\u662F\u5426\u53EF\u7EF4\u62A4
+0	no_log	\u4E0D\u8BB0\u5F55\u65E5\u5FD7	\u662F	\u662F
+1	all_log	\u8BB0\u5F55\u6240\u6709\u65E5\u5FD7	\u662F	\u662F
+2	framework_log	\u53EA\u8BB0\u5F55\u7ED3\u6784\u5316\u65E5\u5FD7

src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp

@@ -152,8 +152,6 @@
 								value="${_cfg.serviceId}">
 
 							<div class="form-body">
-
-
 								<div class="row">
 									<div class="col-md-6">
 										<div class="form-group">
@@ -192,6 +190,47 @@
 										</div>
 									</div>
 								</div>
+								<!-- dolog begin-->
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+														<!-- 新增 -->
+													<c:if test="${empty _cfg.cfgId}">
+														<c:choose>
+															<c:when test="${dict.itemValue eq 'framework_log'}">
+																<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													</c:if>
+													<!-- 修改 -->
+													<c:if test="${!empty _cfg.cfgId}">
+													<c:choose>
+														<c:when test="${dict.itemCode == _cfg.doLog}">
+															<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
+													</c:if>
+											</c:forEach>
+										</div>
+									</div>
+								</div>
+								<!-- dolog end-->
 								<c:set var="accountCfgIndex" value="0"></c:set>
 								<c:set var="strCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">

src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp

@@ -535,6 +535,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -566,6 +567,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp

@@ -165,37 +165,74 @@
 											</div>
 										</div>
 									</div>
+									<!-- 动作 -->
 									<div class="col-md-6">
 										<div class="form-group">
-											<label class="control-label col-md-3"><spring:message
+											<label class="control-label col-md-3"><spring:message code="action" /></label>
-													code="action" /></label>
 											<div class="col-md-6">
 												<c:forEach items="${serviceList}" var="service"
 													varStatus="satus">
-													<label class="radio-inline"> <c:if
+													<label class="radio-inline"> <c:if test="${_cfg.functionId eq service.functionId}">
-															test="${_cfg.functionId eq service.functionId}">
+														<input type="radio" name="action" serviceId="${service.serviceId }"
-															<input type="radio" name="action"
-																serviceId="${service.serviceId }"
 																protocolId="${service.protocolId }"
 																value="${service.action }" class="required action"
 																<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
 																<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-																	<c:if test="${dict.itemCode eq service.action }">
+																<c:if test="${dict.itemCode eq service.action }">
 																		<spring:message code="${dict.itemValue }"/>
-																	</c:if>
+																</c:if>
-																</c:forEach>
+															</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
 											</div>
 											<div for="action"></div>
-											
+										</div>
-											
+									</div>
-											
+									
-											
+								</div>
+							<!-- dolog begin-->
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+														<!-- 新增 -->
+													<c:if test="${empty _cfg.cfgId}">
+														<c:choose>
+															<c:when test="${dict.itemValue eq 'framework_log'}">
+																<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													</c:if>
+													<!-- 修改 -->
+													<c:if test="${!empty _cfg.cfgId}">
+													<c:choose>
+														<c:when test="${dict.itemCode == _cfg.doLog}">
+															<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:when>
+														<c:otherwise>
+															<label class="radio-inline">
+																<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+															</label>
+														</c:otherwise>
+													</c:choose>
+													</c:if>
+											</c:forEach>
 										</div>
 									</div>
 								</div>
+								<!-- dolog end-->
+								
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="strCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -602,6 +602,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -633,6 +634,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">