Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties

src/main/java/com/nis/web/controller/BaseController.java

@@ -52,6 +52,7 @@ import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.DictUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
 import com.nis.web.service.ArchiveServcie;
 import com.nis.web.service.AreaService;
@@ -637,11 +638,12 @@ public class BaseController {
 		}
 	}
 	
-	public void setLogAction(BaseLogEntity log) {
-		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
-		for (FunctionServiceDict dict : serviceList) {
-			if (dict.getServiceId().intValue() == log.getService()) {
-				log.setAction(dict.getAction());
+	public void setLogAction(BaseLogEntity log,List<FunctionServiceDict> serviceList) {
+		if(!StringUtil.isEmpty(serviceList)){
+			for (FunctionServiceDict dict : serviceList) {
+				if (dict.getServiceId().intValue() == log.getService()) {
+					log.setAction(dict.getAction());
+				}
 			}
 		}
 	}
@@ -727,14 +729,12 @@ public class BaseController {
 			StringBuffer errInfo=new StringBuffer();
 			// ip_type check start
 			Integer ipType=value.getIpType();
-			String ipTypeString=null;
 			if(ipType==null){
 				errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("ip_type"))+";");
 			}else{
 				boolean has=false;
 				for(SysDataDictionaryItem ipTypeItem:ipTypeList){
 					if(ipType==Integer.parseInt(ipTypeItem.getItemCode())){
-						ipTypeString=ipTypeItem.getItemValue();
 						has=true;
 						break;
 					}
@@ -746,14 +746,12 @@ public class BaseController {
 			// ip_type check end
 			// ip_pattern check start
 			Integer ipPattern=value.getIpPattern();
-			String ipPatternString=null;
 			if(ipPattern==null){
 				errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("ip_pattern"))+";");
 			}else{
 				boolean has=false;
 				for(SysDataDictionaryItem ipPatternItem:ipPatternList){
 					if(ipPattern==Integer.parseInt(ipPatternItem.getItemCode())){
-						ipPatternString=ipPatternItem.getItemValue();
 						has=true;
 						break;
 					}
@@ -767,9 +765,9 @@ public class BaseController {
 			String srcIp=value.getSrcIpAddress();
 			String _msg="";
 			if("ipmulitiplex".equals(specialItem)) {
-				_msg=checkIP(prop,prop.getProperty("IP"),srcIp,ipTypeString,ipPatternString);
+				_msg=checkIP(prop,prop.getProperty("IP"),srcIp,ipType,ipPattern);
 			}else {
-				_msg=checkIP(prop,prop.getProperty("client_ip"),srcIp,ipTypeString,ipPatternString);
+				_msg=checkIP(prop,prop.getProperty("client_ip"),srcIp,ipType,ipPattern);
 			}
 			if(StringUtils.isNotBlank(_msg)){
 				errInfo.append(_msg);
@@ -779,40 +777,40 @@ public class BaseController {
 			String destIp=value.getDestIpAddress();
 			if("ipmulitiplex".equals(specialItem)) {//set 默认值
 				if(ipPattern!=null&&ipType!=null) {
-					if("ip_subnet".equals(ipPatternString)) {
-						if("ipv4".equals(ipTypeString)) {
+					if(1==ipPattern.intValue()) {
+						if(4==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE);
-						}else if("ipv6".equals(ipTypeString)) {
+						}else if(6==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE);
-						}else if("4over6".equals(ipTypeString)) {
+						}else if(46==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE);
-						}else if("6over4".equals(ipTypeString)) {
+						}else if(64==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE);
-						}else if("all".equals(ipTypeString)) {
+						}else if(10==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE);
 						}
-					}else if("ip_range".equals(ipPatternString)) {
-						if("ipv4".equals(ipTypeString)) {
+					}else if(2==ipPattern.intValue()) {
+						if(4==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE);
-						}else if("ipv6".equals(ipTypeString)) {
+						}else if(6==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE);
-						}else if("4over6".equals(ipTypeString)) {
+						}else if(46==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE);
-						}else if("6over4".equals(ipTypeString)) {
+						}else if(64==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE);
-						}else if("all".equals(ipTypeString)) {
+						}else if(10==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE);
 						}
-					}else if("ip".equals(ipPatternString)) {
-						if("ipv4".equals(ipTypeString)) {
+					}else if(3==ipPattern.intValue()) {
+						if(4==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_VALUE);
-						}else if("ipv6".equals(ipTypeString)) {
+						}else if(6==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV6_DEFAULT_IP_VALUE);
-						}else if("4over6".equals(ipTypeString)) {
+						}else if(46==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV6_DEFAULT_IP_VALUE);
-						}else if("6over4".equals(ipTypeString)) {
+						}else if(64==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_VALUE);
-						}else if("all".equals(ipTypeString)) {
+						}else if(10==ipType.intValue()) {
 							value.setDestIpAddress(Constants.IPV4_DEFAULT_IP_VALUE);
 						}
 					}
@@ -822,13 +820,13 @@ public class BaseController {
 					String info=String.format(prop.getProperty("are_the_same"),prop.getProperty("client_ip"),prop.getProperty("server_ip"));
 					errInfo.append(info+";");
 				}
-				_msg=checkIP(prop,prop.getProperty("server_ip"),destIp,ipTypeString,ipPatternString);
+				_msg=checkIP(prop,prop.getProperty("server_ip"),destIp,ipType,ipPattern);
 				if(StringUtils.isNotBlank(_msg)){
 					errInfo.append(_msg);
 				}
 			}
-			if(!"ipmulitiplex".equals(specialItem)&&("4over6".equals(ipTypeString)||"6over4".equals(ipTypeString)||"all".equals(ipTypeString))) {
-				_msg=checkIp(prop, prop.getProperty("client_ip"), srcIp, prop.getProperty("server_ip"), destIp, ipTypeString, ipPatternString);
+			if(!"ipmulitiplex".equals(specialItem)&&(46==ipType.intValue()||64==ipType.intValue()||10==ipType.intValue())) {
+				_msg=checkIp(prop, prop.getProperty("client_ip"), srcIp, prop.getProperty("server_ip"), destIp, ipType, ipPattern);
 				if(StringUtils.isNotBlank(_msg)){
 					errInfo.append(_msg);
 				}
@@ -836,14 +834,12 @@ public class BaseController {
 			//server_ip check end
 			//port_pattern check start
 			Integer portPattern=value.getPortPattern();
-			String portPatternString=null;
 			if(portPattern==null){
 				errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("port_pattern"))+";");
 			}else{
 				boolean has=false;
 				for(SysDataDictionaryItem portPatternItem:portPatternList){
 					if(portPattern==Integer.parseInt(portPatternItem.getItemCode())){
-						portPatternString=portPatternItem.getItemValue();
 						has=true;
 						break;
 					}
@@ -856,9 +852,9 @@ public class BaseController {
 			//src_port check start
 			String srcPort=value.getSrcPort();
 			if("ipmulitiplex".equals(specialItem)) {
-				_msg=checkPort(prop,prop.getProperty("port"), srcPort, portPatternString);
+				_msg=checkPort(prop,prop.getProperty("port"), srcPort, portPattern);
 			}else {
-				_msg=checkPort(prop,prop.getProperty("client_port"), srcPort, portPatternString);
+				_msg=checkPort(prop,prop.getProperty("client_port"), srcPort, portPattern);
 			}
 			
 			if(StringUtils.isNotBlank(_msg)){
@@ -869,14 +865,14 @@ public class BaseController {
 			String destPort=value.getDestPort();
 			if("ipmulitiplex".equals(specialItem)) {//set 默认值
 				if(portPattern!=null) {
-					if("port_mask".equals(portPatternString)) {
+					if(2==portPattern.intValue()) {
 						value.setDestPort(Constants.PORT_MASK_DEFAULT);
-					}else if("port".equals(portPatternString)) {
+					}else if(1==portPattern.intValue()) {
 						value.setDestPort(Constants.PORT_DEFAULT);
 					}
 				}
 			}else {
-				_msg=checkPort(prop,prop.getProperty("server_port"), destPort, portPatternString);
+				_msg=checkPort(prop,prop.getProperty("server_port"), destPort, portPattern);
 			}
 			if(StringUtils.isNotBlank(_msg)){
 				errInfo.append(_msg);
@@ -1147,10 +1143,72 @@ public class BaseController {
 		}
 		return msg.toString();
 	}
-	public static String checkIp(Properties prop,String srcIpName,String srcIp,String destIpName,String destIp,String ipType,String ipPattern) {
+	/**
+	 * 
+	 * checkIP(IP格式验证)
+	 * (这里描述这个方法适用条件 – 可选)
+	 * @param ipName
+	 * @param ip
+	 * @param ipType
+	 * @param ipPattern
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
+	public static String checkIP(Properties prop,String ipName,String ip,Integer ipType,Integer ipPattern){
 		StringBuffer msg=new StringBuffer();
-		if("4over6".equals(ipType)){
-			if("ip_subnet".equals(ipPattern)){
+		if(StringUtils.isBlank(ip)){
+			msg.append(String.format(prop.getProperty("can_not_null"), ipName)+";");
+		}else{
+			if(4==ipType.intValue()){
+				if(1==ipPattern.intValue()){
+					Pattern pattern=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP);
+					Matcher matcher=pattern.matcher(ip);
+					if(!matcher.matches()){//完全匹配
+						msg.append(String.format(prop.getProperty("is_in_wrong_format"), ipName)+";");
+					}
+				}else if(2==ipPattern.intValue()){
+					Pattern pattern=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP);
+					Matcher matcher=pattern.matcher(ip);
+					if(!matcher.matches()){//完全匹配
+						msg.append(String.format(prop.getProperty("is_in_wrong_format"), ipName)+";");
+					}
+				}else if(3==ipPattern.intValue()){
+					Pattern pattern=Pattern.compile(Constants.IPV4_IP_REGEXP);
+					Matcher matcher=pattern.matcher(ip);
+					if(!matcher.matches()){//完全匹配
+						msg.append(String.format(prop.getProperty("is_in_wrong_format"), ipName)+";");
+					}
+				}
+			}else if(6==ipType.intValue()){
+				if(1==ipPattern.intValue()){
+					Pattern pattern=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP);
+					Matcher matcher=pattern.matcher(ip);
+					if(!matcher.matches()){//完全匹配
+						msg.append(String.format(prop.getProperty("is_in_wrong_format"), ipName)+";");
+					}
+				}else if(2==ipPattern.intValue()){
+					Pattern pattern=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP);
+					Matcher matcher=pattern.matcher(ip);
+					if(!matcher.matches()){//完全匹配
+						msg.append(String.format(prop.getProperty("is_in_wrong_format"), ipName)+";");
+					}
+				}else if(3==ipPattern.intValue()){
+					Pattern pattern=Pattern.compile(Constants.IPV6_IP_REGEXP);
+					Matcher matcher=pattern.matcher(ip);
+					if(!matcher.matches()){//完全匹配
+						msg.append(String.format(prop.getProperty("is_in_wrong_format"), ipName)+";");
+					}
+				}
+			}
+		}
+		return msg.toString();
+	}
+	public static String checkIp(Properties prop,String srcIpName,String srcIp,String destIpName,String destIp,Integer ipType,Integer ipPattern) {
+		StringBuffer msg=new StringBuffer();
+		if(46==ipType.intValue()){
+			if(1==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP);
 				Matcher matcherV4=patternV4.matcher(srcIp);
@@ -1161,7 +1219,7 @@ public class BaseController {
 				if(!matcherV6.matches()){//完全匹配
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), destIpName)+";");
 				}
-			}else if("ip_range".equals(ipPattern)){
+			}else if(2==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP);
 				Matcher matcherV4=patternV4.matcher(srcIp);
@@ -1172,7 +1230,7 @@ public class BaseController {
 				if(!matcherV6.matches()){//完全匹配
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), destIpName)+";");
 				}
-			}else if("ip".equals(ipPattern)){
+			}else if(3==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP);
 				Matcher matcherV4=patternV4.matcher(srcIp);
@@ -1184,8 +1242,8 @@ public class BaseController {
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), destIpName)+";");
 				}
 			}
-		}else if("6over4".equals(ipType)) {
-			if("ip_subnet".equals(ipPattern)){
+		}else if(64==ipType.intValue()) {
+			if(1==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP);
 				Matcher matcherV4=patternV4.matcher(destIp);
@@ -1196,7 +1254,7 @@ public class BaseController {
 				if(!matcherV6.matches()){//完全匹配
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), srcIpName)+";");
 				}
-			}else if("ip_range".equals(ipPattern)){
+			}else if(2==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP);
 				Matcher matcherV4=patternV4.matcher(destIp);
@@ -1207,7 +1265,7 @@ public class BaseController {
 				if(!matcherV6.matches()){//完全匹配
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), srcIpName )+";");
 				}
-			}else if("ip".equals(ipPattern)){
+			}else if(3==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP);
 				Matcher matcherV4=patternV4.matcher(destIp);
@@ -1219,8 +1277,8 @@ public class BaseController {
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), srcIpName)+";");
 				}
 			}
-		}else if("all".equals(ipType)) {
-			if("ip_subnet".equals(ipPattern)){
+		}else if(10==ipType.intValue()) {
+			if(1==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP);
 				Matcher matcherSrcIpV4=patternV4.matcher(srcIp);
@@ -1233,7 +1291,7 @@ public class BaseController {
 				if(!matcherDestIpV4.matches()&&!matcherDestIpV6.matches()){//完全匹配
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), destIpName)+";");
 				}
-			}else if("ip_range".equals(ipPattern)){
+			}else if(2==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_RANGE_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_RANGE_REGEXP);
 				Matcher matcherSrcIpV4=patternV4.matcher(srcIp);
@@ -1246,7 +1304,7 @@ public class BaseController {
 				if(!matcherDestIpV4.matches()&&!matcherDestIpV6.matches()){//完全匹配
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), destIpName)+";");
 				}
-			}else if("ip".equals(ipPattern)){
+			}else if(3==ipPattern.intValue()){
 				Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
 				Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP);
 				Matcher matcherSrcIpV4=patternV4.matcher(srcIp);
@@ -1263,12 +1321,12 @@ public class BaseController {
 		}
 		return msg.toString();
 	}
-	public static String checkPort(Properties prop,String portName,String port,String portPattern){
+	public static String checkPort(Properties prop,String portName,String port,Integer portPattern){
 		StringBuffer msg=new StringBuffer();
 		if(StringUtils.isBlank(port)){
 			msg.append(String.format(prop.getProperty("can_not_null"), portName)+";");
 		}else{
-			if("port".equals(portPattern)){
+			if(1==portPattern.intValue()){
 				try{
 					Integer portInt=Integer.parseInt(port);
 					if(portInt<0||portInt>65535){
@@ -1278,7 +1336,7 @@ public class BaseController {
 					// TODO: handle exception
 					msg.append(String.format(prop.getProperty("not_number"), portName)+";");
 				}
-			}else if("port_mask".equals(portPattern)){
+			}else if(2==portPattern.intValue()){
 				if(port.indexOf("/")==-1){
 					msg.append(String.format(prop.getProperty("is_in_wrong_format"), portName)+";");
 				}else{

src/main/java/com/nis/web/controller/configuration/AppCfgController.java

@@ -22,6 +22,7 @@ import com.nis.domain.configuration.AppDomainCfg;
 import com.nis.domain.configuration.AppHttpCfg;
 import com.nis.domain.configuration.AppIpCfg;
 import com.nis.domain.configuration.AppPolicyCfg;
+import com.nis.domain.configuration.AppSslCertCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
@@ -633,4 +634,114 @@ public class AppCfgController extends BaseController {
 		appCfgService.updateAppByteCfgValid(isValid,ids,functionId);
 		return "redirect:" + adminPath +"/app/byteCfgList?functionId="+functionId;
 	}
+	
+	/**
+	 * APP ssl证书特征配置 列表
+	 * @param model
+	 * @param cfg
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = {"sslCfgList"})
+	public String sslCfgList(Model model,@ModelAttribute("cfg")AppSslCertCfg cfg,HttpServletRequest request,HttpServletResponse response) {
+		Page<AppSslCertCfg> searchPage=new Page<AppSslCertCfg>(request,response,"r");
+		Page<AppSslCertCfg> page = appCfgService.findAppSslList(searchPage, cfg);
+		for(AppSslCertCfg entity:page.getList()){
+			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			entity.setAppName(app.getSpecServiceName());
+		}
+		model.addAttribute("page", page);
+		initPageCondition(model,cfg);
+		return "/cfg/app/appSslCfgList";
+	}
+	/**
+	 * APP ssl证书特征配置表单（新增/修改）
+	 * @param model
+	 * @param ids
+	 * @param entity
+	 * @return
+	 */
+	@RequestMapping(value = {"sslCfgForm"})
+	@RequiresPermissions(value={"app:ssl:config"})
+	public String sslCfgForm(Model model,String ids,AppSslCertCfg entity) {
+		if(StringUtils.isNotBlank(ids)){
+			entity = appCfgService.getAppSslCfg(Long.parseLong(ids));
+			initUpdateFormCondition(model,entity);
+		}else{
+			initFormCondition(model,entity);
+		}
+		model.addAttribute("_cfg", entity);
+		return "/cfg/app/appSslCfgForm";
+	}
+	/**
+	 * APP ssl证书特征配置（新增/修改）提交
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @param entity
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequestMapping(value = {"saveAppSslCfg"})
+	@RequiresPermissions(value={"app:ssl:config"})
+	public String saveAppSslCfg(Model model,HttpServletRequest request,HttpServletResponse response,
+			AppSslCertCfg entity,RedirectAttributes redirectAttributes) {
+		try {
+			SpecificServiceCfg specificService = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			if(specificService!=null){
+				entity.setAppCode(specificService.getSpecServiceCode());
+			}
+			appCfgService.saveOrUpdateAppSslCfg(entity);
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, e.getMessage());
+		}
+		
+		return "redirect:" + adminPath +"/app/sslCfgList?functionId="+entity.getFunctionId();
+	}
+	/**
+	 * APP ssl证书特征配置 审核
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids
+	 * @param functionId
+	 * @param redirectAttributes
+	 * @return
+	 */
+	@RequestMapping(value = {"auditAppSslCfg"})
+	@RequiresPermissions(value={"app:ssl:confirm"})
+	public String auditAppSslCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
+		AppSslCertCfg entity = new AppSslCertCfg();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity = appCfgService.getAppSslCfg(Long.parseLong(id));
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setAuditorId(UserUtils.getUser().getId());
+			entity.setAuditTime(new Date());
+			entity.setFunctionId(functionId);
+			try {
+				appCfgService.auditAppSslCfg(entity,isAudit);
+			} catch (MaatConvertException e) {
+				e.printStackTrace();
+				logger.info("app SSL配置下发失败："+e.getMessage());
+				addMessage(redirectAttributes, e.getMessage());
+			}
+		}
+		return "redirect:" + adminPath +"/app/sslCfgList?functionId="+functionId;
+	}
+	/**
+	 * APP ssl证书特征配置 删除
+	 * @param isValid
+	 * @param ids
+	 * @param functionId
+	 * @return
+	 */
+	@RequestMapping(value = {"updateAppSslCfgValid"})
+	@RequiresPermissions(value={"app:ssl:config"})
+	public String updateAppSslCfgValid(Integer isValid,String ids,Integer functionId) {
+		appCfgService.updateAppSslCfgValid(isValid,ids,functionId);
+		return "redirect:" + adminPath +"/app/sslCfgList?functionId="+functionId;
+	}
 }

src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java

@@ -29,9 +29,13 @@ import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.FileDigestCfg;
 import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
+import com.nis.domain.configuration.P2pHashCfg;
+import com.nis.domain.configuration.P2pKeywordCfg;
 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.FileUtils;
 import com.nis.util.JsonMapper;
 import com.nis.util.StringUtil;
@@ -226,4 +230,154 @@ public class FileTransferCfgController  extends BaseController{
 		}
 		return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId;
 	}
+	
+	@RequestMapping(value = {"p2pList"})
+	public String p2pList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
+		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
+		Page<CfgIndexInfo> page = fileTransferCfgService.getP2pList(searchPage, cfg);
+		model.addAttribute("page", page);
+		initPageCondition(model,cfg);
+		return "/cfg/fileTransfer/p2pList";
+	}
+	
+	@RequestMapping(value = {"p2pForm"})
+	@RequiresPermissions(value={"fileTransfer:p2p:config"})
+	public String p2pForm(Model model,String ids,CfgIndexInfo entity) {
+		// 跳转操作页面（根据ids判断是新增   or 修改）
+		if(StringUtils.isNotBlank(ids)){
+			entity = fileTransferCfgService.getP2pCfg(Long.parseLong(ids));
+			
+			// 添加配置域Key,用于修改页面区分各域配置
+			P2pHashCfg hashCfg = new P2pHashCfg();
+			hashCfg.setCfgType(Constants.P2P_HASH_BIN_REGION);
+			entity.setP2pHash(hashCfg);
+			P2pKeywordCfg keywordCfg = new P2pKeywordCfg();
+			keywordCfg.setCfgType(Constants.P2P_KEYWORDS_REGION);
+			entity.setP2pKeyword(keywordCfg);
+			NtcSubscribeIdCfg subscribeIdCfg = new NtcSubscribeIdCfg();
+			subscribeIdCfg.setCfgType(Constants.NTC_SUBSCRIBE_ID_REGION);
+			entity.setNtcSubscribeIdCfg(subscribeIdCfg);
+			
+			if(entity.getP2pHashList().size() == 0) {
+				entity.getP2pHashList().add(hashCfg);
+			}
+			if(entity.getP2pKeywordList().size() == 0) {
+				entity.getP2pKeywordList().add(keywordCfg);
+			}
+			if(entity.getNtcSubscribeIdCfgList().size() == 0) {
+				entity.getNtcSubscribeIdCfgList().add(subscribeIdCfg);
+			}
+			
+			initUpdateFormCondition(model,entity);
+		}else{
+			// 添加配置域Key,用于新增页面区分各域配置
+			P2pHashCfg hashCfg = new P2pHashCfg();
+			hashCfg.setCfgType(Constants.P2P_HASH_BIN_REGION);
+			entity.setP2pHash(hashCfg);
+			P2pKeywordCfg keywordCfg = new P2pKeywordCfg();
+			keywordCfg.setCfgType(Constants.P2P_KEYWORDS_REGION);
+			entity.setP2pKeyword(keywordCfg);
+			NtcSubscribeIdCfg subscribeIdCfg = new NtcSubscribeIdCfg();
+			subscribeIdCfg.setCfgType(Constants.NTC_SUBSCRIBE_ID_REGION);
+			entity.setNtcSubscribeIdCfg(subscribeIdCfg);
+			
+			List<P2pHashCfg> hashList = new ArrayList<P2pHashCfg>();
+			hashList.add(hashCfg);
+			entity.setP2pHashList(hashList);
+			List<P2pKeywordCfg> keywordList = new ArrayList<P2pKeywordCfg>();
+			keywordList.add(keywordCfg);
+			entity.setP2pKeywordList(keywordList);
+			ArrayList<NtcSubscribeIdCfg> subscribeIdList = new ArrayList<NtcSubscribeIdCfg>();
+			subscribeIdList.add(subscribeIdCfg);
+			entity.setNtcSubscribeIdCfgList(subscribeIdList);
+			
+			initFormCondition(model,entity);
+		}
+		
+		model.addAttribute("_cfg", entity);
+		return "/cfg/fileTransfer/p2pForm";
+	}
+	
+	@RequestMapping(value = {"saveP2pCfg"})
+	@RequiresPermissions(value={"fileTransfer:p2p:config"})
+	public String saveP2pCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
+		fileTransferCfgService.saveP2pCfg(entity);
+		return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+entity.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"updateP2pCfgValid"})
+	@RequiresPermissions(value={"fileTransfer:p2p:config"})
+	public String updateP2pCfgValid(Integer isValid,String ids,Integer functionId) {
+		fileTransferCfgService.updateP2pCfgValid(isValid,ids,functionId);
+		return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+functionId;
+	}
+	
+	@RequestMapping(value = {"ajaxP2pSubList"})
+	public String ajaxP2pSubList(Model model,Long cfgId,Integer index) {
+		CfgIndexInfo cfg = fileTransferCfgService.getP2pCfg(cfgId);
+		List<String[]> tabList = new ArrayList();
+		if(cfg.getIpPortList()!=null){
+			String cfgType = null;
+			for(IpPortCfg ip:cfg.getIpPortList()){
+				if(!ip.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",ip.getCfgType()});
+					cfgType = ip.getCfgType();
+				}
+			}
+		}
+		if(cfg.getP2pHashList()!=null){
+			String cfgType = null;
+			for(BaseStringCfg hash:cfg.getP2pHashList()){
+				if(!hash.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",hash.getCfgType()});
+					cfgType = hash.getCfgType();
+				}
+			}
+		}
+		if(cfg.getP2pKeywordList()!=null){
+			String cfgType = null;
+			for(BaseStringCfg keyword:cfg.getP2pKeywordList()){
+				if(!keyword.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",keyword.getCfgType()});
+					cfgType = keyword.getCfgType();
+				}
+			}
+		}
+		if(cfg.getNtcSubscribeIdCfgList()!=null){
+			String cfgType = null;
+			for(BaseStringCfg subscribeId:cfg.getNtcSubscribeIdCfgList()){
+				if(!subscribeId.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",subscribeId.getCfgType()});
+					cfgType = subscribeId.getCfgType();
+				}
+			}
+		}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/fileTransfer/p2pSubList";
+	}
+	
+	@RequestMapping(value = {"auditP2pCfg"})
+	@RequiresPermissions(value={"fileTransfer:p2p:confirm"})
+	public String auditP2pCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
+		CfgIndexInfo entity = new CfgIndexInfo();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity = fileTransferCfgService.getP2pCfg(Long.parseLong(id));
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setAuditorId(UserUtils.getUser().getId());
+			entity.setAuditTime(new Date());
+			entity.setFunctionId(functionId);
+			try {
+				fileTransferCfgService.auditP2pCfg(entity,isAudit);
+			} catch (MaatConvertException e) {
+				e.printStackTrace();
+				logger.info("p2p配置下发失败："+e.getMessage());
+				addMessage(redirectAttributes, e.getMessage());
+			}
+		}
+		return "redirect:" + adminPath +"/ntc/fileTransfer/p2pList?functionId="+functionId;
+	}
 }

src/main/java/com/nis/web/controller/configuration/ntc/IpController.java

@@ -56,11 +56,11 @@ public class IpController extends CommonController{
 		model.addAttribute("dropAction",Constants.DROP_ACTION);
 		model.addAttribute("urlPrefix","/ntc/iplist");
 		model.addAttribute("requiresPermissionPrefix","iplist");
-		if(specialFunctionId!=null && "ipsec".equals(specialFunctionId)) {
-			return "/cfg/ipsec/ipForm";
-		}else if(specialFunctionId!=null && "ipaddr".equals(specialFunctionId)) {
-			return "/cfg/ipaddr/ipForm";
-		}
+//		if(specialFunctionId!=null && "ipsec".equals(specialFunctionId)) {
+//			return "/cfg/ipsec/ipForm";
+//		}else if(specialFunctionId!=null && "ipaddr".equals(specialFunctionId)) {
+//			return "/cfg/ipaddr/ipForm";
+//		}
 		return "/cfg/common/ipForm";
 	}
 	@RequestMapping(value = {"saveOrUpdate"})

src/main/java/com/nis/web/controller/log/manipulation/DkBehaviorLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.DkBehaviorLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -50,6 +52,9 @@ public class DkBehaviorLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_DKBEHAVIOR_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -64,7 +69,7 @@ public class DkBehaviorLogController extends BaseController{
 				List<DkBehaviorLog> list = page.getList();
 				for (DkBehaviorLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询行为识别日志成功");

src/main/java/com/nis/web/controller/log/ntc/AppLogController.java

@@ -18,11 +18,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcAppLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -51,6 +53,9 @@ public class AppLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_APP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -65,7 +70,7 @@ public class AppLogController extends BaseController{
 				List<NtcAppLog> list = page.getList();
 				for (NtcAppLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询App日志成功");

src/main/java/com/nis/web/controller/log/ntc/BgpLogController.java

@@ -0,0 +1,77 @@
+package com.nis.web.controller.log.ntc;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.aspectj.util.FileUtil;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.Page;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.NtcIpLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.util.Constants;
+import com.nis.util.DictUtils;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping("${adminPath}/log/ntc/other/bgpLogs")
+public class BgpLogController extends BaseController {
+	
+	@RequestMapping(value = {"list", ""})
+	public String list(@ModelAttribute("log") NtcIpLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
+		try {
+			PageLog<NtcIpLog> page = new PageLog<NtcIpLog>(request, response);
+			Map<String, Object> params = new HashMap<String, Object>();
+			params.put("pageSize", page.getPageSize());
+			params.put("pageNo", page.getPageNo());
+			initLogSearchValue(log, params);
+
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
+			String url = Constants.LOG_BASE_URL + Constants.NTC_BGP_LOG;
+			String recv = HttpClientUtil.getMsg(url, params, request);
+			
+			
+			logger.info("查询结果:" + recv);
+			if (StringUtils.isNotBlank(recv)) {
+				Gson gson = new GsonBuilder().create();
+				LogRecvData<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.getType());
+				if (fromJson.getStatus().intValue() == 200) {
+					page.setList(fromJson.getData().getList());
+					List<NtcIpLog> list = page.getList();
+					for (NtcIpLog l : list) {
+						l.setFunctionId(log.getFunctionId());
+						setLogAction(l,serviceList);
+					}
+					model.addAttribute("page", page);
+				}
+			}
+		} catch (Exception e) {
+			logger.error("查询失败", e);
+			addMessageLog(model, e.getMessage());
+		}
+		
+		return "/log/ntc/bgpList";
+	}
+	
+}

src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java

@@ -24,11 +24,13 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.reflect.TypeToken;
 import com.google.protobuf.DescriptorProtos.FieldDescriptorProto.Type;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcDdosLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.sun.jna.platform.win32.OaIdl.DATE;
@@ -58,6 +60,9 @@ public class DdosLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_DDOS_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -80,7 +85,7 @@ public class DdosLogController extends BaseController{
 				List<NtcDdosLog> list = page.getList();
 				for (NtcDdosLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Ddos日志成功");

src/main/java/com/nis/web/controller/log/ntc/DnsLogController.java

@@ -18,11 +18,13 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcDnsLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -42,6 +44,9 @@ public class DnsLogController extends BaseController {
 			}
 			initLogSearchValue(log, params);
 		
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_DNS_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			logger.info("查询结果:" + recv);
@@ -55,7 +60,7 @@ public class DnsLogController extends BaseController {
 				List<NtcDnsLog> list = page.getList();
 				for (NtcDnsLog l : list) {
 					l.setFunctionId(log.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/FtpLogController.java

@@ -18,12 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcFtpLog;
 import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -52,6 +54,9 @@ public class FtpLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_FTP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -67,7 +72,7 @@ public class FtpLogController extends BaseController{
 				List<NtcFtpLog> list = page.getList();
 				for (NtcFtpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Ftp日志成功");

src/main/java/com/nis/web/controller/log/ntc/HttpLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcHttpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -41,6 +43,9 @@ public class HttpLogController extends BaseController {
 			}
 			initLogSearchValue(log, params);
 		
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_HTTP_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			logger.info("查询结果:" + recv);
@@ -54,7 +59,7 @@ public class HttpLogController extends BaseController {
 				List<NtcHttpLog> list = page.getList();
 				for (NtcHttpLog l : list) {
 					l.setFunctionId(log.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/IpLogController.java

@@ -21,12 +21,14 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -43,6 +45,9 @@ public class IpLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_IP_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			
@@ -56,7 +61,7 @@ public class IpLogController extends BaseController {
 					List<NtcIpLog> list = page.getList();
 					for (NtcIpLog l : list) {
 						l.setFunctionId(log.getFunctionId());
-						setLogAction(l);
+						setLogAction(l,serviceList);
 					}
 					model.addAttribute("page", page);
 				}
@@ -77,6 +82,9 @@ public class IpLogController extends BaseController {
 		params.put("pageNo", page.getPageNo());
 		initLogSearchValue(log, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		String url = "http://10.0.6.121:8080/gwall/test/logTest";
 		try {
 			String recv = HttpClientUtil.getMsg(url, params, request);
@@ -90,7 +98,7 @@ public class IpLogController extends BaseController {
 				List<NtcIpLog> list = page.getList();
 				for (NtcIpLog l : list) {
 					l.setFunctionId(log.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/IpsecLogController.java

@@ -18,12 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcIpsecLog;
 import com.nis.domain.log.NtcIpsecLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -52,6 +54,9 @@ public class IpsecLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_IPSEC_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -65,7 +70,7 @@ public class IpsecLogController extends BaseController{
 				page.setList(list);
 				for (NtcIpsecLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Ipsec日志成功");

src/main/java/com/nis/web/controller/log/ntc/L2tpLogController.java

@@ -17,11 +17,13 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcL2tpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -40,6 +42,9 @@ public class L2tpLogController extends BaseController {
 		// 请求参数判断
 		initLogSearchValue(ntcL2tpLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(ntcL2tpLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_L2TP_LOG;
@@ -52,7 +57,7 @@ public class L2tpLogController extends BaseController {
 				List<NtcL2tpLog> list = fromPage.getList();
 				for (NtcL2tpLog log : list) {
 					log.setFunctionId(ntcL2tpLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/MailLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcMailLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MailLogController extends BaseController {
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MAIL_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			
@@ -50,7 +55,7 @@ public class MailLogController extends BaseController {
 					List<NtcMailLog> list = page.getList();
 					for (NtcMailLog l : list) {
 						l.setFunctionId(log.getFunctionId());
-						setLogAction(l);
+						setLogAction(l,serviceList);
 					}
 					model.addAttribute("page", page);
 				}

src/main/java/com/nis/web/controller/log/ntc/MmAvIpLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmAvIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -51,6 +53,9 @@ public class MmAvIpLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMAVIP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -65,7 +70,7 @@ public class MmAvIpLogController extends BaseController{
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询音视频IP日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmAvUrlLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -51,6 +53,9 @@ public class MmAvUrlLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMAVURL_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -65,7 +70,7 @@ public class MmAvUrlLogController extends BaseController{
 				List<MmAvUrlLog> list = page.getList();
 				for (MmAvUrlLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询音视频url日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmPicIpLogController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmPicIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmPicIpLogController extends BaseController {
 		// 请求参数判断
 		initLogSearchValue(mmPicIpLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(mmPicIpLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMPICIP_LOG;
@@ -50,7 +55,7 @@ public class MmPicIpLogController extends BaseController {
 				List<MmPicIpLog> list = fromPage.getList();
 				for (MmPicIpLog log : list) {
 					log.setFunctionId(mmPicIpLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("音视频图片IP日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmPicUrlController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmPicUrlLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmPicUrlController extends BaseController{
 		// 请求参数判断
 		initLogSearchValue(mmPicUrlLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(mmPicUrlLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMPICURL_LOG;
@@ -50,7 +55,7 @@ public class MmPicUrlController extends BaseController{
 				List<MmPicUrlLog> list = fromPage.getList();
 				for (MmPicUrlLog log : list) {
 					log.setFunctionId(mmPicUrlLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("音视频图片URL日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmPornAvSampleController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmAvIpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmPornAvSampleController extends BaseController {
 			//查询值判断
 			initLogSearchValue(entry, params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL + Constants.NTC_MMPORNAUDIOSAMPLE_LOG;
 			String jsonString = HttpClientUtil.getMsg(url, params, request);
@@ -52,7 +57,7 @@ public class MmPornAvSampleController extends BaseController {
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询音频色情样例日志成功");
@@ -76,6 +81,9 @@ public class MmPornAvSampleController extends BaseController {
 			//查询值判断
 			initLogSearchValue(entry, params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL + Constants.NTC_MMPORNVIDEOSAMPLE_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -90,7 +98,7 @@ public class MmPornAvSampleController extends BaseController {
 				List<MmAvIpLog> list = page.getList();
 				for (MmAvIpLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询视频色情样例日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmSampleAudioLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmSampleAudioController extends BaseController{
 		// 请求参数判断
 		initLogSearchValue(sampleAudioLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(sampleAudioLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEAUDIO_LOG;
@@ -50,7 +55,7 @@ public class MmSampleAudioController extends BaseController{
 				List<MmSampleAudioLog> list = fromPage.getList();
 				for (MmSampleAudioLog log : list) {
 					log.setFunctionId(sampleAudioLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("音频样例日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmSamplePicLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmSamplePicController extends BaseController{
 		// 请求参数判断
 		initLogSearchValue(samplePicLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(samplePicLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEPIC_LOG;
@@ -50,7 +55,7 @@ public class MmSamplePicController extends BaseController{
 				List<MmSamplePicLog> list = fromPage.getList();
 				for (MmSamplePicLog log : list) {
 					log.setFunctionId(samplePicLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("图片样例日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java

@@ -15,11 +15,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmSampleVideoLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -38,6 +40,9 @@ public class MmSampleVideoController extends BaseController{
 		// 请求参数判断
 		initLogSearchValue(sampleVideoLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(sampleVideoLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEVIDEO_LOG;
@@ -50,7 +55,7 @@ public class MmSampleVideoController extends BaseController{
 				List<MmSampleVideoLog> list = fromPage.getList();
 				for (MmSampleVideoLog log : list) {
 					log.setFunctionId(sampleVideoLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("视频样例日志查询成功！");

src/main/java/com/nis/web/controller/log/ntc/MmSampleVoipLogController.java

@@ -19,11 +19,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmVoipLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -42,6 +44,9 @@ public class MmSampleVoipLogController extends BaseController {
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL+Constants.NTC_MMSAMPLE_VOIP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
 			//String path = request.getClass().getClassLoader().getResource("").getPath();
@@ -57,7 +62,7 @@ public class MmSampleVoipLogController extends BaseController {
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Voip样例日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmVoipAccountLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmVoipLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -50,6 +52,9 @@ public class MmVoipAccountLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_ACCOUNT_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -64,7 +69,7 @@ public class MmVoipAccountLogController extends BaseController{
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询mmVoipAccount日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmVoipIpLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmVoipLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -50,6 +52,9 @@ public class MmVoipIpLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_IP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -64,7 +69,7 @@ public class MmVoipIpLogController extends BaseController{
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询VoipIp日志成功");

src/main/java/com/nis/web/controller/log/ntc/MmVoipLogController.java

@@ -17,11 +17,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.MmVoipLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -50,6 +52,9 @@ public class MmVoipLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_MMVOIP_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -64,7 +69,7 @@ public class MmVoipLogController extends BaseController{
 				List<MmVoipLog> list = page.getList();
 				for (MmVoipLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Voip日志成功");

src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java

@@ -18,12 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -52,6 +54,9 @@ public class OpenVpnLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_OPENVPN_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -66,7 +71,7 @@ public class OpenVpnLogController extends BaseController{
 				List<NtcOpenVpnLog> list = page.getList();
 				for (NtcOpenVpnLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询OpenVpn日志成功");

src/main/java/com/nis/web/controller/log/ntc/P2pLogController.java

@@ -0,0 +1,67 @@
+package com.nis.web.controller.log.ntc;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
+import com.nis.domain.PageLog;
+import com.nis.domain.log.NtcIpLog;
+import com.nis.domain.maat.LogRecvData;
+import com.nis.util.Constants;
+import com.nis.util.DictUtils;
+import com.nis.util.httpclient.HttpClientUtil;
+import com.nis.web.controller.BaseController;
+
+@Controller
+@RequestMapping("${adminPath}/log/ntc/p2pLogs")
+public class P2pLogController extends BaseController {
+	
+	@RequestMapping(value = {"list", ""})
+	public String list(@ModelAttribute("log") NtcIpLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
+		try {
+			PageLog<NtcIpLog> page = new PageLog<NtcIpLog>(request, response);
+			Map<String, Object> params = new HashMap<String, Object>();
+			params.put("pageSize", page.getPageSize());
+			params.put("pageNo", page.getPageNo());
+			initLogSearchValue(log, params);
+
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
+			String url = Constants.LOG_BASE_URL + Constants.NTC_P2P_LOG;
+			String recv = HttpClientUtil.getMsg(url, params, request);			
+			logger.info("查询结果:" + recv);
+			if (StringUtils.isNotBlank(recv)) {
+				Gson gson = new GsonBuilder().create();
+				LogRecvData<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.getType());
+				if (fromJson.getStatus().intValue() == 200) {
+					page.setList(fromJson.getData().getList());
+					List<NtcIpLog> list = page.getList();
+					for (NtcIpLog l : list) {
+						l.setFunctionId(log.getFunctionId());
+						setLogAction(l,serviceList);
+					}
+					model.addAttribute("page", page);
+				}
+			}
+		} catch (Exception e) {
+			logger.error("查询失败", e);
+			addMessageLog(model, e.getMessage());
+		}
+		
+		return "/log/ntc/p2pList";
+	}
+	
+}

src/main/java/com/nis/web/controller/log/ntc/PptpLogController.java

@@ -17,11 +17,13 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcPptpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -40,6 +42,9 @@ public class PptpLogController extends BaseController {
 		// 请求参数判断
 		initLogSearchValue(ntcPptpLog, params);
 		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(ntcPptpLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_PPTP_LOG;
@@ -52,7 +57,7 @@ public class PptpLogController extends BaseController {
 				page.setList(list);
 				for (NtcPptpLog log : list) {
 					log.setFunctionId(ntcPptpLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/ntc/SshLogController.java

@@ -18,12 +18,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcSshLog;
 import com.nis.domain.log.NtcSshLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -52,6 +54,9 @@ public class SshLogController extends BaseController{
 			//查询值判断
 			initLogSearchValue(entry,params);
 			
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = "";
 			url = Constants.LOG_BASE_URL+Constants.NTC_SSH_LOG;
 			String jsonString = HttpClientUtil.getMsg(url,params,request);
@@ -66,7 +71,7 @@ public class SshLogController extends BaseController{
 				List<NtcSshLog> list = page.getList();
 				for (NtcSshLog l : list) {
 					l.setFunctionId(entry.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 				logger.info("查询Ssh日志成功");

src/main/java/com/nis/web/controller/log/ntc/SslLogController.java

@@ -17,11 +17,13 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.NtcSslLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -43,6 +45,10 @@ public class SslLogController extends BaseController {
 		if(StringUtils.isNotBlank(ntcSslLog.getSni())) {
 			params.put("SearchSni", ntcSslLog.getSni());
 		}	
+		
+		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(ntcSslLog.getFunctionId());
+		model.addAttribute("serviceList", serviceList);
+		
 		try {
 			// 请求接口
 			String url = Constants.LOG_BASE_URL + Constants.NTC_SSL_LOG;
@@ -55,7 +61,7 @@ public class SslLogController extends BaseController {
 				page.setList(list);
 				for (NtcSslLog log : list) {
 					log.setFunctionId(ntcSslLog.getFunctionId());
-					setLogAction(log);
+					setLogAction(log,serviceList);
 				}
 				model.addAttribute("page", page);
 			}

src/main/java/com/nis/web/controller/log/pxy/PxyHttpLogController.java

@@ -17,10 +17,12 @@ import org.springframework.web.servlet.support.RequestContext;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.PageLog;
 import com.nis.domain.log.PxyHttpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
+import com.nis.util.DictUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -41,6 +43,9 @@ public class PxyHttpLogController extends BaseController {
 		
 			initLogSearchValue(log, params);
 		
+			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
+			model.addAttribute("serviceList", serviceList);
+			
 			String url = Constants.LOG_BASE_URL + Constants.PXY_HTTP_LOG;
 			String recv = HttpClientUtil.getMsg(url, params, request);
 			logger.info("查询结果:" + recv);
@@ -53,7 +58,7 @@ public class PxyHttpLogController extends BaseController {
 				List<PxyHttpLog> list = page.getList();
 				for (PxyHttpLog l : list) {
 					l.setFunctionId(log.getFunctionId());
-					setLogAction(l);
+					setLogAction(l,serviceList);
 				}
 				model.addAttribute("page", page);
 			}