1、proxy 增加 do_log

2、proxy 增加 subcribe id

src/main/java/com/nis/util/Constants.java

@@ -7,6 +7,8 @@ import java.util.Map;
 import com.google.gson.GsonBuilder;
 
 public final class Constants {
+	public static Integer APP_SPEC_SERVICE_CODE_MIN_VAL=Configurations.getIntProperty("app_spec_service_code_min_val", 300001);
+	public static Integer APP_SPEC_SERVICE_CODE_MAX_VAL=Configurations.getIntProperty("app_spec_service_code_max_val", 268435455);
 	public static String APP_CFG_USERREGION_SPLITOR=Configurations.getStringProperty("app_cfg_userregion_splitor", "&");
 	/**
 	 * MaatConfig 默认值
@@ -494,6 +496,7 @@ public final class Constants {
 	public static final String P2P_HASH_BIN_REGION = Configurations.getStringProperty("p2p_hash_bin_region","NTC_P2P_HASH_BIN"); 
 	public static final String P2P_KEYWORDS_REGION = Configurations.getStringProperty("p2p_keywords_region","NTC_P2P_KEYWORDS");
 	public static final String NTC_SUBSCRIBE_ID_REGION = Configurations.getStringProperty("ntc_subscribe_id_region","NTC_SUBSCRIBE_ID");
+	public static final String PXY_CRTL_SUBSCRIBE_ID_REGION = Configurations.getStringProperty("pxy_crtl_subscribe_id_region","PXY_CRTL_SUBSCRIBE_ID");
 	/**
 	 * 样例文件URL关键字
 	 */

src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java

@@ -24,11 +24,14 @@ import com.nis.domain.configuration.HttpReqHeadCfg;
 import com.nis.domain.configuration.HttpResHeadCfg;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
 
+import jersey.repackaged.com.google.common.collect.Lists;
+
 /**
  * http重定向策略
  * @author zhangwei
@@ -78,6 +81,9 @@ public class HttpRedirectPolicyController extends BaseController{
 			IpPortCfg ipPortCfg = new IpPortCfg();
 			ipPortCfg.setCfgType(Constants.HTTP_REDIRECT_IP_REGION);
 			entity.setIpPort(ipPortCfg);
+			NtcSubscribeIdCfg subscribeIdCfg = new NtcSubscribeIdCfg();
+			subscribeIdCfg.setCfgType(Constants.PXY_CRTL_SUBSCRIBE_ID_REGION);
+			entity.setNtcSubscribeIdCfg(subscribeIdCfg);
 			
 			if(entity.getHttpUrlList().size()==0){
 				entity.getHttpUrlList().add(urlCfg);
@@ -97,6 +103,9 @@ public class HttpRedirectPolicyController extends BaseController{
 			if(entity.getIpPortList().size()==0){
 				entity.getIpPortList().add(ipPortCfg);
 			}
+			if(entity.getNtcSubscribeIdCfgList().size()==0){
+				entity.getNtcSubscribeIdCfgList().add(subscribeIdCfg);
+			}
 			initUpdateFormCondition(model,entity);
 		}else{
 			//设置http各类配置的配置域类型
@@ -118,6 +127,10 @@ public class HttpRedirectPolicyController extends BaseController{
 			IpPortCfg ipPortCfg = new IpPortCfg();
 			ipPortCfg.setCfgType(Constants.HTTP_IP_REGION);
 			entity.setIpPort(ipPortCfg);
+			//subscribeId
+			NtcSubscribeIdCfg subscribeIdCfg = new NtcSubscribeIdCfg();
+			subscribeIdCfg.setCfgType(Constants.PXY_CRTL_SUBSCRIBE_ID_REGION);
+			entity.setNtcSubscribeIdCfg(subscribeIdCfg);
 			
 			List<HttpUrlCfg> urlList=new ArrayList<HttpUrlCfg>();
 			urlList.add(urlCfg);
@@ -138,6 +151,11 @@ public class HttpRedirectPolicyController extends BaseController{
 			List<IpPortCfg> ipPortList=new ArrayList<IpPortCfg>();
 			ipPortList.add(ipPortCfg);
 			entity.setIpPortList(ipPortList);
+			
+			List<NtcSubscribeIdCfg> subscribeCfgList = Lists.newArrayList();
+			subscribeCfgList.add(subscribeIdCfg);
+			entity.setNtcSubscribeIdCfgList(subscribeCfgList);
+			
 			initFormCondition(model,entity);
 		}
 		//获取所有的响应文件内容，阻断，或重定向时可以选择

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

@@ -705,14 +705,14 @@
   			<if test="compileId != null">
   				and r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	   		</if>
-	   		<choose>
+	   		<!-- <choose>
 				<when test="isValid != null">
 					and r.is_valid=#{isValid,jdbcType=INTEGER}
 				</when>
 				<otherwise>
 					and r.is_valid != -1
 				</otherwise>
-			</choose>
+			</choose> -->
   		</where>
 		
   </select>

src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java

@@ -1,56 +1,37 @@
 package com.nis.web.service.configuration;
 
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 
 import com.nis.domain.Page;
 import com.nis.domain.configuration.AreaIpCfg;
-import com.nis.domain.configuration.AvFileSampleCfg;
-import com.nis.domain.configuration.AvSignSampleCfg;
-import com.nis.domain.configuration.BaseIpCfg;
-import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.ComplexkeywordCfg;
-import com.nis.domain.configuration.DnsDomainCfg;
 import com.nis.domain.configuration.HttpBodyCfg;
 import com.nis.domain.configuration.HttpReqHeadCfg;
 import com.nis.domain.configuration.HttpResHeadCfg;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
-import com.nis.domain.configuration.SslKeywordCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.maat.MaatCfg;
-import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
-import com.nis.domain.maat.ToMaatBean;
-import com.nis.domain.maat.ToMaatResult;
 import com.nis.domain.maat.MaatCfg.DigestCfg;
 import com.nis.domain.maat.MaatCfg.GroupCfg;
 import com.nis.domain.maat.MaatCfg.IpCfg;
+import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
 import com.nis.domain.maat.MaatCfg.StringCfg;
+import com.nis.domain.maat.ToMaatBean;
+import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
-import com.nis.util.DictUtils;
-import com.nis.util.IpUtil;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
-import com.nis.web.dao.configuration.IpCfgDao;
 import com.nis.web.dao.configuration.StringCfgDao;
 import com.nis.web.dao.configuration.WebsiteCfgDao;
 import com.nis.web.security.UserUtils;
@@ -68,6 +49,8 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 	protected WebsiteCfgDao websiteCfgDao;
 	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
+	@Autowired
+	protected StringCfgDao stringCfgDao;
 	
 	public CfgIndexInfo getHttpCfg(Long cfgId){
 		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
@@ -79,12 +62,14 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 		List<HttpBodyCfg> httpReqBodyList = websiteCfgDao.getHttpReqBodyList(entity);
 		entity.setCfgType(Constants.HTTP_REDIRECT_RES_BODY_REGION);
 		List<HttpBodyCfg> httpResBodyList = websiteCfgDao.getHttpResBodyList(entity);
+		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
 		entity.setHttpReqBodyList(httpReqBodyList);
 		entity.setHttpReqHdrList(httpReqHdrList);
 		entity.setHttpResBodyList(httpResBodyList);
 		entity.setHttpResHdrList(httpResHdrList);
 		entity.setHttpUrlList(httpUrlList);
 		entity.setIpPortList(ipPortCfgList);
+		entity.setNtcSubscribeIdCfgList(subscribeIdList);
 		return entity;
 	}
 	
@@ -152,6 +137,12 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 						websiteCfgDao.saveIpPortCfg(cfg);
 					}
 				}
+				if(entity.getNtcSubscribeIdCfgList()!=null){
+					for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						stringCfgDao.saveSubscribeIdCfg(cfg);
+					}
+				}
 				//保存区域IP信息
 				if(entity.getAreaCfg()!=null){
 					for(AreaIpCfg cfg:entity.getAreaCfg()){
@@ -167,6 +158,8 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			}
 			
 		}else{
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
 			websiteCfgDao.updateCfgIndex(entity);
 			//无效子配置后，再新增子配置
 			websiteCfgDao.deleteHttpUrlCfg(entity);
@@ -174,6 +167,8 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			websiteCfgDao.deleteHttpResHdrCfg(entity);
 			websiteCfgDao.deleteHttpBodyCfg(entity);
 			websiteCfgDao.deleteHttpIpCfg(entity);
+			stringCfgDao.deleteSubscribeIdCfgByCfgIndexInfo(entity);
+
 			AreaIpCfg area = new AreaIpCfg();
 			area.setCompileId(entity.getCompileId());
 			area.setFunctionId(entity.getFunctionId());
@@ -222,6 +217,12 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 					websiteCfgDao.saveIpPortCfg(cfg);
 				}
 			}
+			if(entity.getNtcSubscribeIdCfgList()!=null){
+				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					stringCfgDao.saveSubscribeIdCfg(cfg);
+				}
+			}
 			//保存区域IP信息
 			if(entity.getAreaCfg()!=null){
 				for(AreaIpCfg cfg:entity.getAreaCfg()){
@@ -277,6 +278,12 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 				cfg.setTableName(HttpBodyCfg.getTablename());
 				websiteCfgDao.updateCfgValid(cfg);
 			}
+			if((entity.getNtcSubscribeIdCfgList()!=null && entity.getNtcSubscribeIdCfgList().size()>0)){
+				NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(NtcSubscribeIdCfg.getTablename());
+				websiteCfgDao.updateCfgValid(cfg);
+			}
 			//保存区域IP信息
 			if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
 				AreaIpCfg cfg = new AreaIpCfg();
@@ -372,6 +379,19 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 				}
 			}
 		}
+		
+		if(entity.getNtcSubscribeIdCfgList()!=null && entity.getNtcSubscribeIdCfgList().size()>0){
+			NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+			cfg.setTableName(NtcSubscribeIdCfg.getTablename());
+			websiteCfgDao.auditCfg(cfg);
+			if(isAudit==1){
+				Map<String,List> map = cfgConvert(strRegionList,entity.getNtcSubscribeIdCfgList(),2,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				strRegionList=map.get("dstList");
+			}
+		}
+		
 		//保存区域IP信息
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		if(!StringUtil.isEmpty(areaIpCfgList)){

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

@@ -195,6 +195,31 @@
 										</div>
 									</div>
 								</div>
+								<c:if test="${action != 128 }">
+									<!-- 记录日志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:choose>
+																<c:when test="${dict.itemCode eq _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:forEach>
+											</div>
+										</div>
+									</div>
+									<!-- 记录日志end -->
+								</c:if>
 								<%@include file="/WEB-INF/views/cfg/actionRegionForm.jsp"%>
 								<br>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
@@ -289,6 +314,26 @@
 												</c:forEach>
 											</div>
 										</c:if>
+										<c:if test="${region.configRegionValue eq _cfg.ntcSubscribeIdCfg.cfgType }">
+											<!--response body info-->
+											<div class="ntcSubscribeIdCfgCfg">
+												<c:set var="tabName" value="ntcSubscribeIdCfgTab"></c:set>
+												<h4 class="form-section">
+													<spring:message code="NTC_SUBSCRIBE_ID" />
+													<small> <span
+														class="glyphicon glyphicon-plus ${tabName}Add"
+														onClick="addContent(this,'${tabName}')" title="add"></span></small>
+												</h4>
+												
+												<%-- <c:set var="regionValue" value="${_cfg.httpResBody.cfgType}"></c:set> --%>
+												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg" varStatus="status">
+													<c:set var="cfgName" value="ntcSubscribeIdCfgList[${status.index}]"></c:set>
+													<div class="row boxSolid ${tabName}${status.index} <c:if test="${empty cfg.cfgId}">hidden disabled </c:if>" >
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+												</c:forEach>
+											</div>
+										</c:if>
 									</c:if>
 									<c:if test="${region.regionType eq 3 }">
 										<c:if test="${region.configRegionValue eq _cfg.httpReqHdr.cfgType }">

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

@@ -516,7 +516,9 @@
 										<th><spring:message code="replaced_content"/></th>
 										<th><spring:message code="replace_content"/></th>
 									</c:if>
-									
+									<c:if test="${action ne 128}">
+										<th><spring:message code="do_log"/></th>
+									</c:if>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -601,7 +603,15 @@
 										<td>${indexCfg.userRegion2 }</td>
 										<td>${indexCfg.userRegion3 }</td>
 									</c:if>
-									
+									<c:if test="${action ne 128}">
+										<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>
+									</c:if>
 									<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/proxy/control/httpRedirectSubList.jsp

@@ -53,6 +53,14 @@
 		<i id="resBody${index}" class="fa" name="tabFlag${index}"></i>
 	</div>
 </c:if>
+<c:if test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
+	<div id="subscribeIdTitle${index}" onclick="switchSubCfgTabInfo('subscribeId',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+		<spring:message code='NTC_SUBSCRIBE_ID' />
+		<i id="resBody${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:if>
+</div>
 </div>
 
 <c:forEach items="${_cfg.ipPortList}" var="cfg">
@@ -406,5 +414,53 @@
 	</div>
 
 </c:forEach>
+<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+<div id="subscribeIdInfo${index}" class="content" name="subCfg${index}">
+	<div class="row">
+		<div class="col-md-8">
+			<div class="form-group">
+				<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+			</div>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-md-4">
+			<div class="form-group">
+				<label><spring:message code='expression_type' />:</label>
+				<label>
+					<c:choose>
+						<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+						<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+					</c:choose>
+				</label>
+			</div>
+		</div>
+		</div>
+		<div class="row">
+		<div class="col-md-4">
+			<div class="form-group">
+				<label><spring:message code='match_method' />:</label>
+				<label>
+					<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+						<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+					</c:forEach>
+				</label>
+			</div>
+		</div>
+		</div>
+		<div class="row">
+		<div class="col-md-4">
+			<div class="form-group">
+				<label><spring:message code='whether_hexbinary' />:</label>
+				<label>
+					<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+						<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
+					</c:forEach>
+				</label>
+			</div>
+		</div>
+	</div>
+	</div>
 
+</c:forEach>
 </html>