20190508升级sql内容

Conflicts:
	src/main/resources/messages/message_ru.properties

README.md

@@ -1 +1,18 @@
-在公共分组功能逻辑完善之前，此分支为ntc界面系统的全集上线升级分支合并版。
+5.8号升级版本。
+
+1、系统支持单独配置 SubscribeID，即仅使用SubscribeID作为配置条件进行监测或者封堵，无需与其它条件组合；
+
+
+2、系统增加配置30个用户并发进行导入，每次导入不超过2w条 。
+
+
+3、系统增加saveAndAudit角色，拥有该角色的用户新增配置，配置不经过审核流程直接生效。
+
+4、日志页面单次可以下载2万条以内的日志；
+
+
+5、支持监测、统计志查询条件扩展到1个月 （通联日志只能是1天）。
+
+
+6、配置 页面支持按照配置 id进行查询，支持配置 id输入方式为 10-15；10，13，15；
+

pom.xml

@@ -727,6 +727,10 @@
 		    <artifactId>druid</artifactId>
 		    <version>1.1.10</version>
 		</dependency>
-
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>fastjson</artifactId>
+		    <version>1.2.57</version>
+		</dependency>
 	</dependencies>
 </project>

src/main/java/com/nis/domain/ScheduleCfg.java

@@ -14,6 +14,7 @@ public class ScheduleCfg extends BaseCfg<ScheduleCfg>{
 	private String cronValid;//生效cron表达式
 	private String cronInvalid;//失效cron表达式
 	private String whereStr;//动态where 条件
+	private int delFlag;
 	private int type;
 	public String getName() {
 		return name;
@@ -45,5 +46,11 @@ public class ScheduleCfg extends BaseCfg<ScheduleCfg>{
 	public void setType(int type) {
 		this.type = type;
 	}
+	public int getDelFlag() {
+		return delFlag;
+	}
+	public void setDelFlag(int delFlag) {
+		this.delFlag = delFlag;
+	}
 	
 }

src/main/java/com/nis/quartz/ScheduleCfgJob.java

@@ -82,15 +82,21 @@ public class ScheduleCfgJob implements Job {
 		SchedulerDao dao = SpringContextHolder.getBean(SchedulerDao.class);
 		JobDataMap dataMap = context.getJobDetail().getJobDataMap();
 		long scheduleCfgId = dataMap.get("scheduleCfgId") == null ? 0:dataMap.getLong("scheduleCfgId");
-		long limit = dataMap.get("limit") == null ? 1000:dataMap.getLong("limit");
+		long limit = dataMap.get("limit") == null ? Constants.MAAT_JSON_SEND_SIZE:dataMap.getLong("limit");
 		log.info(String.format("定时配置任务开始执行，scheduleCfgId:%s,limit:%s",scheduleCfgId,limit ));
-		List<ScheduleCfg> newlyCfg = null;
+		List<ScheduleCfg> allNewlySche = null;
 		int totalNum = 0;
 		do {
-			newlyCfg = dao.findNewlyCfg(scheduleCfgId, limit,1);
-			if(newlyCfg != null && newlyCfg.size() > 0) {
-				totalNum += newlyCfg.size();
-				for(ScheduleCfg cfg : newlyCfg) {//先取消之前的定时配置
+			allNewlySche = dao.findNewlyCfg(scheduleCfgId, limit,1,1);
+			if(allNewlySche != null && allNewlySche.size() > 0) {
+				List<ScheduleCfg> allAddSche = new ArrayList<>();
+				totalNum += allNewlySche.size();
+				//先取消之前的定时配置
+				for(ScheduleCfg cfg : allNewlySche) {
+					//获取有效的任务
+					if(cfg.getDelFlag()==1) {
+						allAddSche.add(cfg);
+					}
 					Integer compileId = cfg.getCompileId();
 					try {
 						//取消之前所有的 trigger
@@ -106,7 +112,7 @@ public class ScheduleCfgJob implements Job {
 						log.error(String.format("定时任务取消异常，compileId:%s", compileId),e);
 					}
 				}
-				for(ScheduleCfg cfg : newlyCfg) {
+				for(ScheduleCfg cfg : allAddSche) {
 					Integer compileId = cfg.getCompileId();
 					try {
 						//判断状态，重新添加最新的 trigger
@@ -123,12 +129,12 @@ public class ScheduleCfgJob implements Job {
 					}
 				}
 				//最后 保存此次 最后的id
-				ScheduleCfg lastCfg = newlyCfg.get(newlyCfg.size() -1);
+				ScheduleCfg lastCfg = allNewlySche.get(allNewlySche.size() -1);
 				scheduleCfgId = lastCfg.getId();
 				dataMap.put("scheduleCfgId", scheduleCfgId);
-				log.info(String.format("加载定时任务，total num :%s", newlyCfg.size()));
+				log.info(String.format("加载定时任务，total num :%s", allNewlySche.size()));
 			}
-		} while (newlyCfg != null && newlyCfg.size() > 0);
+		} while (allNewlySche != null && allNewlySche.size() > 0);
 		log.info(String.format("定时配置任务结束执行，total num:%s",totalNum));
 	}
 

src/main/java/com/nis/quartz/ScheduleStatusJob.java

@@ -66,8 +66,15 @@ public class ScheduleStatusJob implements Job{
 			log.debug(String.format("任务开始执行，compileId:%s,isValid:%s",compileId,isValid ));
 			//配置下发，并修改 配置表的状态，保存下发记录等
 			ScheduleService scheduleService = SpringContextHolder.getBean(ScheduleService.class);
+			try {
 				scheduleService.issueCompileInfo(cfg, isValid?1:0);
-			log.debug(String.format("任务开始执行，compileId:%s,isValid:%s",compileId,isValid ));
+			} catch (Exception e) {
+				e.printStackTrace();
+				log.error("定时任务"+cfg.getId()+"执行失败",e);
+			}finally {
+				log.debug(String.format("任务执行完成，compileId:%s,isValid:%s",compileId,isValid ));
+			}
+			
 		}
 		
 	}

src/main/java/com/nis/quartz/ScheduleSyncCfgJob.java

@@ -85,7 +85,7 @@ public class ScheduleSyncCfgJob implements Job {
 		SchedulerDao dao = SpringContextHolder.getBean(SchedulerDao.class);
 		JobDataMap dataMap = context.getJobDetail().getJobDataMap();
 		long scheduleCfgId = dataMap.get("scheduleCfgId") == null ? 0:dataMap.getLong("scheduleCfgId");
-		long limit = dataMap.get("limit") == null ? 1000:dataMap.getLong("limit");
+		long limit = dataMap.get("limit") == null ? Constants.MAAT_JSON_SEND_SIZE:dataMap.getLong("limit");
 		log.info(String.format("Sync定时配置任务开始扫描，scheduleCfgId:%s,limit:%s",scheduleCfgId,limit ));
 		List<ScheduleCfg> newlyCfg = null;
 		int totalNum = 0;
@@ -94,7 +94,7 @@ public class ScheduleSyncCfgJob implements Job {
 		String currentStatus = DictUtils.getDictLabel("currrent_sync_status", "status","0");
 		if(!(currentStatus.equals("0") || currentStatus.equals("1") || currentStatus.equals("2"))) {
 			do {
-				newlyCfg = dao.findNewlyCfg(scheduleCfgId, limit,2);
+				newlyCfg = dao.findNewlyCfg(scheduleCfgId, limit,2,null);
 				if(newlyCfg != null && newlyCfg.size() > 0) {
 					totalNum += newlyCfg.size();
 					for(ScheduleCfg cfg : newlyCfg) {//先取消之前的定时配置

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

@@ -248,7 +248,7 @@ public class ConfigConvertUtil {
 				List<Integer> regionIdList = Lists.newArrayList();
 				T srcCfg = srcList.get(i);
 				BaseIpCfg baseIpCfg = new BaseIpCfg();
-				BeanUtils.copyProperties(srcCfg, baseIpCfg);
+				BeanUtils.copyProperties(srcCfg, baseIpCfg,new String[]{"menuNameCode"});
 				regionIdList.add(baseIpCfg.getRegionId());
 				IpCfg cfg = new IpCfg();
 				BeanUtils.copyProperties(baseIpCfg, cfg);
@@ -325,10 +325,10 @@ public class ConfigConvertUtil {
 		} else if (cfgType == 4) {
 			for (int i = 0; i < srcList.size(); i++) {
 				BaseCfg baseCfg = new BaseCfg();
-				BeanUtils.copyProperties(srcList.get(i), baseCfg);//拷贝公共属性
+				BeanUtils.copyProperties(srcList.get(i), baseCfg,new String[]{"menuNameCode"});//拷贝公共属性
 				// 一条业务配置创建一个分组
 				com.nis.domain.maat.MaatCfg.NumBoundaryCfg cfg = new com.nis.domain.maat.MaatCfg.NumBoundaryCfg();
-				BeanUtils.copyProperties(srcList.get(i), cfg);
+				BeanUtils.copyProperties(srcList.get(i), cfg,new String[]{"menuNameCode"});
 				GroupCfg group = new GroupCfg();
 				group.setGroupId(baseCfg.getGroupId());
 				group.setCompileId(baseCfg.getCompileId());
@@ -344,10 +344,10 @@ public class ConfigConvertUtil {
 		} else if (cfgType == 5) {
 			for (int i = 0; i < srcList.size(); i++) {
 				BaseCfg baseCfg = new BaseCfg();
-				BeanUtils.copyProperties(srcList.get(i), baseCfg);//拷贝公共属性
+				BeanUtils.copyProperties(srcList.get(i), baseCfg,new String[]{"menuNameCode"});//拷贝公共属性
 				// 一条业务配置创建一个分组
 				com.nis.domain.maat.MaatCfg.DigestCfg cfg = new com.nis.domain.maat.MaatCfg.DigestCfg();
-				BeanUtils.copyProperties(srcList.get(i), cfg);
+				BeanUtils.copyProperties(srcList.get(i), cfg,new String[]{"menuNameCode"});
 				GroupCfg group = new GroupCfg();
 				group.setGroupId(baseCfg.getGroupId());
 				group.setCompileId(baseCfg.getCompileId());

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

@@ -1,6 +1,7 @@
 package com.nis.util;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -97,6 +98,18 @@ public class DictUtils {
 		 }
 		return itemList;
 	}
+	public static Map<String,String> getDictMap(String key){
+		Map dictMap=new HashMap<String,String>();
+		List<SysDataDictionaryItem>  itemList = getDictData().get(key);
+		if (StringUtil.isEmpty(itemList)) {
+			return dictMap;
+		}else {
+			for(SysDataDictionaryItem item:itemList) {
+				dictMap.put(item.getItemCode(), item.getItemValue());
+			}
+		}
+		return dictMap;
+	}
 	
 	public static String getDictLabels(String dictKey, String itemCodes, String defaultValue){
 		

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

@@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 
 import com.google.common.collect.Lists;
+import com.google.gson.Gson;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.callback.InlineIp;
 import com.nis.domain.configuration.AppPolicyCfg;
@@ -76,7 +77,7 @@ public class SchedulerTaskUtil {
 	 * @throws IllegalAccessException 
 	 * @throws IllegalArgumentException 
 	 */
-	public boolean updateConfigByServiceAndCompile(Integer serviceId,Integer compileId,Integer isValid,Integer isIssueContent,ConfigSynchronizationDao configSynchronizationDao) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
+	public void updateConfigByServiceAndCompile(Integer serviceId,Integer compileId,Integer isValid,Integer isIssueContent,ConfigSynchronizationDao configSynchronizationDao)throws Exception{
 //		SecurityManagerInit();
 //		Subject subject = login("admin","zdjzsoft");
 //		System.out.println(subject.getPrincipal());
@@ -328,9 +329,6 @@ public class SchedulerTaskUtil {
 							ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 							if(result!=null){
 								logger.info("定时任务修改NTC/PROXY策略的MAAT配置内容响应信息："+result.getMsg());
-								return true;
-							}else{
-								return false;
 							}
 						}else{
 							/*maatCfg = new MaatCfg();
@@ -387,8 +385,8 @@ public class SchedulerTaskUtil {
 								}
 							}
 							//批量获取regionId,groupId(相同编译下的IP类配置多条ip只获取一个组号），分组复用的域配置不需要重新获取regionId,groupId
-							List<Integer> regionIds = ConfigServiceUtil.getId(3, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size());
-							List<Integer> groupIds = ConfigServiceUtil.getId(2, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size());
+							List<Integer> regionIds = ConfigServiceUtil.getId(3, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size()+list.size());
+							List<Integer> groupIds = ConfigServiceUtil.getId(2, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size()+list.size());
 							entity.setIsValid(isValid);//将最新的配置状态赋给配置对象
 							entity.setAuditTime(updateTime);
 							for(int i=0;i<list.size();i++){
@@ -407,7 +405,8 @@ public class SchedulerTaskUtil {
 								areaIpRegionList = new ArrayList();
 								List<DdosIpCfg> list1 = new ArrayList();
 								String userRegion = "";
-								//处理自定义域
+								//处理自定义域【DDOS自定义域组成json结构】
+								Map ddosUserRegion= new HashMap();
 								if(userRegionList!=null){
 									for(Map<String,Object> n:userRegionList){
 										Object userRegionPosition = n.get("userRegionPosition");
@@ -424,17 +423,23 @@ public class SchedulerTaskUtil {
 											Field field = aClass.getDeclaredField(regionColumn);
 											field.setAccessible(true);
 											value = field.get(cfg);
+											
 											if(!StringUtil.isEmpty(value)){
 												if(StringUtil.isEmpty(n.get("regionKey"))){
 													userRegion = value.toString();
 												}else{
-													userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
+													//userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
+													ddosUserRegion.put(n.get("regionKey"), value);
 												}
+											}else{
+												ddosUserRegion.put(n.get("regionKey"), "");
 											}
 										}
 									}
 									if(userRegion.endsWith(Constants.USER_REGION_SPLIT)){
 										userRegion = userRegion.substring(0, userRegion.length()-1);
+									}else if(!StringUtil.isEmpty(ddosUserRegion)){
+										userRegion = new Gson().toJson(ddosUserRegion);
 									}
 								}
 								list1.add(cfg);
@@ -473,9 +478,6 @@ public class SchedulerTaskUtil {
 							ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 							if(result!=null){
 								logger.info("定时任务修改DDOS配置内容响应信息："+result.getMsg());
-								return true;
-							}else{
-								return false;
 							}
 						}else{
 							/*maatCfg = new MaatCfg();
@@ -614,9 +616,6 @@ public class SchedulerTaskUtil {
 							ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 							if(result!=null){
 								logger.info("定时任务修改文件摘要类配置内容响应信息："+result.getMsg());
-								return true;
-							}else{
-								return false;
 								}
 						}else{
 							/*maatCfg = new MaatCfg();
@@ -776,9 +775,6 @@ public class SchedulerTaskUtil {
 							ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 							if(result!=null){
 								logger.info("定时任务更新APP POLICY配置内容响应信息："+result.getMsg());
-								return true;
-							}else{
-								return false;
 								}
 						}else{
 							/*maatCfg = new MaatCfg();
@@ -818,7 +814,7 @@ public class SchedulerTaskUtil {
 					
 				}else{//只修改配置状态
 					//下发并修改配置状态的参数类
-					ToUpdateMaatBeanStatus maatStatusBean = new ToUpdateMaatBeanStatus();
+					/*ToUpdateMaatBeanStatus maatStatusBean = new ToUpdateMaatBeanStatus();
 					UpdateMaatCfgStatus updateCfg = new UpdateMaatCfgStatus();
 					List<UpdateMaatCfgStatus> configCompileStartStopList = new ArrayList();
 					maatStatusBean.setVersion(Constants.MAAT_VERSION);
@@ -864,13 +860,45 @@ public class SchedulerTaskUtil {
 					String json=BaseService.gsonToJson(maatStatusBean);
 					logger.info("MAAT类配置启停状态修改内容："+json);
 					//调用服务启停接口
-					String result = ConfigServiceUtil.configStatusUpdate(json);
+					ToMaatResult result = ConfigServiceUtil.put(json,1);
 					if(result!=null){
-						logger.info("MAAT类配置启停状态修改结果："+result);
+						logger.info("MAAT类配置启停状态修改结果："+result.getMsg());
 					}else{
 						return false;
+					}*/
+					
+					//ip spoofing					
+					if(serviceId.equals(518)){
+						entity.setCompileId(compileId);
+						List<CfgIndexInfo> list = configSynchronizationDao.getCfgIndexList(entity);
+						entity.setCompileId(compileId);
+						for(CfgIndexInfo cfg:list){
+							if(isValid==0){
+								PxyObjSpoofingIpPool pool=new PxyObjSpoofingIpPool();
+								pool.setCfgId(Long.valueOf(cfg.getUserRegion3()));
+								pool = configSynchronizationDao.getPxyObjSpoofingIpPool(pool.getCfgId());
+								List<PxyObjSpoofingIpPool> poolList = new ArrayList<PxyObjSpoofingIpPool>();
+								pool.setIsValid(0);
+								pool.setCompileId(pool.getCompileId());
+								pool.setServiceId(pool.getServiceId());
+								poolList.add(pool);
+								//调用服务接口取消配置
+								String json=BaseService.gsonToJson(poolList);
+								logger.info("欺骗IP池配置配置参数："+json);
+								//调用服务接口取消配置
+								try {
+									ToMaatResult result = ConfigServiceUtil.put(json, 2);
+									logger.info("欺骗IP池配置响应信息："+result.getMsg());
+								} catch (Exception e) {
+									e.printStackTrace();
+									logger.info("欺骗IP池配置配置失败");
+									throw e;
 								}
-					/*maatCfg = new MaatCfg();
+							}
+						}
+					}	
+					
+					maatCfg = new MaatCfg();
 					maatCfg.initDefaultValue();
 					maatBean = new ToMaatBean();		
 					configCompileList = new ArrayList();
@@ -880,7 +908,7 @@ public class SchedulerTaskUtil {
 					configCompileList.add(maatCfg);
 					maatBean.setConfigCompileList(configCompileList);
 					maatBean.setAuditTime(entity.getAuditTime());
-					maatBean.setCreatorName(entity.getCurrentUser().getName());
+					maatBean.setCreatorName("TaskScheduler");
 					maatBean.setVersion(Constants.MAAT_VERSION);
 					maatBean.setOpAction(Constants.UPDATE_ACTION);
 					//调用服务接口取消配置
@@ -888,7 +916,7 @@ public class SchedulerTaskUtil {
 					logger.info("定时器修改配置状态："+json);
 					//调用服务接口下发配置
 					ToMaatResult result = ConfigServiceUtil.put(json,1);
-					logger.info("定时器修改配置状态响应时间："+result.getMsg());*/
+					logger.info("定时器修改配置状态响应时间："+result.getMsg());
 				}
 				
 			}else if("2".equals(serviceType)){//回调类配置
@@ -948,17 +976,11 @@ public class SchedulerTaskUtil {
 					//调用服务接口修改回调类配置状态
 					ToMaatResult result = ConfigServiceUtil.put(json,2);
 					logger.info("定时器修改回调类配置状态响应信息："+result);
-					if(result==null){
-						return false;
-					}else{
-						return true;
-					}
 			    }
 				
 			}
 				
 		}
-		return true;
 	}
 	//定时器非前台业务，需要设置shiro的SecurityManager
 	private void SecurityManagerInit(){

src/main/java/com/nis/util/excel/ExportExcel.java

@@ -41,6 +41,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.SysDataDictionaryItem;
@@ -453,6 +454,19 @@ public class ExportExcel {
 			}
 			
 		}
+		if("ip_group".equals(headerStr)) {
+			commentStr="";
+				//查询dns fake ip policyGroup列表
+				List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(5);
+				if(!StringUtil.isEmpty(list)){
+					for (PolicyGroupInfo policyGroupInfo : list) {
+						commentStr=commentStr+policyGroupInfo.getServiceGroupId()+"（"+policyGroupInfo.getGroupName()+"）\n";
+						index++;
+					}
+				}
+				commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+				index++;
+		}
 		if("isp".equals(headerStr)) {
 			commentStr="";
 			List<Integer> itTypeList = new ArrayList<Integer>();
@@ -2233,7 +2247,9 @@ public class ExportExcel {
 	 * @return list 数据列表
 	 */
 	public <E> ExportExcel setDataList(Properties msgProp, Map<String,List> dataMap, Map<Object,Object> map){
+		long start=System.currentTimeMillis(),end=System.currentTimeMillis();
 		Set<String> keyList=dataMap.keySet();
+		Map<String,Map<String,String>> dictMaps=Maps.newConcurrentMap();
 		for (String key : keyList) {
 			List<E> list=dataMap.get(key);
 			for (E e : list){
@@ -2263,7 +2279,16 @@ public class ExportExcel {
 								val = getBasicInfo(ef.dictType(),map,valStr);
 							}else{
 								//字典数据已做国际化处理
-								String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr);
+								String dict="";
+								if(dictMaps.containsKey(ef.dictType())) {
+									Map<String,String> dictM=dictMaps.get(ef.dictType());
+									dict=dictM.containsKey(valStr)?dictM.get(valStr):valStr;
+								}else {
+									Map<String,String> dictM=DictUtils.getDictMap(ef.dictType());
+									dictMaps.put(ef.dictType(), dictM);
+									dict=dictM.containsKey(valStr)?dictM.get(valStr):valStr;
+								}
+								//String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr);
 								//如果找不到字典国际化值，把字典本身作为默认值放进去，不然导出就是空了
 								val = msgProp.getProperty(dict,dict);
 								//业务配置-stream 阻断类型中   阻断 改为 封堵（丢弃）
@@ -2332,6 +2357,8 @@ public class ExportExcel {
 				log.debug("Write success: ["+row.getRowNum()+"] "+sb.toString());
 			}
 		}
+		end=System.currentTimeMillis();
+		log.info("setDataList cost:"+(end-start));
 		return this;
 	}
 	/**
@@ -2464,6 +2491,7 @@ public class ExportExcel {
 	 * @return 
 	 */
 	public ExportExcel(Properties msgProp,List<String> titleList,Map<String,String> noExportMap,Map<String, Class<?>> clsMap, int type,String titleTime, int... groups){
+		long start=System.currentTimeMillis(),end=System.currentTimeMillis();
 		Map<String, List<String>> headerMap=new HashMap<String, List<String>>();
 		Map<String, List<String>> commentMap=new HashMap<String, List<String>>();
 		for (String title : titleList) {
@@ -2589,6 +2617,8 @@ public class ExportExcel {
 			annotationMap.put(title, annotationList);
 		}
 		initializeMultiSheet(msgProp,titleList, headerMap,commentMap,titleTime);
+		end=System.currentTimeMillis();
+		System.err.println("ExportExcel cost:"+(end-start));
 	}
 	
 	/**

src/main/java/com/nis/util/httpclient/HttpClientUtil.java

@@ -23,6 +23,7 @@ import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.config.RequestConfig;
@@ -37,6 +38,7 @@ import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.util.EntityUtils;
 import org.apache.log4j.Logger;
 
+import com.alibaba.fastjson.JSON;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.Encodes;
@@ -236,6 +238,7 @@ public class HttpClientUtil {
 	 * @return 查询结果数据json
 	 */
 	public static String getMsg(String destUrl, Map<String, Object> params, HttpServletRequest req) throws IOException {
+		long start=System.currentTimeMillis(), end=System.currentTimeMillis();
 //		RequestContext requestContext = new RequestContext(req);
 		
 //		CloseableHttpResponse  response = null;
@@ -283,6 +286,7 @@ public class HttpClientUtil {
 				logger.error("获取消息失败，相应内容如下： " + result);
 				throw new MaatConvertException(status+"");
 			}
+			
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("获取消息失败，相应内容如下： " + result);
@@ -292,6 +296,8 @@ public class HttpClientUtil {
             if (response != null) {
                 response.close();
             }
+            end=System.currentTimeMillis();
+            logger.warn("getMsg cost:"+(end-start)+"ms");
         }
 		return result;
 	}
@@ -302,12 +308,14 @@ public class HttpClientUtil {
 	 * @return
 	 */
 	public static String galaxyMessageFormat(String recv){
-		JSONObject jobj = JSONObject.fromObject(recv);
+		long start=System.currentTimeMillis(),end=System.currentTimeMillis();
+		//JSONObject jobj = JSONObject.fromObject(recv);
+		com.alibaba.fastjson.JSONObject jobj = JSON.parseObject(recv);
 		Map<String, Object> parse = (Map<String, Object>)jobj;
     	  Map map = (Map) parse.get("data");
     	  List reslist=new ArrayList();
     	  List<Map<String,Object>> list= (List)map.get("list");
-    	  if(list!=null&&list.size()>0){
+    	  if(CollectionUtils.isNotEmpty(list)){
     	  for (Map<String,Object> m : list) {
     		  Map recvMap = new HashMap();
     		  Iterator<Entry<String, Object>> iterator = m.entrySet().iterator();
@@ -316,12 +324,12 @@ public class HttpClientUtil {
     			  String key = next.getKey().toString();
     			  Object value = next.getValue();
     			  //处理字段为“null”情况
-				if(value!=null&&"null".equals(value)){
+				if("null".equals(value)){
 					value="";  
 				}
 				//处理时间字段为“0”情况
 			  	if("foundTime".equals(key)||"recvTime".equals(key)){
-			  		if(null!=value&&"0".equals(value)){
+			  		if("0".equals(value)){
 			  		value="";
 			  		}
 			  	}
@@ -337,6 +345,8 @@ public class HttpClientUtil {
     	  parse.put("data", map);
     	  recv = parse.toString();
     }
+    	  end=System.currentTimeMillis();
+    	 logger.info("galaxyMessageFormat cost:"+(end-start));
     	  return recv;
 }
 	

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

@@ -3516,6 +3516,8 @@ public class BaseController {
 		}
 		
 		BaseCfg batchCfg = new BaseCfg();
+		batchCfg.setIsValid(-1);
+		batchCfg.setIsAudit(0);
 		batchCfg.setEditTime(new Date());
 		batchCfg.setEditorId(UserUtils.getUser().getId());
 		
@@ -3869,7 +3871,8 @@ public class BaseController {
 		maatBean = new ToMaatBean();		
 		configCompileList = new ArrayList();
 		List list = new ArrayList();
-		List newList = new ArrayList();
+		List notAuditList = new ArrayList();
+		List auditList = new ArrayList();
 		List ids = new ArrayList();
 		List<Integer> compileIds = Lists.newArrayList();
 		if(entity.getServiceId().equals(3)){//ip drop回调类配置用了主表和子表关系
@@ -3882,9 +3885,22 @@ public class BaseController {
 				List subList = commonPolicyService.getIpDropList("ip_port_cfg", compileIds);
 				for(int i=0;i<subList.size();i++){
 					IpPortCfg cfg = (IpPortCfg) subList.get(i);
+					if(cfg.getIsValid()==1) {
 						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
 						cfg.setAuditTime(entity.getAuditTime());
-					newList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
+						cfg.setAuditorId(entity.getAuditorId());
+						//auditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId())); // 移至下发前处理
+						auditList.add(cfg);
+					}else {
+						//定时任务审核通过，配置已经失效，则
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId())); // 移至下发前处理
+						notAuditList.add(cfg);
+					}
 				}
 				
 			}
@@ -3893,47 +3909,108 @@ public class BaseController {
 				list = avCfgService.getAvFileSampleList(page,searchFileSampleCfg).getList();
 				for(int i=0;i<list.size();i++){
 					BaseCfg cfg = (BaseCfg) list.get(i);
-					cfg.setIsValid(entity.getIsValid());
-					cfg.setAuditTime(entity.getAuditTime());
 					ids.add(cfg.getCompileId());
-					newList.add(cfg);
+					if(cfg.getIsValid()==1) {
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						auditList.add(cfg);
+					}else {
+						//定时任务审核通过，配置已经失效，则
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						notAuditList.add(cfg);
+					}
+					
 				}
 			}else if(className.equals("AvSignSampleCfg")){
 				list = avCfgService.getSignSampleList(searchSignSampleCfg);
 				for(int i=0;i<list.size();i++){
 					BaseCfg cfg = (BaseCfg) list.get(i);
-					cfg.setIsValid(entity.getIsValid());
-					cfg.setAuditTime(entity.getAuditTime());
 					ids.add(cfg.getCompileId());
-					newList.add(cfg);
+					if(cfg.getIsValid()==1) {
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						auditList.add(cfg);
+					}else {
+						//定时任务审核通过，配置已经失效，则
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						notAuditList.add(cfg);
+					}
 				}
 			}else if(className.equals("PxyObjKeyring")){
 				list = pxyObjKeyringService.findPage(page, searchObjKeyringCfg).getList();
 				for(int i=0;i<list.size();i++){
 					PxyObjKeyring cfg = (PxyObjKeyring) list.get(i);
-					cfg.setIsValid(entity.getIsValid());
-					cfg.setAuditTime(entity.getAuditTime());
-					newList.add(BaseService.convertCallBackProxyObjKeyring(cfg));
 					ids.add(cfg.getCompileId());
-					/*newList.add(cfg);*/
+					if(cfg.getIsValid()==1) {
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//auditList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); // 移至下发前处理
+						auditList.add(cfg);
+					}else {
+						//定时任务审核通过，配置已经失效，则
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//notAuditList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); // 移至下发前处理
+						notAuditList.add(cfg);
+					}
 				}
 			}else if(className.equals("PxyObjTrustedCaCert")){
 				list = pxyObjKeyringService.findTrustedCertPage(page,searchTrustedCaCertCfg).getList();
 				for(int i=0;i<list.size();i++){
 					PxyObjTrustedCaCert cfg = (PxyObjTrustedCaCert) list.get(i);
-					cfg.setIsValid(entity.getIsValid());
-					cfg.setAuditTime(entity.getAuditTime());
-					newList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null));
 					ids.add(cfg.getCompileId());
+					if(cfg.getIsValid()==1) {
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null)); // 移至下发前处理
+						auditList.add(cfg);
+					}else {
+						//定时任务审核通过，配置已经失效，则
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(cfg,null)); // 移至下发前处理
+						notAuditList.add(cfg);
+					}
 				}
 				if(!StringUtil.isEmpty(ids)) {
 					list=new ArrayList<>();
 					list=commonPolicyService.getPxyObjTrustedCrlCfgListByCertId(ids);
 					for(int i=0;i<list.size();i++){
 						PxyObjTrustedCaCrl cfg = (PxyObjTrustedCaCrl) list.get(i);
+						if(cfg.getIsValid()==1) {
 							cfg.setIsValid(entity.getIsValid());
+							cfg.setIsAudit(entity.getIsAudit());
 							cfg.setAuditTime(entity.getAuditTime());
-						newList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg));
+							cfg.setAuditorId(entity.getAuditorId());
+							//auditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg)); // 移至下发前处理
+							auditList.add(cfg);
+						}else {
+							//定时任务审核通过，配置已经失效，则
+							cfg.setIsValid(entity.getIsValid());
+							cfg.setIsAudit(entity.getIsAudit());
+							cfg.setAuditTime(entity.getAuditTime());
+							cfg.setAuditorId(entity.getAuditorId());
+							//notAuditList.addAll(BaseService.convertCallBackProxyObjTrustedCa(null,cfg)); // 移至下发前处理
+							notAuditList.add(cfg);
+						}
 					}
 				}
 			}/*//批量下发时不需要单独下发CRL
@@ -3948,28 +4025,65 @@ public class BaseController {
 				list = dnsResStrategyService.findPage(page,searchDnsResStrategy).getList();
 				for(int i=0;i<list.size();i++){
 					DnsResStrategy cfg = (DnsResStrategy) list.get(i);
-					cfg.setIsValid(entity.getIsValid());
-					cfg.setAuditTime(entity.getAuditTime());
-					newList.add(BaseService.convertCallBackDnsResStrategy(cfg));
 					ids.add(cfg.getCompileId());
+					if(cfg.getIsValid()==1) {
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//auditList.add(BaseService.convertCallBackDnsResStrategy(cfg)); // 移至下发前处理
+						auditList.add(cfg);
+					}else {
+						//定时任务审核通过，配置已经失效，则
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//notAuditList.add(BaseService.convertCallBackDnsResStrategy(cfg)); // 移至下发前处理
+						notAuditList.add(cfg);
+					}
 				}
 			}else if(className.equals("DnsIpCfg")){
 				list = dnsIpCfgService.findPage(page,searchDnsIpCfg).getList();
 				for(int i=0;i<list.size();i++){
 					DnsIpCfg cfg = (DnsIpCfg) list.get(i);
-					cfg.setIsValid(entity.getIsValid());
-					cfg.setAuditTime(entity.getAuditTime());
-					newList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
 					ids.add(cfg.getCompileId());
+					if(cfg.getIsValid()==1) {
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//auditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId())); // 移至下发前处理
+						auditList.add(cfg);
+					}else {
+						//定时任务审核通过，配置已经失效，则
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						//notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getDnsStrategyId()));
+						notAuditList.add(cfg);
+					}
 				}
 			}else if(className.equals("IpPortCfg")){
 				list = commonPolicyService.getIpPortList(searchIpPortCfg);
 				for(int i=0;i<list.size();i++){
 					IpPortCfg cfg = (IpPortCfg) list.get(i);
-					cfg.setIsValid(entity.getIsValid());
-					cfg.setAuditTime(entity.getAuditTime());
-					newList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
 					ids.add(cfg.getCompileId());
+					if(cfg.getIsValid()==1) {
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						auditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
+					}else {
+						//定时任务审核通过，配置已经失效，则
+						cfg.setIsValid(entity.getIsValid());
+						cfg.setIsAudit(entity.getIsAudit());
+						cfg.setAuditTime(entity.getAuditTime());
+						cfg.setAuditorId(entity.getAuditorId());
+						notAuditList.add(BaseService.convertCallBackIp(cfg,cfg.getGroupId()));
+					}
 				}
 			}
 		}
@@ -3978,9 +4092,9 @@ public class BaseController {
 			hasData = false;
 		}
 		
-		if(!StringUtil.isEmpty(newList)) {
+		if(!StringUtil.isEmpty(auditList) || !StringUtil.isEmpty(notAuditList)) {
 			//批量修改和下发回调配置
-			commonPolicyService.auditCallBackData(newList, compileIds, ids, entity);
+			commonPolicyService.auditCallBackData(auditList,notAuditList, compileIds, ids, entity);
 		}else {
 			hasData = false;
 		}

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

@@ -29,6 +29,7 @@ import com.google.gson.reflect.TypeToken;
 import com.nis.util.Configurations;
 import com.nis.util.Constants;
 import com.nis.util.CookieUtil;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
@@ -87,6 +88,7 @@ public class LoginController extends BaseController {
 				CookieUtil.addCookie(response, "LOGINED", "false");
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		
@@ -173,6 +175,7 @@ public class LoginController extends BaseController {
 				}
 			} catch (UnsupportedEncodingException e) {
 				e.printStackTrace();
+				LogUtils.saveLog(request, null, e, null);
 			}
 			
 			
@@ -212,6 +215,7 @@ public class LoginController extends BaseController {
 			
 		} catch (Exception e) {
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:"+request.getParameter("url");
@@ -230,6 +234,7 @@ public class LoginController extends BaseController {
 			
 		} catch (Exception e) {
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:"+request.getParameter("url");

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import com.nis.domain.SysMenu;
 import com.nis.domain.configuration.HelpInfo;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.security.UserUtils;
@@ -106,6 +107,7 @@ public class SystemController  extends BaseController{
 			}
 		} catch (Exception e) {
 			logger.error("help error",e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		logger.info("menuSize:"+newList.size());
 		model.addAttribute("menuList",newList);
@@ -139,6 +141,7 @@ public class SystemController  extends BaseController{
 			}
 		} catch (Exception e) {
 			logger.error("save helpInfo error",e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return false;
 	}
@@ -167,6 +170,7 @@ public class SystemController  extends BaseController{
 			}
 		} catch (Exception e) {
 			logger.error("view helpInfo error",e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return null;
 	}
@@ -195,6 +199,7 @@ public class SystemController  extends BaseController{
 			}
 		} catch (Exception e) {
 			logger.error("view helpBakInfo error",e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return null;
 	}
@@ -209,6 +214,7 @@ public class SystemController  extends BaseController{
 			return true;
 		} catch (Exception e) {
 			logger.error("Clear Policies Error",e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return false;
 	}

src/main/java/com/nis/web/controller/basics/AsnGroupController.java

@@ -18,6 +18,7 @@ import com.nis.domain.Page;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.specific.ConfigGroupInfo;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 /**
@@ -67,7 +68,7 @@ public class AsnGroupController extends BaseController {
 	//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(AsnGroupInfo cfg,Model model,
-			RedirectAttributes redirectAttributes,String itType) {
+			RedirectAttributes redirectAttributes,String itType,HttpServletRequest request) {
 		
 		try {
 			AsnGroupInfo asnGroup=asnGroupInfoService.getGroupIdByNameAndASNId(cfg.getOrganization().trim(), cfg.getCountry().trim(), cfg.getAsnId());
@@ -80,6 +81,7 @@ public class AsnGroupController extends BaseController {
 		} catch (Exception e) {
 			logger.error("新增失败",e);
 			addMessage(redirectAttributes,"error","save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:" + adminPath + "/basics/asnGroup/asnGroupList";
@@ -94,13 +96,14 @@ public class AsnGroupController extends BaseController {
 	 */
 	//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
 	@RequestMapping(value={"delete"})
-	public String delete(RedirectAttributes redirectAttributes,String ids,String asnIds) {
+	public String delete(RedirectAttributes redirectAttributes,String ids,String asnIds,HttpServletRequest request) {
 		try {
 			asnGroupInfoService.delete(ids,asnIds);
 			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			logger.error("删除失败",e);
 			addMessage(redirectAttributes,"error","delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/basics/asnGroup/asnGroupList";
 	}

src/main/java/com/nis/web/controller/basics/AsnIpController.java

@@ -32,6 +32,7 @@ import com.nis.exceptions.MaatConvertException;
 //import com.nis.util.AsnCacheUtils;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -79,15 +80,21 @@ public class AsnIpController extends BaseController{
 	public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
 		try{
 			asnIpCfgService.saveAsnIpCfg(cfg);
+			//配置仅保存
+			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		}catch(Exception e){
-			logger.error("信息保存失败",e);
-			e.printStackTrace();
-			if(e instanceof MaatConvertException) {
-				addMessage(redirectAttributes,"error",e.getMessage());
 			}else {
-				addMessage(redirectAttributes,"error","save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("ASN IP配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("ASN IP配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -98,11 +105,21 @@ public class AsnIpController extends BaseController{
 		try{
 			
 			asnIpCfgService.update(cfg);
+			//配置仅保存
+			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
+			}
+		} catch (MaatConvertException e) {
+			logger.error("ASN IP配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
-			logger.error("信息保存失败",e);
-			e.printStackTrace();
+			logger.error("ASN IP配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:" + adminPath +"/basics/asn/list?functionId="+cfg.getFunctionId();
@@ -148,8 +165,10 @@ public class AsnIpController extends BaseController{
 				logger.error("配置下发失败：",e);
 				if(e instanceof MaatConvertException) {
 					addMessage(redirectAttributes,"error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}else {
 					addMessage(redirectAttributes,"error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 				
 			}
@@ -175,8 +194,10 @@ public class AsnIpController extends BaseController{
 				logger.error("Delete failed",e);
 				if(e instanceof MaatConvertException) {
 					addMessage(redirectAttributes,"error",e.getMessage());
+					LogUtils.saveLog(request, null, e, null);
 				}else {
 					addMessage(redirectAttributes,"error","delete_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 			
@@ -265,6 +286,7 @@ public class AsnIpController extends BaseController{
 		} catch (Exception e) {
 			logger.error("asnIp export failed",e);
 			addMessage(redirectAttributes,"error","export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}

src/main/java/com/nis/web/controller/basics/InnerProtectionListController.java

@@ -15,6 +15,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.basics.ProtectionListInfo;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 
@@ -49,25 +50,27 @@ public class InnerProtectionListController extends BaseController{
 	
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(ProtectionListInfo cfg,Model model,String itType,Integer groupType,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		try {
 			innerProtectionListService.saveOrUpdate(cfg);
 			addMessage(redirectAttributes,"success","save_success");
 		} catch (Exception e) {
 			logger.error("新增失败",e);
 			addMessage(redirectAttributes,"error","save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/basics/innerProtectionList/list";
 	}
 	
 	@RequestMapping(value={"delete"})
-	public String delete(RedirectAttributes redirectAttributes,String ids,int isValid) {
+	public String delete(RedirectAttributes redirectAttributes,String ids,int isValid,HttpServletRequest request) {
 		try {
 			innerProtectionListService.deldete(ids,isValid);
 			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			logger.error("删除失败",e);
 			addMessage(redirectAttributes,"error","delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/basics/innerProtectionList/list";
 	}
@@ -77,4 +80,31 @@ public class InnerProtectionListController extends BaseController{
 	public Map<String,List<String>> ajaxGetAllInfo(HttpServletRequest request, HttpServletResponse response){
 		return innerProtectionListService.ajaxGetAllInfo();
 	}
+	
+	/**
+	 * 校验配置是否已存在
+	 * @param cfg
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@ResponseBody
+	@RequestMapping(value = {"/checkKeywordExist"})
+	public boolean checkKeywordExist(ProtectionListInfo cfg, HttpServletRequest request, HttpServletResponse response){
+		if(!StringUtil.isEmpty(cfg.getProId())){ // 修改操作
+			ProtectionListInfo info = innerProtectionListService.getById(cfg.getProId());
+			if(info != null && info.getKeyword().equals(cfg.getKeyword()) && info.getTargetType().equals(cfg.getTargetType())){
+				return true;
+			}
+		}
+		Map<String, List<String>> map = innerProtectionListService.ajaxGetAllInfo();
+		List<String> list = map.get(cfg.getTargetType());
+		if(list != null) {
+			if(list.contains(cfg.getKeyword())) {
+				return false;
+			}
+		}
+		
+		return true;
+	}
 }

src/main/java/com/nis/web/controller/basics/IpReuseIpCfgController.java

@@ -20,6 +20,7 @@ import com.nis.domain.basics.IpReuseIpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.web.controller.BaseController;
 @Controller
 @RequestMapping(value = "${adminPath}/basics/vpn")
@@ -75,6 +76,7 @@ public class IpReuseIpCfgController extends BaseController{
 			logger.error("信息保存失败",e);
 			e.printStackTrace();
 			addMessage(redirectAttributes,"error","save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath +"/basics/vpn/list?functionId="+entity.getFunctionId();
 	}
@@ -91,6 +93,7 @@ public class IpReuseIpCfgController extends BaseController{
 			logger.error("信息保存失败",e);
 			e.printStackTrace();
 			addMessage(redirectAttributes,"error","save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath +"/basics/vpn/list?functionId="+cfg.getFunctionId();
 	}
@@ -98,7 +101,7 @@ public class IpReuseIpCfgController extends BaseController{
 	@RequiresPermissions(value={"asn:ip:config"})
 	public String delete(Integer isValid
 			,String ids,Integer functionId
-			,RedirectAttributes redirectAttributes){
+			,RedirectAttributes redirectAttributes,HttpServletRequest request){
 			try{
 				ipReuseIpCfgService.delete(isValid,ids);
 				addMessage(redirectAttributes,"success","delete_success");
@@ -106,8 +109,10 @@ public class IpReuseIpCfgController extends BaseController{
 				logger.error("Delete failed",e);
 				if(e instanceof MaatConvertException) {
 					addMessage(redirectAttributes,"error",e.getMessage());
+					LogUtils.saveLog(request, null, e, null);
 				}else {
 					addMessage(redirectAttributes,"error","delete_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 			

src/main/java/com/nis/web/controller/basics/PolicyGroupController.java

@@ -21,6 +21,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.nis.domain.Page;
 import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 /**
@@ -71,7 +72,7 @@ public class PolicyGroupController extends BaseController {
 	//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(PolicyGroupInfo cfg,Model model,
-			RedirectAttributes redirectAttributes,String itType,Integer groupType) {
+			RedirectAttributes redirectAttributes,String itType,Integer groupType,HttpServletRequest request) {
 		
 		try {
 			policyGroupInfoService.saveOrUpdate(cfg);
@@ -79,6 +80,7 @@ public class PolicyGroupController extends BaseController {
 		} catch (Exception e) {
 			logger.error("新增失败",e);
 			addMessage(redirectAttributes,"error","save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
@@ -93,13 +95,14 @@ public class PolicyGroupController extends BaseController {
 	 */
 	//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
 	@RequestMapping(value={"delete"})
-	public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid) {
+	public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid,HttpServletRequest request) {
 		try {
 			policyGroupInfoService.deldete(ids,isValid);
 			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			logger.error("删除失败",e);
 			addMessage(redirectAttributes,"error","delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
 	}
@@ -194,6 +197,7 @@ public class PolicyGroupController extends BaseController {
 			} catch (Exception e) {
 				logger.error("Group export failed",e);
 				addMessage(redirectAttributes,"error","export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 		}

src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java

@@ -29,6 +29,7 @@ import com.nis.util.ConfigDictUtils;
 import com.nis.util.Configurations;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
@@ -52,7 +53,7 @@ public class ServiceDictInfoController extends BaseController {
 
 	@ResponseBody
 	@RequestMapping(value="requestCancleInfoAjax", method = RequestMethod.POST)
-	public String requestCancleInfoAjax(Integer cancelRequestId,String ids,String indexTable){
+	public String requestCancleInfoAjax(Integer cancelRequestId,String ids,String indexTable,HttpServletRequest request){
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			for(String id :idArray){
@@ -61,6 +62,7 @@ public class ServiceDictInfoController extends BaseController {
 				} catch (Exception e) {
 						e.printStackTrace();
 						logger.error("审核添加取消来函信息失败",e);
+						LogUtils.saveLog(request, null, e, null);
 						return  "false";
 				}
 			}
@@ -76,7 +78,7 @@ public class ServiceDictInfoController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value="requestCancleInfoNumber")
-	public Map requestCancleInfoNumber(String ids,String indexTable){
+	public Map requestCancleInfoNumber(String ids,String indexTable,HttpServletRequest request){
 		List list = new ArrayList();
 		String requestTitle="";
 		Map map=new HashMap();
@@ -94,6 +96,7 @@ public class ServiceDictInfoController extends BaseController {
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("查询取消审核来函信息失败",e);
+					LogUtils.saveLog(request, null, e, null);
 					return  map;
 				}
 //			}
@@ -207,7 +210,7 @@ public class ServiceDictInfoController extends BaseController {
 	 */
 	@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:vpn_ip:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:vpn_ip:edit"},logical=Logical.OR)
 	@RequestMapping(value = "saveOrUpdate")
-	public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType) {
+	public String saveOrUpdate(ServiceDictInfo serviceDictInfo,Model model, RedirectAttributes redirectAttributes,String itType,HttpServletRequest request) {
 		
 		try {
 			serviceDictInfoService.saveOrUpdate(serviceDictInfo);
@@ -215,6 +218,7 @@ public class ServiceDictInfoController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			addMessage(redirectAttributes,"error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
@@ -231,7 +235,7 @@ public class ServiceDictInfoController extends BaseController {
 	 */
 	@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del","basics:vpn_ip:del"},logical=Logical.OR)
 	@RequestMapping(value={"delete"})
-	public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
+	public String delete(ServiceDictInfo serviceDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId,HttpServletRequest request) {
 		try {
 			String exIp="";
 			String id="";
@@ -266,6 +270,7 @@ public class ServiceDictInfoController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			addMessage(redirectAttributes,"error", "delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/basics/serviceDictInfo/list?itType="+itType;
 	}
@@ -586,6 +591,7 @@ public class ServiceDictInfoController extends BaseController {
 			} catch (Exception e) {
 				logger.error("dict white export failed", e);
 				addMessage(redirectAttributes, "error", "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		

src/main/java/com/nis/web/controller/basics/SysDictInfoController.java

@@ -25,6 +25,7 @@ import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.util.ConfigDictUtils;
 import com.nis.util.Configurations;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
@@ -151,7 +152,7 @@ public class SysDictInfoController extends BaseController {
 	 */
 	@RequiresPermissions(value={"basics:area:add","basics:isp:add","basics:scope:add","basics:area:edit","basics:isp:edit","basics:scope:edit"},logical=Logical.OR)
 	@RequestMapping(value = "saveOrUpdate")
-	public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType) {
+	public String saveOrUpdate(SysDictInfo sysDictInfo,Model model, RedirectAttributes redirectAttributes, String itType,HttpServletRequest request) {
 		
 		try {
 			sysDictInfoService.saveOrUpdate(sysDictInfo);
@@ -159,6 +160,7 @@ public class SysDictInfoController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			addMessage(redirectAttributes,"error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
@@ -172,13 +174,14 @@ public class SysDictInfoController extends BaseController {
 	 */
 	@RequiresPermissions(value={"basics:area:del","basics:isp:del","basics:scope:del"},logical=Logical.OR)
 	@RequestMapping(value={"delete"})
-	public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId) {
+	public String delete(SysDictInfo sysDictInfo, RedirectAttributes redirectAttributes, String itType, String mulitId,HttpServletRequest request) {
 		try {
 			sysDictInfoService.deleteDict(mulitId);
 			addMessage(redirectAttributes,"success", "delete_success");
 		} catch (Exception e) {
 			e.printStackTrace();
 			addMessage(redirectAttributes,"error", "delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/basics/sysDictInfo/list?itType="+itType;
 	}

src/main/java/com/nis/web/controller/basics/TaskInfoController.java

@@ -24,6 +24,7 @@ import com.nis.domain.configuration.RequestInfo;
 import com.nis.domain.configuration.TaskInfo;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExcelField;
 import com.nis.web.controller.BaseController;
@@ -90,6 +91,7 @@ public class TaskInfoController extends BaseController{
 			logger.error(e.getMessage());
 			e.printStackTrace();
 			addMessage(redirectAttributes,"error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/basics/taskInfo/list?functionId="+taskInfo.getFunctionId()+"&repage";
 	}
@@ -233,6 +235,7 @@ public class TaskInfoController extends BaseController{
 		} catch (Exception e) {
 			logger.error("ip addr export failed",e);
 			addMessage(redirectAttributes,"error",  "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}

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

@@ -12,6 +12,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.taglibs.standard.functions.Functions;
@@ -55,6 +56,7 @@ import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -153,7 +155,7 @@ public class AppCfgController extends BaseController {
 	public String ajaxSslSubList(Model model, Long cfgId, Integer index, Integer compileId) {
 		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId, compileId);
 		List<String[]> tabList = new ArrayList();
-		if (cfg.getIpPortList() != null) {
+		if (CollectionUtils.isNotEmpty(cfg.getIpPortList())) {
 			String cfgType = null;
 			for (IpPortCfg ip : cfg.getIpPortList()) {
 				if (!ip.getCfgType().equals(cfgType)) {
@@ -162,7 +164,7 @@ public class AppCfgController extends BaseController {
 				}
 			}
 		}
-		if (cfg.getNtcSubscribeIdCfgList() != null) {
+		if (CollectionUtils.isNotEmpty(cfg.getNtcSubscribeIdCfgList())) {
 			String cfgType = null;
 			for (NtcSubscribeIdCfg ntc : cfg.getNtcSubscribeIdCfgList()) {
 				if (!ntc.getCfgType().equals(cfgType)) {
@@ -219,15 +221,21 @@ public class AppCfgController extends BaseController {
 				entity.setAppCode(specificService.getSpecServiceCode());
 			}
 			appCfgService.saveOrUpdateAppPolicyCfg(entity);
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			logger.error("saveAppPolicyCfg failed", e);
-			e.printStackTrace();
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", "request_service_failed");
 			}else {
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("app 协议配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("app 协议配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/app/policyCfgList?functionId=" + entity.getFunctionId();
@@ -255,20 +263,20 @@ public class AppCfgController extends BaseController {
 				entity = appCfgService.getAppPolicyCfg(Long.parseLong(id), null);
 				entity.setIsAudit(isAudit);
 				entity.setIsValid(isValid);
-				entity.setAuditorId(UserUtils.getUser().getId());
-				entity.setAuditTime(new Date());
 				entity.setFunctionId(functionId);
 				entity.setConfigType(Constants.SPECIFIC_SERVICE_CFG_TYPE_APP);
 				try {
-					appCfgService.auditAppPolicyCfg(entity, isAudit);
+					appCfgService.auditAppPolicyCfg(entity, isAudit,Constants.INSERT_ACTION);
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("app策略配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -284,8 +292,10 @@ public class AppCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -321,8 +331,10 @@ public class AppCfgController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -394,15 +406,21 @@ public class AppCfgController extends BaseController {
 				entity.setAppCode(specificService.getSpecServiceCode());
 			}
 			appCfgService.saveOrUpdateAppIpCfg(entity);
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			e.printStackTrace();
-			logger.error("saveAppIpCfg failed", e);
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", "request_service_failed");
 			}else {
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		}catch (MaatConvertException e) {
+			logger.error("APP IP配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("APP IP配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/app/ipCfgList?functionId=" + entity.getFunctionId();
@@ -432,10 +450,7 @@ public class AppCfgController extends BaseController {
 				entity = appCfgService.getAppIpCfg(Long.parseLong(id));
 				entity.setIsAudit(isAudit);
 				entity.setIsValid(isValid);
-				entity.setAuditorId(UserUtils.getUser().getId());
-				entity.setAuditTime(new Date());
 				entity.setFunctionId(functionId);
-				entity.setTableName(AppIpCfg.getTablename());
 				if (dataMap.containsKey(entity.getCompileId())) {
 					dataMap.get(entity.getCompileId()).add(entity);
 				} else {
@@ -453,8 +468,10 @@ public class AppCfgController extends BaseController {
 					logger.error("app协议IP配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -470,8 +487,10 @@ public class AppCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -507,8 +526,10 @@ public class AppCfgController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -588,8 +609,10 @@ public class AppCfgController extends BaseController {
 			logger.error("saveAppHttpCfg failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -629,8 +652,10 @@ public class AppCfgController extends BaseController {
 					logger.error("app http配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -646,8 +671,10 @@ public class AppCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -737,14 +764,21 @@ public class AppCfgController extends BaseController {
 				entity.setAppCode(specificService.getSpecServiceCode());
 			}
 			appCfgService.saveOrUpdateAppDomainCfg(entity);
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			e.printStackTrace();
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", "request_service_failed");
 			}else {
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("APP域名配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("APP域名配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/app/domainCfgList?functionId=" + entity.getFunctionId();
@@ -772,19 +806,19 @@ public class AppCfgController extends BaseController {
 				entity = appCfgService.getAppDomainCfg(Long.parseLong(id));
 				entity.setIsAudit(isAudit);
 				entity.setIsValid(isValid);
-				entity.setAuditorId(UserUtils.getUser().getId());
-				entity.setAuditTime(new Date());
 				entity.setFunctionId(functionId);
 				try {
-					appCfgService.auditAppDomainCfg(entity, isAudit);
+					appCfgService.auditAppDomainCfg(entity, isAudit,Constants.INSERT_ACTION);
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("app协议domain配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -800,8 +834,10 @@ public class AppCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -836,8 +872,10 @@ public class AppCfgController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -915,8 +953,10 @@ public class AppCfgController extends BaseController {
 			logger.error("saveAppByteCfg failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -936,7 +976,7 @@ public class AppCfgController extends BaseController {
 	@RequestMapping(value = { "auditAppByteCfg" })
 	// @RequiresPermissions(value={"app:byte:confirm"})
 	public String auditAppByteCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		AppByteCfg entity = new AppByteCfg();
 		String[] idArray = ids.split(",");
 		for (String id : idArray) {
@@ -954,8 +994,10 @@ public class AppCfgController extends BaseController {
 				logger.error("app协议byte配置下发失败", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		}
@@ -1048,8 +1090,10 @@ public class AppCfgController extends BaseController {
 			logger.error("saveAppSslCfg failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -1088,8 +1132,10 @@ public class AppCfgController extends BaseController {
 					logger.error("app SSL配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -1105,8 +1151,10 @@ public class AppCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -1203,8 +1251,10 @@ public class AppCfgController extends BaseController {
 			logger.error("saveAppTcpCfg failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -1239,7 +1289,7 @@ public class AppCfgController extends BaseController {
 	@RequestMapping(value = { "auditAppTcpCfg" })
 	@RequiresPermissions(value = { "app:tcp:confirm" })
 	public String auditAppTcpCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		AppTcpCfg entity = new AppTcpCfg();
 		String[] idArray = ids.split(",");
 		for (String id : idArray) {
@@ -1256,8 +1306,10 @@ public class AppCfgController extends BaseController {
 				logger.error("app SSL配置下发失败", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		}
@@ -1335,8 +1387,10 @@ public class AppCfgController extends BaseController {
 			logger.error("saveAppHeaderCfg failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -1356,7 +1410,7 @@ public class AppCfgController extends BaseController {
 	@RequestMapping(value = { "auditAppHeaderCfg" })
 	@RequiresPermissions(value = { "app:header:confirm" })
 	public String auditAppHeaderCfg(Integer isAudit, Integer isValid, String ids, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		AppHeaderCfg entity = new AppHeaderCfg();
 		String[] idArray = ids.split(",");
 		for (String id : idArray) {
@@ -1374,8 +1428,10 @@ public class AppCfgController extends BaseController {
 				logger.error("app Header配置下发失败", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		}
@@ -1507,18 +1563,21 @@ public class AppCfgController extends BaseController {
 				entity.setCfgKeywords(entity.getCfgKeywords());
 			}
 			appCfgService.saveOrUpdateAppTopicDomainCfg(entity);
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			if (e instanceof MaatConvertException) {
-				e.printStackTrace();
-				logger.info("app主题网站配置下发失败：" + e.getMessage());
-				;
-				addMessage(redirectAttributes, "error", "request_service_failed");
 			}else {
-				e.printStackTrace();
-				logger.error("app主题网站配置下发失败", e);
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("APP主题网站配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("APP主题网站配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/app/topicDomainCfgList?functionId=" + entity.getFunctionId();
@@ -1546,18 +1605,18 @@ public class AppCfgController extends BaseController {
 				entity = appCfgService.getAppTopicDomainCfg(Long.parseLong(id));
 				entity.setIsAudit(isAudit);
 				entity.setIsValid(isValid);
-				entity.setAuditorId(UserUtils.getUser().getId());
-				entity.setAuditTime(new Date());
 				entity.setFunctionId(functionId);
 				try {
-					appCfgService.auditAppTopicDomainCfg(entity, isAudit);
+					appCfgService.auditAppTopicDomainCfg(entity, isAudit,Constants.INSERT_ACTION);
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (Exception e) {
 					logger.error("app主题网站配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -1573,8 +1632,10 @@ public class AppCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -1609,10 +1670,13 @@ public class AppCfgController extends BaseController {
 			logger.error("app主题网站删除失败", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof CallExternalProceduresException) {
 				addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/app/topicDomainCfgList?functionId=" + functionId;
@@ -1679,8 +1743,10 @@ public class AppCfgController extends BaseController {
 			logger.error("appBuiltinFeatureFileSaveOrUpdate failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -1711,7 +1777,7 @@ public class AppCfgController extends BaseController {
 	@RequestMapping(value = { "/audit" })
 	@RequiresPermissions(value = { "app:built_in_file:confirm" })
 	public String audit(Integer isAudit, Integer isValid, String ids, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		if (!StringUtil.isEmpty(ids)) {
 			String[] idArray = ids.split(",");
 			Date auditTime = new Date();
@@ -1724,8 +1790,10 @@ public class AppCfgController extends BaseController {
 					logger.error("appBuiltinFeature audit failed", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -1887,6 +1955,7 @@ public class AppCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("ip addr export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1959,6 +2028,7 @@ public class AppCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("top export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2025,6 +2095,7 @@ public class AppCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("appIp export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2099,6 +2170,7 @@ public class AppCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("http export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2171,6 +2243,7 @@ public class AppCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("Domain export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -2244,6 +2317,7 @@ public class AppCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("App ssl export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -58,6 +58,7 @@ import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -142,14 +143,21 @@ public class AppFeatureCfgController extends BaseController {
 				entity.setAppCode(specificService.getSpecServiceCode());
 			}
 			appMultiFeatureCfgService.saveOrUpdateAppFeatureCfg(entity);
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			e.printStackTrace();
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", "request_service_failed");
 			}else {
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("APP 特征配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("APP 特征配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/app/feature/multiFeatureCfgList?functionId=" + entity.getFunctionId();
@@ -176,20 +184,20 @@ public class AppFeatureCfgController extends BaseController {
 				entity = appMultiFeatureCfgService.getAppFeatureIndex(Long.parseLong(id));
 				entity.setIsAudit(isAudit);
 				entity.setIsValid(isValid);
-				entity.setAuditorId(UserUtils.getUser().getId());
-				entity.setAuditTime(new Date());
 				entity.setFunctionId(functionId);
 				try {
-					appMultiFeatureCfgService.auditAppFeatureCfg(entity, isAudit);
+					appMultiFeatureCfgService.auditAppFeatureCfg(entity, isAudit,Constants.INSERT_ACTION);
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (MaatConvertException e) {
 					e.printStackTrace();
 					logger.error("app 特征配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("app 特征配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		} else {
@@ -204,8 +212,10 @@ public class AppFeatureCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -240,8 +250,10 @@ public class AppFeatureCfgController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -433,6 +445,7 @@ public class AppFeatureCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("Appfeature export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -36,6 +36,7 @@ import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -158,18 +159,25 @@ public class BasicProtocolController extends BaseController {
 				entity.setAppCode(specificService.getSpecServiceCode());
 			}
 			appCfgService.saveOrUpdateAppPolicyCfg(entity);
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			e.printStackTrace();
-			logger.error("基础协议信息保存失败", e);
-			if (e instanceof MaatConvertException) {
-				// addMessage(redirectAttributes,e.getMessage());
-				addMessage(redirectAttributes, "error", "request_service_failed");
-			} else if (e instanceof CallExternalProceduresException) {
-				addMessage(redirectAttributes, "error", "call_external_procedures_failed");
 			}else {
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("基础协议配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (CallExternalProceduresException e) {
+			logger.error("调用外部程序出错：",e);
+			addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("基础协议配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/basicprotocol/list?functionId=" + entity.getFunctionId();
@@ -197,12 +205,10 @@ public class BasicProtocolController extends BaseController {
 				entity = appCfgService.getAppPolicyCfg(Long.parseLong(id), null);
 				entity.setIsAudit(isAudit);
 				entity.setIsValid(isValid);
-				entity.setAuditorId(UserUtils.getUser().getId());
-				entity.setAuditTime(new Date());
 				entity.setFunctionId(functionId);
 				entity.setConfigType(Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL);
 				try {
-					appCfgService.auditAppPolicyCfg(entity, isAudit);
+					appCfgService.auditAppPolicyCfg(entity, isAudit,Constants.INSERT_ACTION);
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (Exception e) {
 					if (e instanceof MaatConvertException) {
@@ -210,10 +216,12 @@ public class BasicProtocolController extends BaseController {
 						logger.info("app策略配置下发失败：" + e.getMessage());
 						;
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						e.printStackTrace();
 						logger.error("app策略配置下发失败", e);
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 
 				}
@@ -230,8 +238,10 @@ public class BasicProtocolController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -267,8 +277,10 @@ public class BasicProtocolController extends BaseController {
 				addMessage(redirectAttributes, "error", "request_service_failed");
 			} else if (e instanceof CallExternalProceduresException) {
 				addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/basicprotocol/list?functionId=" + functionId;
@@ -395,6 +407,7 @@ public class BasicProtocolController extends BaseController {
 		} catch (Exception e) {
 			logger.error("ip addr export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -29,6 +29,7 @@ import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.BaseService;
@@ -78,6 +79,7 @@ public class ConfigSynchronizationController  extends BaseController {
 				            Thread.sleep(60000);
 				        } catch (InterruptedException e) {
 				            e.printStackTrace(); 
+				            LogUtils.saveLog(request, null, e, null);
 				        }
 					}
 				}
@@ -101,19 +103,26 @@ public class ConfigSynchronizationController  extends BaseController {
 			status = 1;
 		} catch (NoSuchFieldException e) {
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 		} catch (SecurityException e) {
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 		} catch (IllegalArgumentException e) {
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 		} catch (IllegalAccessException e) {
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 		} catch (ClassNotFoundException e) {
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 		}catch(MaatConvertException e){
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 			status = -1;
 		}catch (Exception e) {
 			e.printStackTrace();
+			LogUtils.saveLog(request, null, e, null);
 		}finally{
 			if(status!=1){
 				SysDataDictionaryName sysDictName = new SysDataDictionaryName();
@@ -172,6 +181,7 @@ public class ConfigSynchronizationController  extends BaseController {
 			            Thread.sleep(60000);
 			        } catch (InterruptedException e) {
 			            e.printStackTrace(); 
+			            LogUtils.saveLog(request, null, e, null);
 			        }
 				}
 				

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

@@ -11,6 +11,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
@@ -34,6 +35,7 @@ import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -112,7 +114,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 	public String ajaxSslSubList(Model model, Long cfgId, Integer index, Integer compileId) {
 		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId, compileId);
 		List<String[]> tabList = new ArrayList();
-		if (cfg.getIpPortList() != null) {
+		if (CollectionUtils.isNotEmpty(cfg.getIpPortList())) {
 			String cfgType = null;
 			for (IpPortCfg ip : cfg.getIpPortList()) {
 				if (!ip.getCfgType().equals(cfgType)) {
@@ -121,7 +123,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 				}
 			}
 		}
-		if (cfg.getNtcSubscribeIdCfgList() != null) {
+		if (CollectionUtils.isNotEmpty(cfg.getNtcSubscribeIdCfgList())) {
 			String cfgType = null;
 			for (NtcSubscribeIdCfg ntc : cfg.getNtcSubscribeIdCfgList()) {
 				if (!ntc.getCfgType().equals(cfgType)) {
@@ -178,17 +180,25 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 				entity.setAppCode(specificService.getSpecServiceCode());
 			}
 			appCfgService.saveOrUpdateAppPolicyCfg(entity);
+			//配置仅保存
+			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			e.printStackTrace();
-			logger.error("加密隧道信息保存失败", e);
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", "request_service_failed");
-			} else if (e instanceof CallExternalProceduresException) {
-				addMessage(redirectAttributes, "error", "call_external_procedures_failed");
 			}else {
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("加密隧道行为配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (CallExternalProceduresException e) {
+			logger.error("调用外部程序出错：",e);
+			addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("加密隧道行为配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/encryptedtunnelbehav/list?functionId=" + entity.getFunctionId();
@@ -221,7 +231,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 				entity.setFunctionId(functionId);
 				entity.setConfigType(Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR);
 				try {
-					appCfgService.auditAppPolicyCfg(entity, isAudit);
+					appCfgService.auditAppPolicyCfg(entity, isAudit,Constants.INSERT_ACTION);
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (Exception e) {
 					if (e instanceof MaatConvertException) {
@@ -229,10 +239,12 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 						logger.info("加密隧道配置下发失败：" + e.getMessage());
 						;
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						e.printStackTrace();
 						logger.error("加密隧道配置下发失败", e);
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -249,8 +261,10 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -286,10 +300,13 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 			logger.error("加密隧道协议保存失败", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof CallExternalProceduresException) {
 				addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/encryptedtunnelbehav/list?functionId=" + functionId;
@@ -437,6 +454,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 		} catch (Exception e) {
 			logger.error("TunnelBehavior export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -2,6 +2,7 @@ package com.nis.web.controller.configuration;
 
 import java.util.List;
 
+import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -16,6 +17,7 @@ import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.GroupAreaInfo;
 import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.configuration.GroupAreaService;
@@ -65,7 +67,7 @@ public class GroupAreaController extends BaseController {
 	}
 	
 	@RequestMapping(value = "saveOrUpdate")
-	public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes) {
+	public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		try {
 			groupAreaService.saveOrUpdate(cfg);
 			addMessage(redirectAttributes,"success","save_success");
@@ -73,23 +75,27 @@ public class GroupAreaController extends BaseController {
 			logger.error("新增失败",e);
 			if(e instanceof MaatConvertException) {
 				addMessage(redirectAttributes,"error","request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}else if(e instanceof CallExternalProceduresException) {
 				addMessage(redirectAttributes,"error","call_external_procedures_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}else {
 				addMessage(redirectAttributes,"error","save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
 	}
 	
 	@RequestMapping(value={"delete"})
-	public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
+	public String delete(RedirectAttributes redirectAttributes, String ids,int isValid,HttpServletRequest request) {
 		try {
 			groupAreaService.deldete(ids,isValid);
 			addMessage(redirectAttributes,"success","delete_success");
 		} catch (Exception e) {
 			logger.error("删除失败",e);
 			addMessage(redirectAttributes,"error","delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
 	}

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

@@ -23,6 +23,7 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.nis.domain.log.BaseLogEntity;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -73,7 +74,7 @@ public class LogSearchController extends BaseController{
 	
 	@RequestMapping(value="actionLogTrend")
 	@ResponseBody
-	public List actionTrans(String cfgId,String beginDate,String endDate,String serviceId){
+	public List actionTrans(String cfgId,String beginDate,String endDate,String serviceId,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List resultList = new ArrayList();
 		String url = Constants.LOG_BASE_URL+Constants.NTC_PZ_REPORT;
@@ -96,6 +97,7 @@ public class LogSearchController extends BaseController{
 		} catch (Exception e) {
 			e.printStackTrace();
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}

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

@@ -26,6 +26,7 @@ import com.nis.domain.configuration.TaskInfo;
 import com.nis.domain.log.BaseLogEntity;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExcelField;
 import com.nis.web.controller.BaseController;
@@ -124,6 +125,7 @@ public class RequestInfoController extends BaseController{
 			logger.error(e.getMessage());
 			e.printStackTrace();
 			addMessage(model,"error","save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/cfg/request/list?functionId="+requestInfo.getFunctionId()+"&repage";
 	}
@@ -286,6 +288,7 @@ public class RequestInfoController extends BaseController{
 			} catch (Exception e) {
 				logger.error("ip addr export failed",e);
 				addMessage(redirectAttributes,"error",  "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 		}

src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java

@@ -24,6 +24,7 @@ import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.DnsIpCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 
@@ -69,7 +70,7 @@ public class DnsIpCfgController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = { "initSpoofingIp" })
-	public String initSpoofingIp() {
+	public String initSpoofingIp(HttpServletRequest request) {
 		Properties msg = getMsgProp();
 		try {
 			DnsIpCfg entity = new DnsIpCfg();
@@ -84,8 +85,10 @@ public class DnsIpCfgController extends BaseController {
 			logger.error("初始化Spoofing ip失败", e);
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
+				LogUtils.saveLog(request, null, e, null);
 				return msg.getProperty("request_service_failed");
 			} else {
+				LogUtils.saveLog(request, null, e, null);
 				return msg.getProperty("save_failed");
 			}
 		}
@@ -98,15 +101,21 @@ public class DnsIpCfgController extends BaseController {
 			@ModelAttribute("cfg") DnsIpCfg cfg, RedirectAttributes redirectAttributes) {
 		try {
 			dnsIpCfgService.saveOrUpdate(cfg);
+			//配置仅保存
+			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			logger.error("信息保存失败", e);
-			e.printStackTrace();
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", "request_service_failed");
 			}else {
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("DNS欺骗ip配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("DNS欺骗ip配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/cfg/dnsIp/list?functionId=" + cfg.getFunctionId();
@@ -129,8 +138,10 @@ public class DnsIpCfgController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -153,10 +164,12 @@ public class DnsIpCfgController extends BaseController {
 					e.printStackTrace();
 					logger.info("dns fake ip配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.info("dns fake ip配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -173,8 +186,10 @@ public class DnsIpCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -267,8 +282,10 @@ public class DnsIpCfgController extends BaseController {
 			logger.error("DnsIp export failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		// return "redirect:" + adminPath

src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java

@@ -28,6 +28,7 @@ import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 
@@ -80,11 +81,21 @@ public class DnsResStrategyController extends BaseController {
 
 			dnsResStrategyService.saveOrUpdate(cfg);
 
+			//配置仅保存
+			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
+			}else {
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
+			}
 		} catch (MaatConvertException e) {
+			logger.error("DNS响应策略配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
+			logger.error("DNS响应策略配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/maintenance/dnsResStrategy/list?functionId=" + cfg.getFunctionId();
@@ -118,8 +129,10 @@ public class DnsResStrategyController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -140,8 +153,10 @@ public class DnsResStrategyController extends BaseController {
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (MaatConvertException e) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 
@@ -157,8 +172,10 @@ public class DnsResStrategyController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -242,8 +259,10 @@ public class DnsResStrategyController extends BaseController {
 			logger.error("Dns export failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		// return "redirect:" + adminPath

src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java

@@ -24,6 +24,7 @@ import com.nis.domain.configuration.IpAddrPoolCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
@@ -81,8 +82,10 @@ public class IpAddrPoolController extends BaseController{
 			e.printStackTrace();
 			if(e instanceof MaatConvertException) {
 				addMessage(redirectAttributes,"error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}else {
 				addMessage(redirectAttributes,"error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		
@@ -91,7 +94,7 @@ public class IpAddrPoolController extends BaseController{
 	
 	@RequestMapping(value = {"/snatAudit"})
 	@RequiresPermissions(value={"ip:mulitiplex:pool:confirm"})
-	public String snataudit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
+	public String snataudit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
@@ -104,8 +107,10 @@ public class IpAddrPoolController extends BaseController{
 					logger.error("SNAT地址池配置下发失败："+e.getMessage());
 					if(e instanceof MaatConvertException) {
 						addMessage(redirectAttributes,"error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}else {
 						addMessage(redirectAttributes,"error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -138,6 +143,7 @@ public class IpAddrPoolController extends BaseController{
 		}catch(Exception e){
 			logger.error(e);
 			addMessage(redirectAttributes,"error","delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
 	}
@@ -282,6 +288,7 @@ public class IpAddrPoolController extends BaseController{
 		} catch (Exception e) {
 			logger.error("ip white export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 

src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java

@@ -24,6 +24,7 @@ import com.nis.domain.configuration.IpMultiplexPoolCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.service.basics.SysDictInfoService;
@@ -72,8 +73,10 @@ public class IpMultiplexPoolCfgController extends BaseController {
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -103,6 +106,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error(e);
 			addMessage(redirectAttributes, "error", "delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/maintenance/ipMultiplexPoolCfg/list?functionId=" + functionId;
 	}
@@ -110,7 +114,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
 	@RequestMapping(value = { "/audit" })
 	@RequiresPermissions(value = { "ip:mulitiplex:pool:confirm" })
 	public String audit(Integer isAudit, Integer isValid, String ids, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		if (!StringUtil.isEmpty(ids)) {
 			String[] idArray = ids.split(",");
 			Date auditTime = new Date();
@@ -126,6 +130,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
 					e.printStackTrace();
 					logger.info("IP复用地址池配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 
@@ -309,6 +314,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("snat export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -370,6 +376,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("dnat export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java

@@ -30,6 +30,7 @@ import com.nis.domain.configuration.UserManage;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
@@ -110,10 +111,12 @@ public class UserManageController  extends BaseController{
 							} catch (MaatConvertException e) {
 								message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("delete_failed");
 								logger.error("用户vpn新增失败",e);
+								LogUtils.saveLog(request, null, e, null);
 								throw e;
 							}catch (Exception e) {
 								message=msgProp.getProperty("user")+" "+user.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("delete_failed");
 								logger.error("用户vpn新增失败",e);
+								LogUtils.saveLog(request, null, e, null);
 								throw e;
 							}
 						}
@@ -134,8 +137,10 @@ public class UserManageController  extends BaseController{
 				}
 				if(!StringUtil.isEmpty(e.getMessage())) {
 					addMessage(redirectAttributes,"error",e.getMessage());
+					LogUtils.saveLog(request, null, e, null);
 				}else {
 					addMessage(redirectAttributes,"error",message);
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 			
@@ -181,10 +186,12 @@ public class UserManageController  extends BaseController{
 						} catch (MaatConvertException e) {
 							message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
 							logger.error("用户vpn新增失败",e);
+							LogUtils.saveLog(request, null, e, null);
 							throw e;
 						}catch (Exception e) {
 							message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
 							logger.error("用户vpn新增失败",e);
+							LogUtils.saveLog(request, null, e, null);
 							throw e;
 						}
 					}
@@ -208,10 +215,12 @@ public class UserManageController  extends BaseController{
 								} catch (MaatConvertException e) {
 									message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("update_failed");
 									logger.error("用户vpn密码修改失败",e);
+									LogUtils.saveLog(request, null, e, null);
 									throw e;
 								}catch (Exception e) {
 									message=msgProp.getProperty("user")+" "+entity.getUserName()+msgProp.getProperty("password")+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("update_failed");
 									logger.error("用户vpn密码修改失败",e);
+									LogUtils.saveLog(request, null, e, null);
 									throw e;
 								}
 							}
@@ -243,10 +252,12 @@ public class UserManageController  extends BaseController{
 								} catch (MaatConvertException e) {
 									message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
 									logger.error("用户vpn新增失败",e);
+									LogUtils.saveLog(request, null, e, null);
 									throw e;
 								}catch (Exception e) {
 									message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
 									logger.error("用户vpn新增失败",e);
+									LogUtils.saveLog(request, null, e, null);
 									throw e;
 								}
 							}
@@ -263,10 +274,12 @@ public class UserManageController  extends BaseController{
 								} catch (MaatConvertException e) {
 									message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
 									logger.error("用户vpn删除失败",e);
+									LogUtils.saveLog(request, null, e, null);
 									throw e;
 								}catch (Exception e) {
 									message=msgProp.getProperty("user")+" "+entity.getUserName()+" "+ip+" "+msgProp.getProperty("cgi_failed")+" "+msgProp.getProperty("save_failed");
 									logger.error("用户vpn删除失败",e);
+									LogUtils.saveLog(request, null, e, null);
 									throw e;
 								}
 							}
@@ -277,15 +290,19 @@ public class UserManageController  extends BaseController{
 			} catch (MaatConvertException e) {
 				if(!StringUtil.isEmpty(e.getMessage())) {
 					addMessage(redirectAttributes,"error",e.getMessage());
+					LogUtils.saveLog(request, null, e, null);
 				}else{
 					addMessage(redirectAttributes,"error",message);
+					LogUtils.saveLog(request, null, e, null);
 				}
 				return "redirect:" + adminPath +"/maintenance/userManage/list";
 			} catch (Exception e) {
 				if(!StringUtil.isEmpty(e.getMessage())) {
 					addMessage(redirectAttributes,"error",e.getMessage());
+					LogUtils.saveLog(request, null, e, null);
 				}else{
 					addMessage(redirectAttributes,"error",message);
+					LogUtils.saveLog(request, null, e, null);
 				}
 				return "redirect:" + adminPath +"/maintenance/userManage/list";
 			}
@@ -375,6 +392,7 @@ public class UserManageController  extends BaseController{
 		    		message+=","+ip;
 		    	}
 			logger.error("查询失败", e);
+			LogUtils.saveLog(request, null, e, null);
 		   }
 		}
 		mess.put("message", message);
@@ -450,6 +468,7 @@ public class UserManageController  extends BaseController{
 			} catch (Exception e) {
 				logger.error("user export failed", e);
 				addMessage(redirectAttributes, "error", "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 			// return "redirect:" + adminPath
 			// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

src/main/java/com/nis/web/controller/configuration/manipulation/DdosCfgController.java

@@ -34,6 +34,7 @@ import com.nis.domain.configuration.DdosIpCfg;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -57,6 +58,12 @@ public class DdosCfgController extends BaseController {
 			@ModelAttribute("cfg") DdosIpCfg cfg) {
 		if (!StringUtil.isEmpty(ids)) {
 			cfg = ddosCfgService.getDdosIpCfg(Long.parseLong(ids), null);
+			if(cfg.getBpsThreadshold()==0){
+				cfg.setBpsThreadshold(null);
+			};
+			if(cfg.getPpsThreadshold()==0){
+				cfg.setPpsThreadshold(null);
+			};									
 			initUpdateFormCondition(model, cfg);
 		} else {
 			initFormCondition(model, cfg);
@@ -71,15 +78,21 @@ public class DdosCfgController extends BaseController {
 			@ModelAttribute("cfg") DdosIpCfg cfg, RedirectAttributes redirectAttributes) {
 		try {
 			ddosCfgService.saveOrUpdate(cfg);
+			//配置仅保存
+			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
 				addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			logger.error("信息保存失败", e);
-			e.printStackTrace();
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", "request_service_failed");
 			}else {
-				addMessage(redirectAttributes, "error", "save_failed");
+			//配置直接生效
+				addMessage(redirectAttributes, "success", "audit_success");
 			}
+		} catch (MaatConvertException e) {
+			logger.error("DDOS配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("DDOS配置保存失败：",e);
+			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/manipulation/ddos/list?functionId=" + cfg.getFunctionId();
@@ -102,8 +115,10 @@ public class DdosCfgController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -120,16 +135,18 @@ public class DdosCfgController extends BaseController {
 			Date auditTime = new Date();
 			for (String id : idArray) {
 				try {
-					ddosCfgService.audit(isAudit, isValid, functionId, id, auditTime);
+					ddosCfgService.audit(isAudit, isValid, functionId, id, auditTime,Constants.INSERT_ACTION);
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (MaatConvertException e) {
 					e.printStackTrace();
 					logger.info("dns fake ip配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.info("dns fake ip配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -145,8 +162,10 @@ public class DdosCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -258,6 +277,7 @@ public class DdosCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("ddos export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java

@@ -45,6 +45,7 @@ import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.configuration.CommonController;
 import com.nis.web.service.configuration.IpMultiplexService;
@@ -202,8 +203,10 @@ public class IpMultiplexController extends CommonController {
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -223,6 +226,7 @@ public class IpMultiplexController extends CommonController {
 		} catch (Exception e) {
 			logger.error(e);
 			addMessage(redirectAttributes, "error", "delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/manipulation/ipmulitiplex/snatPolicyList?functionId=" + functionId;
@@ -231,7 +235,7 @@ public class IpMultiplexController extends CommonController {
 	@RequestMapping(value = { "/auditSnat" })
 	@RequiresPermissions("snat_policy:confirm")
 	public String auditSnat(String ids, Integer isAudit, Integer isValid, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 
 		if (!StringUtil.isEmpty(ids)) {
 			String[] idArray = ids.split(",");
@@ -245,8 +249,10 @@ public class IpMultiplexController extends CommonController {
 					logger.error("SNAT策略配置下发失败：" + e.getMessage());
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -388,8 +394,10 @@ public class IpMultiplexController extends CommonController {
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/manipulation/ipmulitiplex/dnatPolicyList?functionId=" + cfg.getFunctionId();
@@ -397,7 +405,7 @@ public class IpMultiplexController extends CommonController {
 
 	@RequestMapping(value = { "/dnatDelete" })
 	@RequiresPermissions("dnat_policy:config")
-	public String dnatDelete(String ids, Integer isValid, Integer functionId, RedirectAttributes redirectAttributes) {
+	public String dnatDelete(String ids, Integer isValid, Integer functionId, RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		// this._deleteIp(cfgName,ids, compileIds, functionId, model);
 
 		try {
@@ -408,6 +416,7 @@ public class IpMultiplexController extends CommonController {
 		} catch (Exception e) {
 			logger.error(e);
 			addMessage(redirectAttributes, "error", "delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/manipulation/ipmulitiplex/dnatPolicyList?functionId=" + functionId;
@@ -416,7 +425,7 @@ public class IpMultiplexController extends CommonController {
 	@RequestMapping(value = { "/auditDnat" })
 	@RequiresPermissions("dnat_policy:confirm")
 	public String auditDnat(String ids, Integer isAudit, Integer isValid, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		// this._auditIp(cfgName,ids, cfg, redirectAttributes);
 
 		if (!StringUtil.isEmpty(ids)) {
@@ -431,8 +440,10 @@ public class IpMultiplexController extends CommonController {
 					logger.error("DNAT策略配置下发失败：" + e.getMessage());
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -551,6 +562,7 @@ public class IpMultiplexController extends CommonController {
 		} catch (Exception e) {
 			logger.error("snat export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -657,6 +669,7 @@ public class IpMultiplexController extends CommonController {
 		} catch (Exception e) {
 			logger.error("dnat export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -17,6 +17,7 @@ import com.nis.domain.Page;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.exceptions.MaatConvertException;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 
@@ -61,8 +62,10 @@ public class AsnPolicyCfgController extends BaseController {
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 

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

@@ -38,6 +38,7 @@ import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
 import com.nis.web.controller.BaseController;
@@ -103,10 +104,12 @@ public class AvContentController extends BaseController {
 				e.printStackTrace();
 				logger.error("voip 信息保存失败", e);
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				e.printStackTrace();
 				logger.error("voip 信息保存失败", e);
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/ntc/av/voipList?functionId=" + cfg.getFunctionId();
@@ -174,9 +177,11 @@ public class AvContentController extends BaseController {
 			if (e instanceof MaatConvertException) {
 				logger.error("voip 信息审核失败", e);
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				logger.error("voip 信息审核失败", e);
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/ntc/av/voipList?functionId=" + functionId;
@@ -226,10 +231,12 @@ public class AvContentController extends BaseController {
 						logger.error("VOIP配置下发失败：" + e.getMessage());
 						;
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						e.printStackTrace();
 						logger.error("VOIP配置下发失败", e);
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 
 				}
@@ -247,8 +254,10 @@ public class AvContentController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -398,8 +407,10 @@ public class AvContentController extends BaseController {
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -419,7 +430,7 @@ public class AvContentController extends BaseController {
 	@RequestMapping(value = { "/auditAvContIp" })
 	@RequiresPermissions(value = { "avContIp:confirm" })
 	public String auditContIp(Integer isAudit, Integer isValid, String ids, String compileIds, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		if (!StringUtil.isEmpty(compileIds)) {
 			String[] idArray = compileIds.split(",");
 			Date auditTime = new Date();
@@ -430,9 +441,11 @@ public class AvContentController extends BaseController {
 				} catch (MaatConvertException e) {
 					logger.error("Cont Ip配置下发失败", e);
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					logger.error("Cont Ip配置下发失败", e);
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -507,8 +520,10 @@ public class AvContentController extends BaseController {
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -525,10 +540,19 @@ public class AvContentController extends BaseController {
 	}
 
 	// 修改CONTIP配置审核
+	/**
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids
+	 * @param compileIds
+	 * @param functionId
+	 * @param redirectAttributes
+	 * @return
+	 */
 	@RequestMapping(value = { "/auditPicIp" })
 	@RequiresPermissions(value = { "avPicIp:confirm" })
 	public String auditPicIp(Integer isAudit, Integer isValid, String ids, String compileIds, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		if (!StringUtil.isEmpty(compileIds)) {
 			String[] idArray = compileIds.split(",");
 			Date auditTime = new Date();
@@ -540,10 +564,12 @@ public class AvContentController extends BaseController {
 					e.printStackTrace();
 					logger.error("Pic Ip配置下发失败", e);
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("Pic Ip配置下发失败", e);
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 
@@ -640,10 +666,12 @@ public class AvContentController extends BaseController {
 				e.printStackTrace();
 				logger.error("Stream Media 信息保存失败", e);
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				e.printStackTrace();
 				logger.error("Stream Media 信息保存失败", e);
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/ntc/av/contUrlList?functionId=" + cfg.getFunctionId();
@@ -667,8 +695,10 @@ public class AvContentController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -700,8 +730,10 @@ public class AvContentController extends BaseController {
 					logger.info("Cont Url配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -718,8 +750,10 @@ public class AvContentController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -813,8 +847,10 @@ public class AvContentController extends BaseController {
 			logger.error("信息保存失败", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -834,7 +870,7 @@ public class AvContentController extends BaseController {
 	@RequestMapping(value = { "/auditAvPicUrl" })
 	@RequiresPermissions(value = { "avPicUrl:confirm" })
 	public String auditPicUrl(Integer isAudit, Integer isValid, String ids, String compileIds, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		if (!StringUtil.isEmpty(compileIds)) {
 			String[] idArray = compileIds.split(",");
 			Date auditTime = new Date();
@@ -847,8 +883,10 @@ public class AvContentController extends BaseController {
 					logger.info("Pic Url配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -957,6 +995,7 @@ public class AvContentController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/ntc/av/picUrlList?functionId=" + entity.getFunctionId();
@@ -1089,6 +1128,7 @@ public class AvContentController extends BaseController {
 		} catch (Exception e) {
 			logger.error("stream export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1222,6 +1262,7 @@ public class AvContentController extends BaseController {
 		} catch (Exception e) {
 			logger.error("voip export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -59,6 +59,7 @@ import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
@@ -301,7 +302,8 @@ public class AvController extends BaseController {
 						addMessage(redirectAttributes, "error", "exceeds_duration_limit");
 						logger.error("The duration of uploaded files exceeds the limit(" + Constants.AV_DURATION_LIMIT
 								+ "s).");
-						throw new MultiPartNewException(this.getMsgProp().getProperty("exceeds_duration_limit"));
+						throw new MultiPartNewException(this.getMsgProp().getProperty("exceeds_duration_limit")+"("+ Constants.AV_DURATION_LIMIT
+								+ "s)");
 					}
 
 				}
@@ -315,12 +317,16 @@ public class AvController extends BaseController {
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof CallExternalProceduresException) {
 				addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof MultiPartNewException) {
 				addMessage(redirectAttributes, "error", e.getMessage());
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -339,10 +345,13 @@ public class AvController extends BaseController {
 			e.printStackTrace();
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof CallExternalProceduresException) {
 				addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/ntc/av/sample/audioSignSampleList?functionId=" + entity.getFunctionId();
@@ -365,8 +374,10 @@ public class AvController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -453,9 +464,11 @@ public class AvController extends BaseController {
 					if (e instanceof MaatConvertException) {
 						logger.info("音视频文件样例配置下发失败：" + e.getMessage());
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						logger.error("auditAvFileSample failed", e);
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -471,8 +484,10 @@ public class AvController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -501,7 +516,7 @@ public class AvController extends BaseController {
 	 */
 	@RequestMapping(value = { "/sample/auditAvAudioSignSample" })
 	public String auditAvAudioSignSample(Integer isAudit, Integer isValid, String ids, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		// avCfgService.auditAvSignSample(isAudit,isValid,ids);
 		AvSignSampleCfg entity = new AvSignSampleCfg();
 		String[] idArray = ids.split(",");
@@ -518,9 +533,11 @@ public class AvController extends BaseController {
 				if (e instanceof MaatConvertException) {
 					logger.error("音视频标识样例配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					logger.error("auditAvAudioSignSample failed", e);
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		}
@@ -539,7 +556,7 @@ public class AvController extends BaseController {
 	 */
 	@RequestMapping(value = { "/sample/auditAvSignSample" })
 	public String auditAvSignSample(Integer preset, AvSignSampleCfgModel cfg, Integer functionId,
-			RedirectAttributes redirectAttributes) {
+			RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		// 预置配置
 		try {
 			if (preset != null && 1 == preset) {// 预置信息需要在数据库中插入一条记录
@@ -553,9 +570,11 @@ public class AvController extends BaseController {
 			if (e1 instanceof MaatConvertException) {
 				logger.error("预置失败", e1);
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e1, null);
 			} else {
 				logger.error("auditAvSignSample failed", e1);
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e1, null);
 			}
 		}
 		// 修改下发配置
@@ -578,9 +597,11 @@ public class AvController extends BaseController {
 					if (e instanceof MaatConvertException) {
 						logger.error("下发失败", e);
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						logger.error("auditAvSignSample failed", e);
 						addMessage(redirectAttributes, "error", "save_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -686,6 +707,7 @@ public class AvController extends BaseController {
 		} catch (Exception e) {
 			logger.error("ysp export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -725,7 +747,7 @@ public class AvController extends BaseController {
 	 */
 	@ResponseBody
 	@RequestMapping(value = { "/sample/videoToPicture" })
-	public Map videoToPicture(Model model, @RequestParam("srcFile") CommonsMultipartFile srcFile) {
+	public Map videoToPicture(Model model, @RequestParam("srcFile") CommonsMultipartFile srcFile,HttpServletRequest request) {
 
 		String sep = System.getProperty("file.separator");
 		String random = UUID.randomUUID() + "";
@@ -796,14 +818,17 @@ public class AvController extends BaseController {
 			e.printStackTrace();
 			map.put("status", 0);
 			map.put("msg", e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		} catch (InputFormatException e) {
 			e.printStackTrace();
 			map.put("status", 0);
 			map.put("msg", e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		} catch (EncoderException e) {
 			e.printStackTrace();
 			map.put("status", 0);
 			map.put("msg", e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return map;
 	}
@@ -819,7 +844,7 @@ public class AvController extends BaseController {
 	@ResponseBody
 	@RequestMapping(value = { "/sample/faceToPicture" })
 	public Map faceToPicture(Model model, @RequestParam("srcFile") CommonsMultipartFile[] srcFile,
-			@RequestParam("faceFilePath") String faceFilePath) {
+			@RequestParam("faceFilePath") String faceFilePath,HttpServletRequest request) {
 		String sep = System.getProperty("file.separator");
 		String random = UUID.randomUUID() + "";
 		// String srcFilePath =
@@ -842,6 +867,7 @@ public class AvController extends BaseController {
 			} catch (IOException e) {
 				logger.error(e);
 				e.printStackTrace();
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 

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

@@ -29,6 +29,7 @@ import com.nis.domain.configuration.NtcBgpAsCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.controller.BaseController;
@@ -84,9 +85,11 @@ public class BgpCfgController extends BaseController {
 		} catch (MaatConvertException e) {
 			logger.error("ip白名单配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("ip白名单配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/ntc/other/bgpList?functionId=" + entity.getFunctionId();
 	}
@@ -152,8 +155,10 @@ public class BgpCfgController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -182,10 +187,12 @@ public class BgpCfgController extends BaseController {
 					e.printStackTrace();
 					logger.error("bgp配置下发失败", e);
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("bgp配置下发失败", e);
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		} else {
@@ -200,8 +207,10 @@ public class BgpCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -340,6 +349,7 @@ public class BgpCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("bgp export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -44,6 +44,7 @@ import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -99,10 +100,12 @@ public class FileTransferCfgController extends BaseController {
 				e.printStackTrace();
 				logger.error("ftp信息保存失败", e);
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				e.printStackTrace();
 				logger.error("ftp信息保存失败", e);
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/ntc/fileTransfer/ftpList?functionId=" + entity.getFunctionId();
@@ -171,9 +174,11 @@ public class FileTransferCfgController extends BaseController {
 			if (e instanceof MaatConvertException) {
 				logger.error("ftp配置删除失败：" + e.getMessage());
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				logger.error("ftp配置删除失败", e);
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/ntc/fileTransfer/ftpList?functionId=" + functionId;
@@ -203,10 +208,12 @@ public class FileTransferCfgController extends BaseController {
 						logger.error("ftp配置下发失败：" + e.getMessage());
 						;
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						e.printStackTrace();
 						logger.error("ftp配置下发失败", e);
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -222,8 +229,10 @@ public class FileTransferCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -302,9 +311,11 @@ public class FileTransferCfgController extends BaseController {
 		} catch (MaatConvertException e) {
 			logger.error("文件摘要配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("文件摘要配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/ntc/fileTransfer/fileDigestList?functionId=" + entity.getFunctionId();
 	}
@@ -326,9 +337,11 @@ public class FileTransferCfgController extends BaseController {
 			if (e instanceof MaatConvertException) {
 				logger.error("文件摘要配置删除失败：" + e.getMessage());
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				logger.error("文件摘要配置删除失败", e);
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		
@@ -350,11 +363,14 @@ public class FileTransferCfgController extends BaseController {
 					logger.error("File Digest配置下发失败", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 
 					} else if (e instanceof CallExternalProceduresException) {
 						addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 
 				}
@@ -372,8 +388,10 @@ public class FileTransferCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -503,10 +521,12 @@ public class FileTransferCfgController extends BaseController {
 				e.printStackTrace();
 				logger.error("P2P信息保存失败", e);
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				e.printStackTrace();
 				logger.error("P2P信息保存失败", e);
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/ntc/fileTransfer/p2pList?functionId=" + entity.getFunctionId();
@@ -529,9 +549,11 @@ public class FileTransferCfgController extends BaseController {
 			if (e instanceof MaatConvertException) {
 				logger.error("P2P配置删除失败：" + e.getMessage());
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				logger.error("P2P配置删除失败", e);
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/ntc/fileTransfer/p2pList?functionId=" + functionId;
@@ -606,11 +628,14 @@ public class FileTransferCfgController extends BaseController {
 					logger.info("p2p配置下发失败：" + e.getMessage());
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 
 					} else if (e instanceof CallExternalProceduresException) {
 						addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -626,8 +651,10 @@ public class FileTransferCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -771,6 +798,7 @@ public class FileTransferCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("ftp export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -915,6 +943,7 @@ public class FileTransferCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("p2p export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1014,6 +1043,7 @@ public class FileTransferCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("file export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -70,6 +70,7 @@ import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
 import com.nis.web.controller.BaseController;
@@ -120,9 +121,11 @@ public class IpController extends BaseController{
 		} catch (MaatConvertException e) {
 			logger.error("ip地址配置下发失败：",e);
 			addMessage(model, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("ip地址配置保存失败：",e);
 			addMessage(model, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}
@@ -181,8 +184,10 @@ public class IpController extends BaseController{
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -235,8 +240,10 @@ public class IpController extends BaseController{
 					logger.info("ip配置下发失败："+e.getMessage());
 					if(e instanceof MaatConvertException) {
 						addMessage(redirectAttributes,"error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}else {
 						addMessage(redirectAttributes,"error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 					
 				}
@@ -253,8 +260,10 @@ public class IpController extends BaseController{
 				logger.error("配置下发失败：",e);
 				if(e instanceof MaatConvertException) {
 					addMessage(redirectAttributes,"error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}else {
 					addMessage(redirectAttributes,"error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 				
 			}
@@ -339,6 +348,7 @@ public class IpController extends BaseController{
 		} catch (Exception e) {
 			logger.error("export_failed", e);
 			addMessage(redirectAttributes,"error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 	}
@@ -717,6 +727,7 @@ public class IpController extends BaseController{
 			} catch (Exception e) {
 				logger.error("ip addr export failed",e);
 				addMessage(redirectAttributes,"error",  "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 		}

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

@@ -40,6 +40,7 @@ import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -116,11 +117,14 @@ public class MailCfgController extends BaseController {
 		} catch (Exception e) {
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 
 			} else if (e instanceof CallExternalProceduresException) {
 				addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -190,8 +194,10 @@ public class MailCfgController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -221,11 +227,14 @@ public class MailCfgController extends BaseController {
 					logger.error("mail配置下发失败：" + e.getMessage());
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 
 					} else if (e instanceof CallExternalProceduresException) {
 						addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "save_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -241,8 +250,10 @@ public class MailCfgController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -396,6 +407,7 @@ public class MailCfgController extends BaseController {
 		} catch (Exception e) {
 			logger.error("mail export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -45,6 +45,7 @@ import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ImportExcel;
 import com.nis.web.controller.BaseController;
@@ -207,9 +208,11 @@ public class WebsiteController extends BaseController {
 		} catch (MaatConvertException e) {
 			logger.error("ip白名单配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("ip白名单配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/ntc/website/httpList?functionId=" + entity.getFunctionId();
 	}
@@ -239,8 +242,10 @@ public class WebsiteController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -268,9 +273,11 @@ public class WebsiteController extends BaseController {
 				} catch (MaatConvertException e) {
 					logger.error("http配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					logger.error("http配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		} else {// 条件下所有配置审核
@@ -285,8 +292,10 @@ public class WebsiteController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -336,9 +345,11 @@ public class WebsiteController extends BaseController {
 		} catch (MaatConvertException e) {
 			logger.error("ip白名单配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("ip白名单配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/ntc/website/sslList?functionId=" + entity.getFunctionId();
 	}
@@ -402,8 +413,10 @@ public class WebsiteController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -433,11 +446,14 @@ public class WebsiteController extends BaseController {
 					logger.error("ssl配置下发失败：" + e.getMessage());
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 
 					} else if (e instanceof CallExternalProceduresException) {
 						addMessage(redirectAttributes, "error", "call_external_procedures_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "save_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -453,8 +469,10 @@ public class WebsiteController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -496,9 +514,11 @@ public class WebsiteController extends BaseController {
 		} catch (MaatConvertException e) {
 			logger.error("ip白名单配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("ip白名单配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/ntc/website/dnsList?functionId=" + entity.getFunctionId();
 	}
@@ -557,8 +577,10 @@ public class WebsiteController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -587,10 +609,12 @@ public class WebsiteController extends BaseController {
 					e.printStackTrace();
 					logger.info("dns配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.info("dns配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		} else {// 条件下所有配置审核
@@ -605,8 +629,10 @@ public class WebsiteController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -883,6 +909,7 @@ public class WebsiteController extends BaseController {
 		} catch (Exception e) {
 			logger.error("http export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/website/httpList?functionId="+entity.getFunctionId();
@@ -1031,6 +1058,7 @@ public class WebsiteController extends BaseController {
 		} catch (Exception e) {
 			logger.error("dns export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -1177,6 +1205,7 @@ public class WebsiteController extends BaseController {
 		} catch (Exception e) {
 			logger.error("http export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/website/httpList?functionId="+entity.getFunctionId();

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

@@ -29,6 +29,7 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.template.WhiteListIpTemplate;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.configuration.CommonController;
 import com.nis.web.security.UserUtils;
@@ -111,9 +112,11 @@ public class WhiteListController extends CommonController {
 		} catch (MaatConvertException e) {
 			logger.error("ip白名单配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("ip白名单配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/ntc/whitelist/ip/list?functionId=" + entity.getFunctionId();
 	}
@@ -135,11 +138,13 @@ public class WhiteListController extends CommonController {
 					ipCfgService.auditIpCfg(entity, isAudit,Constants.INSERT_ACTION);
 					addMessage(redirectAttributes, "success", "audit_success");
 				} catch (MaatConvertException e) {
-					logger.info("ip配置下发失败：" + e.getMessage());
+					logger.error("ip配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
-					logger.info("ip配置下发失败：" + e.getMessage());
+					logger.error("ip配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		} else {
@@ -154,8 +159,10 @@ public class WhiteListController extends CommonController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -183,8 +190,10 @@ public class WhiteListController extends CommonController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -262,9 +271,11 @@ public class WhiteListController extends CommonController {
 		} catch (MaatConvertException e) {
 			logger.error("ip白名单配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("ip白名单配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/ntc/whitelist/domain/list?functionId=" + entity.getFunctionId();
 	}
@@ -314,8 +325,10 @@ public class WhiteListController extends CommonController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -324,13 +337,14 @@ public class WhiteListController extends CommonController {
 
 	@RequestMapping(value = { "domain/delete" })
 	@RequiresPermissions("whitelist:domain:config")
-	public String deleteDomain(String ids, Integer functionId, RedirectAttributes model) {
+	public String deleteDomain(String ids, Integer functionId, RedirectAttributes model,HttpServletRequest request) {
 		try {
 			domainService.deleteWhiteDomain(ids);
 			addMessage(model, "success", "delete_success");
 		} catch (Exception e) {
 			logger.error("删除失败", e);
 			addMessage(model, "error", "delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/ntc/whitelist/domain/list?functionId=" + functionId;
 	}
@@ -357,10 +371,12 @@ public class WhiteListController extends CommonController {
 					e.printStackTrace();
 					logger.error("domain配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error("domain配置下发失败：" + e.getMessage());
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		} else {// 条件下所有配置审核
@@ -375,8 +391,10 @@ public class WhiteListController extends CommonController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -518,6 +536,7 @@ public class WhiteListController extends CommonController {
 		} catch (Exception e) {
 			logger.error("ip white export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -628,6 +647,7 @@ public class WhiteListController extends CommonController {
 		} catch (Exception e) {
 			logger.error("ip white export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -29,6 +29,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
+import com.nis.util.LogUtils;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
 
@@ -72,7 +73,7 @@ public class XmppController extends BaseController {
 	}
 	@RequestMapping(value = {"auditXmppCfg"})
 	@RequiresPermissions(value={"other:xmpp:confirm"})
-	public String auditXmppCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
+	public String auditXmppCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
@@ -90,8 +91,10 @@ public class XmppController extends BaseController {
 				logger.info("http配置下发失败："+e.getMessage());
 				if(e instanceof MaatConvertException) {
 					addMessage(redirectAttributes,"error","request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}else {
 					addMessage(redirectAttributes,"error","audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 		}

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

@@ -27,6 +27,7 @@ import com.nis.domain.configuration.IpPortCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -117,8 +118,10 @@ public class CachePolicyController extends BaseController{
 			logger.error("信息保存失败",e);
 			if(e instanceof MaatConvertException) {
 				addMessage(redirectAttributes,"error","request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}else {
 				addMessage(redirectAttributes,"error","save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		
@@ -177,8 +180,10 @@ public class CachePolicyController extends BaseController{
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -213,8 +218,10 @@ public class CachePolicyController extends BaseController{
 					logger.info("代理缓存策略下发失败："+e.getMessage());
 					if(e instanceof MaatConvertException) {
 						addMessage(redirectAttributes,"error","request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}else {
 						addMessage(redirectAttributes,"error","audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -230,8 +237,10 @@ public class CachePolicyController extends BaseController{
 				logger.error("配置下发失败：",e);
 				if(e instanceof MaatConvertException) {
 					addMessage(redirectAttributes,"error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}else {
 					addMessage(redirectAttributes,"error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 				
 			}
@@ -327,6 +336,7 @@ public class CachePolicyController extends BaseController{
 		} catch (Exception e) {
 			logger.error("ip white export failed",e);
 			addMessage(redirectAttributes,"error",  "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -3,6 +3,7 @@ package com.nis.web.controller.configuration.proxy;
 import java.util.Date;
 import java.util.List;
 
+import javax.servlet.ServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -24,6 +25,7 @@ import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 
@@ -79,9 +81,11 @@ public class ControlPolicyController extends BaseController{
 		} catch (MaatConvertException e) {
 			logger.error("HTTPS配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("HTTPS配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:" + adminPath +"/proxy/control/httpReqReplace/list?functionId="+cfg.getFunctionId();
@@ -97,7 +101,7 @@ public class ControlPolicyController extends BaseController{
 	}
 	@RequestMapping(value = {"httpReqReplace/audit"})
 	public String reqAudit(Integer isAudit,Integer isValid,String ids
-			,Integer functionId, RedirectAttributes redirectAttributes) {
+			,Integer functionId, RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
@@ -109,8 +113,10 @@ public class ControlPolicyController extends BaseController{
 					logger.error("配置下发失败",e);
 					if(e instanceof MaatConvertException) {
 						addMessage(redirectAttributes,"error","request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}else {
 						addMessage(redirectAttributes,"error","audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -156,8 +162,10 @@ public class ControlPolicyController extends BaseController{
 			logger.error("信息保存失败",e);
 			if(e instanceof MaatConvertException) {
 				addMessage(redirectAttributes,"error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}else {
 				addMessage(redirectAttributes,"error","save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		
@@ -174,7 +182,7 @@ public class ControlPolicyController extends BaseController{
 	}
 	@RequestMapping(value = {"httpResReplace/audit"})
 	public String resAudit(Integer isAudit,Integer isValid,String ids
-			,Integer functionId, RedirectAttributes redirectAttributes) {
+			,Integer functionId, RedirectAttributes redirectAttributes,HttpServletRequest request) {
 		if(!StringUtil.isEmpty(ids)){
 			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
@@ -187,8 +195,10 @@ public class ControlPolicyController extends BaseController{
 					logger.error("配置下发失败",e);
 					if(e instanceof MaatConvertException) {
 						addMessage(redirectAttributes,"error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}else {
 						addMessage(redirectAttributes,"error","audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}

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

@@ -32,6 +32,7 @@ import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.configuration.CommonController;
 
@@ -122,8 +123,10 @@ public class FileStrategyController extends CommonController {
 			logger.error("信息保存失败",e);
 			if(e instanceof MaatConvertException) {
 				addMessage(redirectAttributes,"error","request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}else {
 				addMessage(redirectAttributes,"error","save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}finally {
 			if(file != null) {

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

@@ -38,6 +38,7 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -200,8 +201,10 @@ public class HttpRedirectPolicyController extends BaseController {
 			logger.error("save_failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -236,8 +239,10 @@ public class HttpRedirectPolicyController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -269,8 +274,10 @@ public class HttpRedirectPolicyController extends BaseController {
 					logger.info("http重定向配置下发失败：" + e.getMessage());
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -286,8 +293,10 @@ public class HttpRedirectPolicyController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -517,6 +526,7 @@ public class HttpRedirectPolicyController extends BaseController {
 		} catch (Exception e) {
 			logger.error("http export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		/*
 		 * return "redirect:" + adminPath

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

@@ -32,6 +32,7 @@ import com.nis.domain.configuration.PxyObjSpoofingIpPool;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.configuration.CommonController;
 import com.nis.web.security.UserUtils;
@@ -122,8 +123,10 @@ public class InterceptController extends CommonController {
 			logger.error("save_failed", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		return "redirect:" + adminPath + "/proxy/intercept/ip/list?functionId=" + entity.getFunctionId();
@@ -188,8 +191,10 @@ public class InterceptController extends CommonController {
 					logger.error("intercept ip audit failed", e);
 					if (e instanceof MaatConvertException) {
 						addMessage(redirectAttributes, "error", "request_service_failed");
+						LogUtils.saveLog(request, null, e, null);
 					} else {
 						addMessage(redirectAttributes, "error", "audit_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 			}
@@ -204,8 +209,10 @@ public class InterceptController extends CommonController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -229,6 +236,7 @@ public class InterceptController extends CommonController {
 		} catch (Exception e) {
 			logger.error("intercept ip delete failed", e);
 			addMessage(redirectAttributes, "error", "delete_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "redirect:" + adminPath + "/proxy/intercept/ip/list?functionId=" + functionId;
 	}
@@ -449,6 +457,7 @@ public class InterceptController extends CommonController {
 		} catch (Exception e) {
 			logger.error("ip addr export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

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

@@ -57,6 +57,7 @@ import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 
@@ -101,8 +102,8 @@ public class PxyObjKeyringController extends BaseController {
 		boolean validFlag = true;
 		try {
 			Properties msgProp = this.getMsgProp();
-			boolean publicKeyFileflag = validCertFileContent(publicKeyFileI, "-incert");
-			boolean privateKeyFileflag = validCertFileContent(privateKeyFileI, "-inkey");
+			boolean publicKeyFileflag = validCertFileContent(publicKeyFileI,null, "-incert");
+			boolean privateKeyFileflag = validCertFileContent(privateKeyFileI,null, "-inkey");
 			if (!publicKeyFileflag && !privateKeyFileflag) {
 				addMessage(redirectAttributes, "error", "save_failed");
 				logger.error(publicKeyFileI.getOriginalFilename() + " and " + privateKeyFileI.getOriginalFilename()
@@ -117,15 +118,28 @@ public class PxyObjKeyringController extends BaseController {
 				logger.error(privateKeyFileI.getOriginalFilename() + " file non private key file format ");
 				throw new MultiPartNewException(msgProp.getProperty("private_file_error"));
 			}
+			
+			//证书对校验
+			if(publicKeyFileflag && privateKeyFileflag){
+				boolean keyRingFileflag = validCertFileContent(publicKeyFileI,privateKeyFileI, "-incheck");
+				if (!keyRingFileflag) {
+					addMessage(redirectAttributes, "error", "save_failed");
+					logger.error(" 公私钥不匹配 ");
+					throw new MultiPartNewException(msgProp.getProperty("public_private_file_error"));
+				}
+			}
 		} catch (Exception e) {
 			validFlag = false;
 			logger.error("证书文件校验失败", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof MultiPartNewException) {
 				addMessage(redirectAttributes, "error", e.getMessage());
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -181,10 +195,13 @@ public class PxyObjKeyringController extends BaseController {
 			logger.error("证书文件校验失败", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof MultiPartNewException) {
 				addMessage(redirectAttributes, "error", e.getMessage());
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		try {
@@ -238,18 +255,27 @@ public class PxyObjKeyringController extends BaseController {
 					}
 				}
 				pxyObjKeyringService.saveOrUpdate(cfg);
+				//配置仅保存
+				if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
 					addMessage(redirectAttributes, "success", "save_success");
+				}else {
+				//配置直接生效
+					addMessage(redirectAttributes, "success", "audit_success");
+				}
 			}
 
-		} catch (Exception e) {
-			logger.error("证书上传失败", e);
-			if (e instanceof MaatConvertException) {
+		} catch (MultiPartNewException e) {
+			logger.error("证书文件上传失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
-			} else if (e instanceof MultiPartNewException) {
-				addMessage(redirectAttributes, "error", e.getMessage());
-			} else {
+			LogUtils.saveLog(request, null, e, null);
+		} catch (MaatConvertException e) {
+			logger.error("拦截策略配置下发失败：",e);
+			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("拦截策略配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
-			}
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "redirect:" + adminPath + "/proxy/intercept/strateagy/list?functionId=" + cfg.getFunctionId();
@@ -265,7 +291,7 @@ public class PxyObjKeyringController extends BaseController {
 	 * @return
 	 * @throws Exception
 	 */
-	public boolean validCertFileContent(MultipartFile file, String validateType) throws Exception {
+	public boolean validCertFileContent(MultipartFile file,MultipartFile privateFile, String validateType) throws Exception {
 		String os = System.getProperty("os.name").toLowerCase();
 		if (!os.contains("windows") && file != null) {
 			// 证书文件临时保存路径
@@ -273,8 +299,16 @@ public class PxyObjKeyringController extends BaseController {
 			FileUtils.createDirectory(certFilePath);
 			String filePath = certFilePath + File.separator + UUID.randomUUID()
 					+ FileUtils.getSuffix(file.getOriginalFilename(), true);
+			String privateFilePath="";
 			File uploadFile = new File(filePath);
 			FileCopyUtils.copy(file.getBytes(), uploadFile);
+			
+			if(!StringUtil.isEmpty(privateFile)){
+				privateFilePath=certFilePath + File.separator + UUID.randomUUID()
+				+ FileUtils.getSuffix(privateFile.getOriginalFilename(), true);
+				File privateUploadFile = new File(privateFilePath);
+				FileCopyUtils.copy(privateFile.getBytes(), privateUploadFile);
+			}
 			// 加载x509脚本
 			String x509Shell = Thread.currentThread().getContextClassLoader()
 					.getResource(File.separator + "shell" + File.separator + Constants.CERT_VALIDATE_FILE).getPath();
@@ -283,8 +317,8 @@ public class PxyObjKeyringController extends BaseController {
 			logger.info("x509 chmod +x :" + resultMap1.get("out").toString());
 			logger.info("x509脚本分配可执行权限:" + "chmod" + " " + "+x" + " " + x509Shell);
 			// 验证文件
-			logger.info(x509Shell + " " + validateType + " " + filePath);
-			Map<String, Object> resultMap = this.execShell(x509Shell, validateType, filePath);
+			logger.info(x509Shell + " " + validateType + " " + filePath+ " " + privateFilePath);
+			Map<String, Object> resultMap = this.execShell(x509Shell, validateType, filePath, privateFilePath);
 
 			if (resultMap == null || StringUtil.isEmpty(resultMap.get("out"))) {
 				// 临时文件删除
@@ -343,8 +377,10 @@ public class PxyObjKeyringController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -367,9 +403,11 @@ public class PxyObjKeyringController extends BaseController {
 				} catch (MaatConvertException e) {
 					logger.error(e);
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					logger.error(e);
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 
@@ -385,8 +423,10 @@ public class PxyObjKeyringController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}
@@ -468,6 +508,7 @@ public class PxyObjKeyringController extends BaseController {
 		} catch (Exception e) {
 			logger.error("pxyObjKeyring export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -533,6 +574,7 @@ public class PxyObjKeyringController extends BaseController {
 		} catch (Exception e) {
 			logger.error("pxyObjKeyring export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		// return "redirect:" + adminPath
 		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
@@ -576,7 +618,7 @@ public class PxyObjKeyringController extends BaseController {
 		File file = null;
 		boolean validFlag = true;
 		try {
-			boolean certFileflag = validCertFileContent(certFileI, "-incert");
+			boolean certFileflag = validCertFileContent(certFileI,null, "-incert");
 			if (!certFileflag) {
 				addMessage(redirectAttributes, "error", "save_failed");
 				logger.error(certFileI.getOriginalFilename() + " file non Certificate file format ");
@@ -587,10 +629,13 @@ public class PxyObjKeyringController extends BaseController {
 			logger.error("证书文件校验失败", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", e.getMessage());
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof MultiPartNewException) {
 				addMessage(redirectAttributes, "error", e.getMessage());
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -613,6 +658,7 @@ public class PxyObjKeyringController extends BaseController {
 			validFlag = false;
 			logger.error("证书信息获取失败", e);
 			addMessage(redirectAttributes, "error", "save_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		try {
 			if (validFlag) {
@@ -641,18 +687,27 @@ public class PxyObjKeyringController extends BaseController {
 					}
 				}
 				pxyObjKeyringService.trustedCertsaveOrUpdate(cfg);
+				//配置仅保存
+				if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
 					addMessage(redirectAttributes, "success", "save_success");
+				}else {
+				//配置直接生效
+					addMessage(redirectAttributes, "success", "audit_success");
+				}
 			}
 
-		} catch (Exception e) {
-			logger.error("证书上传失败", e);
-			if (e instanceof MultiPartNewException) {
+		} catch (MultiPartNewException e) {
+			logger.error("可信证书上传失败：",e);
 			addMessage(redirectAttributes, "error", e.getMessage());
-			} else if (e instanceof MaatConvertException) {
+			LogUtils.saveLog(request, null, e, null);
+		} catch (MaatConvertException e) {
+			logger.error("可信证书单配置下发失败：",e);
 			addMessage(redirectAttributes, "error", "request_service_failed");
-			} else {
+			LogUtils.saveLog(request, null, e, null);
+		} catch (Exception e) {
+			logger.error("可信证书配置保存失败：",e);
 			addMessage(redirectAttributes, "error", "save_failed");
-			}
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "redirect:" + adminPath + "/proxy/intercept/strateagy/trustedCertList?functionId=" + cfg.getFunctionId();
@@ -670,7 +725,7 @@ public class PxyObjKeyringController extends BaseController {
 		boolean validFlag = true;
 		try {
 			if (crlFileI != null) {
-				boolean certFileflag = validCertFileContent(crlFileI, "-incrl");
+				boolean certFileflag = validCertFileContent(crlFileI,null, "-incrl");
 				if (!certFileflag) {
 					addMessage(redirectAttributes, "error", "save_failed");
 					logger.error(crlFileI.getOriginalFilename() + " file non crl file format ");
@@ -682,10 +737,13 @@ public class PxyObjKeyringController extends BaseController {
 			logger.error("证书文件校验失败", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof MultiPartNewException) {
 				addMessage(redirectAttributes, "error", e.getMessage());
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -717,8 +775,10 @@ public class PxyObjKeyringController extends BaseController {
 			logger.error("crl issuer比对失败", e);
 			if (e instanceof MultiPartNewException) {
 				addMessage(redirectAttributes, "error", e.getMessage());
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		try {
@@ -755,10 +815,13 @@ public class PxyObjKeyringController extends BaseController {
 			logger.error("crl上传失败", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else if (e instanceof MultiPartNewException) {
 				addMessage(redirectAttributes, "error", e.getMessage());
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 
@@ -891,8 +954,10 @@ public class PxyObjKeyringController extends BaseController {
 			logger.error("配置删除失败：", e);
 			if (e instanceof MaatConvertException) {
 				addMessage(redirectAttributes, "error", "request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			} else {
 				addMessage(redirectAttributes, "error", "delete_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 
 		}
@@ -914,10 +979,12 @@ public class PxyObjKeyringController extends BaseController {
 					e.printStackTrace();
 					logger.error(e);
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} catch (Exception e) {
 					e.printStackTrace();
 					logger.error(e);
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 
@@ -933,8 +1000,10 @@ public class PxyObjKeyringController extends BaseController {
 				logger.error("配置下发失败：", e);
 				if (e instanceof MaatConvertException) {
 					addMessage(redirectAttributes, "error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				} else {
 					addMessage(redirectAttributes, "error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 
 			}

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

@@ -56,6 +56,7 @@ import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 
@@ -119,8 +120,10 @@ public class PxyObjSpoofingIpPoolController extends BaseController  {
 			e.printStackTrace();
 			if(e instanceof MaatConvertException) {
 				addMessage(redirectAttributes,"error","request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}else {
 				addMessage(redirectAttributes,"error","save_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 		
@@ -171,9 +174,11 @@ public class PxyObjSpoofingIpPoolController extends BaseController  {
 				} catch (MaatConvertException e) {
 					logger.error(e);
 					addMessage(redirectAttributes,"error", "request_service_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}catch (Exception e) {
 					logger.error(e);
 					addMessage(redirectAttributes,"error", "audit_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 			
@@ -255,6 +260,7 @@ public class PxyObjSpoofingIpPoolController extends BaseController  {
 			} catch (Exception e) {
 				logger.error("ip white export failed", e);
 				addMessage(redirectAttributes, "error", "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 			// return "redirect:" + adminPath
 			// +"/ntc/iplist/list?functionId="+entity.getFunctionId();

src/main/java/com/nis/web/controller/dashboard/DashboardController.java

@@ -45,6 +45,7 @@ import com.nis.util.CodeDicUtils;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
 import com.nis.util.httpclient.HttpClientUtil;
@@ -80,7 +81,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="portActive")
 	@ResponseBody
-	public List portActive(){
+	public List portActive(HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		try {
@@ -94,6 +95,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("活跃端口数据错误"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -103,7 +105,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="portActiveChart")
 	@ResponseBody
-	public List portActiveChart(String beginDate,String endDate){
+	public List portActiveChart(String beginDate,String endDate,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		try {
@@ -120,6 +122,7 @@ public class DashboardController extends BaseController{
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 			logger.error("活跃端口详情界面数据获取错误"+e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -145,7 +148,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="ipActive")
 	@ResponseBody
-	public List ipActive(String beginDate,String endDate){
+	public List ipActive(String beginDate,String endDate,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		try {
@@ -161,6 +164,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("活跃IP错误"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -169,7 +173,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="ipActiveMinuteList")
 	@ResponseBody
-	public List ipActiveMinuteList(String beginDate,String endDate,Integer entranceId){
+	public List ipActiveMinuteList(String beginDate,String endDate,Integer entranceId,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		try {
@@ -188,6 +192,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("活跃IP数据获取错误"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -238,6 +243,7 @@ public class DashboardController extends BaseController{
 				e.printStackTrace();
 				logger.error("活跃IP统计错误"+e);
 				addMessage(redirectAttributes,"error","request_service_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		
 		return "/dashboard/trafficIpActiveList";
@@ -247,7 +253,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="ajaxIpActiveList")
 	@ResponseBody
-	public List ajaxIpActiveList(String beginDate,String endDate,Integer entranceId){
+	public List ajaxIpActiveList(String beginDate,String endDate,Integer entranceId,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<TrafficIpActiveStatistic> list = new ArrayList<TrafficIpActiveStatistic>();
 		try {
@@ -294,6 +300,7 @@ public class DashboardController extends BaseController{
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("活跃IP数据获取错误"+e);
+			LogUtils.saveLog(request, null, e, null);
 			//list.add(Maps.newHashMap("error","request_service_failed"));
 		}
 		return list;
@@ -341,6 +348,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("IPActive export failed",e);
 			addMessage(redirectAttributes,"error","export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 //		return "/dashboard/trafficIpActiveList";
 	}
@@ -349,7 +357,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="protocol")
 	@ResponseBody
-	public List protocolChart(){
+	public List protocolChart(HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -389,6 +397,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("协议统计错误"+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -397,7 +406,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="app")
 	@ResponseBody
-	public List appChart(){
+	public List appChart(HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -428,6 +437,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("app流量分析错误"+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -436,7 +446,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="osList")
 	@ResponseBody
-	public List osList(){
+	public List osList(HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -467,6 +477,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("终端用户-获取操作系统列表错误"+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -475,7 +486,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="browserChart")
 	@ResponseBody
-	public List browserChart(@RequestParam("osType") String osType){
+	public List browserChart(@RequestParam("osType") String osType,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -524,6 +535,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("终端用户-获取操作系统下浏览器类型错误"+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -532,7 +544,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="bsList")
 	@ResponseBody
-	public List bsList(){
+	public List bsList(HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -563,6 +575,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("终端用户-获取浏览器列表错误"+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -571,7 +584,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="systemChart")
 	@ResponseBody
-	public List systemChart(@RequestParam("bsType") String bsType){
+	public List systemChart(@RequestParam("bsType") String bsType,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -620,6 +633,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("终端用户-获取浏览器下操作系统类型错误"+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -628,7 +642,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="websiteList")
 	@ResponseBody
-	public List websiteList(){
+	public List websiteList(HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -665,6 +679,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("http网站流量分析数据错误："+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -673,7 +688,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="webTypeChart")
 	@ResponseBody
-	public List webTypeChart(@RequestParam("websiteServiceId") String websiteServiceId){
+	public List webTypeChart(@RequestParam("websiteServiceId") String websiteServiceId,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -715,6 +730,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("http某个网站子域名流量统计错误"+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -724,7 +740,7 @@ public class DashboardController extends BaseController{
 	 */
 	@RequestMapping(value="topicAndDomainList")
 	@ResponseBody
-	public List topicAndDomainList(){
+	public List topicAndDomainList(HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		List<Map> resultList = new ArrayList<Map>();
@@ -782,6 +798,7 @@ public class DashboardController extends BaseController{
 			e.printStackTrace();
 			logger.error("http网站主题流量分析数据错误："+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}

src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java

@@ -46,6 +46,7 @@ import com.nis.util.Constants;
 import com.nis.util.DateUtil;
 import com.nis.util.DateUtils;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
@@ -64,7 +65,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="info")
 	@ResponseBody
-	public Map ipActive(){
+	public Map ipActive(HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		HashMap<String, Object> m = new HashMap<String, Object>();
 		List list = new ArrayList();
@@ -114,6 +115,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("统计流量信息数据错误"+e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return m;
 	}
@@ -149,7 +151,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="actionEntranceTrans")
 	@ResponseBody
-	public List actionTrans(String beginDate,String endDate,@RequestParam("searchAction")String searchAction){
+	public List actionTrans(String beginDate,String endDate,@RequestParam("searchAction")String searchAction,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List resultList = new ArrayList();
 		String url = Constants.DASHBOARD_URL+Constants.NTC_ACTION_ENTRANCE_REPORT;
@@ -165,6 +167,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			e.printStackTrace();
 			logger.error(searchAction+"动作详情数据获取错误"+e);
 			resultList.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return resultList;
 	}
@@ -196,7 +199,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="bandwidthTrans")
 	@ResponseBody
-	public Map bandwidthTrans(String beginDate,String endDate,@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType){
+	public Map bandwidthTrans(String beginDate,String endDate,@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		Map map = new HashMap();
 		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS;
@@ -221,6 +224,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("带宽详情数据获取错误"+e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return map;
 	}
@@ -229,7 +233,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="bandwidthTransTwo")
 	@ResponseBody
-	public Map bandwidthTransTwo(String beginDate,String endDate,@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType){
+	public Map bandwidthTransTwo(String beginDate,String endDate,@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		Map map = new HashMap();
 		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_TWO;
@@ -254,6 +258,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("带宽详情数据获取错误"+e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return map;
 	}
@@ -262,7 +267,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="bandwidthTransThree")
 	@ResponseBody
-	public Map bandwidthTransThree(String beginDate,String endDate,String searchQuotaType,String searchDirection,Model model){
+	public Map bandwidthTransThree(String beginDate,String endDate,String searchQuotaType,String searchDirection,Model model,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		Map map = new HashMap();
 		//String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS_TWO;
@@ -285,6 +290,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("带宽详情数据获取错误"+e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return map;
 	}
@@ -307,7 +313,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="protocolList")
 	@ResponseBody
-	public List protocolList(Model model,Integer entranceId,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,@RequestParam(required=false)String searchDirection){
+	public List protocolList(Model model,Integer entranceId,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,@RequestParam(required=false)String searchDirection,HttpServletRequest request){
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
@@ -377,6 +383,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			e.printStackTrace();
 			logger.error("协议详情数据获取错误"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -399,7 +406,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="appList")
 	@ResponseBody
-	public List appList(Integer entranceId,@RequestParam(value="appType",required=false)Integer[] appType,@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){
+	public List appList(Integer entranceId,@RequestParam(value="appType",required=false)Integer[] appType,@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_LIST;
@@ -457,6 +464,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			e.printStackTrace();
 			logger.error("app详情数据获取错误"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -495,7 +503,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	}
 	@RequestMapping("ajaxAppTrend")
 	@ResponseBody
-	public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,String searchQuotaType,Integer[] searchIspCode,Model model){
+	public Map ajaxAppTrend(String beginDate,String endDate,Integer appType,Integer entranceId,String searchQuotaType,Integer[] searchIspCode,Model model,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		Map list = new HashMap();
 		try {
@@ -533,12 +541,13 @@ public class TrafficStatisticsInfoController extends BaseController {
 			e.printStackTrace();
 			logger.error("app趋势图数据获取错误"+e);
 			list.put("error","request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
 	@RequestMapping("ajaxAppTopList")
 	@ResponseBody
-	public List ajaxAppTopList(String beginDate,String endDate,Integer appType,Integer entranceId,Integer searchQuota,Integer[] searchIspCode,Model model){
+	public List ajaxAppTopList(String beginDate,String endDate,Integer appType,Integer entranceId,Integer searchQuota,Integer[] searchIspCode,Model model,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List<Map> list = new ArrayList<Map>();
 		try {
@@ -584,6 +593,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			e.printStackTrace();
 			logger.error("app列表Top100"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -616,7 +626,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	}
 	@RequestMapping("ajaxDomainTrans")
 	@ResponseBody
-	public List ajaxDomainTrans(String beginDate,String endDate,Integer domain,Integer entranceId,Model model){
+	public List ajaxDomainTrans(String beginDate,String endDate,Integer domain,Integer entranceId,Model model,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		try {
@@ -638,6 +648,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			e.printStackTrace();
 			logger.error("活跃域名数据获取错误"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -646,7 +657,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="websiteList")
 	@ResponseBody
-	public List websiteList(Integer entranceId,Integer[] domain,Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
+	public List websiteList(Integer entranceId,Integer[] domain,Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_WEBSITELIST_NOTIME;
@@ -742,6 +753,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			e.printStackTrace();
 			logger.error("网站域名数据获取错误"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -751,7 +763,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	 */
 	@RequestMapping(value="statisticList")
 	@ResponseBody
-	public List statisticList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
+	public List statisticList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		List list = new ArrayList();
 		String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_TOPICLIST;
@@ -816,6 +828,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 			e.printStackTrace();
 			logger.error("协议详情数据获取错误"+e);
 			list.add(Maps.newHashMap("error","request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return list;
 	}
@@ -836,7 +849,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 	}
 	@RequestMapping("ajaxNtcTotalReportDetail")
 	@ResponseBody
-	public Map ajaxNtcTotalReportDetail(String beginDate,String endDate,Model model,String searchAction){
+	public Map ajaxNtcTotalReportDetail(String beginDate,String endDate,Model model,String searchAction,HttpServletRequest request){
 		Map<String, Object> fromJsonList = new HashMap<String, Object>();
 		Map map = new HashMap();
 		try {
@@ -882,6 +895,7 @@ public class TrafficStatisticsInfoController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("动作详情统计一小时数据获取错误"+e);
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return map;
 	}

src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsReportController.java

@@ -30,6 +30,7 @@ import com.nis.domain.dashboard.PageDashboard;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -203,6 +204,7 @@ public class TrafficStatisticsReportController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/dashboard/trafficUserBehavior";
 	}
@@ -283,6 +285,7 @@ public class TrafficStatisticsReportController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return null;
 	}
@@ -503,6 +506,7 @@ public class TrafficStatisticsReportController extends BaseController {
 		} catch (Exception e) {
 			e.printStackTrace();
 			addMessage(redirectAttributes, "error", "request_service_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 	}

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

@@ -31,6 +31,7 @@ import com.nis.domain.maat.LogRecvData;
 import com.nis.util.CodeDicUtils;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -107,6 +108,7 @@ public class DkBehaviorLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询行为识别日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/manipulation/dkBehaviorList";
 	}
@@ -208,6 +210,7 @@ public class DkBehaviorLogController extends BaseController{
 			} catch (Exception e) {
 				logger.error(name +" export failed", e);
 				addMessage(redirectAttributes, "error", "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 	

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

@@ -27,6 +27,7 @@ import com.nis.domain.maat.LogRecvData;
 import com.nis.util.CodeDicUtils;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.dao.dashboard.codedic.CodeResult;
@@ -90,6 +91,7 @@ public class AppLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询App日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/appList";
 	}

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

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcCollectRadiusLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -76,6 +77,7 @@ public class BgpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/bgpList";
@@ -146,6 +148,7 @@ public class BgpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("bgp_control export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -43,6 +43,7 @@ import com.nis.util.CodeDicUtils;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.dao.dashboard.codedic.CodeResult;
@@ -168,6 +169,7 @@ public class CollectVoipLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询VoIP泛收日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/collectVoipList";
 	}
@@ -293,6 +295,7 @@ public class CollectVoipLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("collect_voip export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 	

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

@@ -34,6 +34,7 @@ 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.LogUtils;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -108,6 +109,7 @@ public class DdosLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询Ddos日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/ddosList";
 	}
@@ -187,6 +189,7 @@ public class DdosLogController extends BaseController{
 			} catch (Exception e) {
 				logger.error("DDOS export failed", e);
 				addMessage(redirectAttributes, "error", "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 	

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

@@ -29,6 +29,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -75,6 +76,7 @@ public class DnsLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/dnsList";
@@ -146,6 +148,7 @@ public class DnsLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("DNS export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -32,6 +32,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -93,6 +94,7 @@ public class FtpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询Ftp日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/ftpList";
 	}
@@ -162,6 +164,7 @@ public class FtpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("ftp_control export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -31,6 +31,7 @@ import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.Encodes;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -83,6 +84,7 @@ public class HttpKeyLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/httpKeyList";
@@ -160,6 +162,7 @@ public class HttpKeyLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("http_keyword export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -28,6 +28,7 @@ import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.Encodes;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -80,6 +81,7 @@ public class HttpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/httpList";
@@ -156,6 +158,7 @@ public class HttpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("HTTP export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -29,6 +29,7 @@ import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.Encodes;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -91,6 +92,7 @@ public class HttpRecordLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/httpRecordList";
@@ -178,6 +180,7 @@ public class HttpRecordLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("http_record export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -24,6 +24,7 @@ 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.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -73,6 +74,7 @@ public class IpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/ipList";
@@ -110,6 +112,7 @@ public class IpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/ipList";
@@ -181,6 +184,7 @@ public class IpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("Ip" + " export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 

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

@@ -24,6 +24,7 @@ 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.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -77,6 +78,7 @@ public class IpWhiteLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/ipWhiteList";
@@ -152,6 +154,7 @@ public class IpWhiteLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("Ip" + " export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 

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

@@ -27,6 +27,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -82,6 +83,7 @@ public class IpsecLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询Ipsec日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/ipsecList";
 	}

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

@@ -26,6 +26,7 @@ import com.nis.domain.log.IrDnatLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -68,6 +69,7 @@ public class IrDnatLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/irDnatLogList";
@@ -135,6 +137,7 @@ public class IrDnatLogController extends BaseController {
 			} catch (Exception e) {
 				logger.error("dnat_multiplex export failed", e);
 				addMessage(redirectAttributes, "error", "export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 

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

@@ -26,6 +26,7 @@ import com.nis.domain.log.IrSnatLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -69,6 +70,7 @@ public class IrSnatLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/irSnatLogList";
@@ -136,6 +138,7 @@ public class IrSnatLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("snat_multiplex export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 

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

@@ -25,6 +25,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -67,6 +68,7 @@ public class L2tpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("L2TP日志查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/l2tpLogList";

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

@@ -30,6 +30,7 @@ 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.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -105,6 +106,7 @@ public class MailLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/mailList";
@@ -203,6 +205,7 @@ public class MailLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("mail_control export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -30,6 +30,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -86,6 +87,7 @@ public class MailRecordLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/mailRecordList";
@@ -166,6 +168,7 @@ public class MailRecordLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("mail_record export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -26,6 +26,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -82,6 +83,7 @@ public class MmAvIpLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询音视频IP日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/mmAvIpList";
 	}

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

@@ -31,6 +31,7 @@ import com.nis.domain.log.NtcStreamMediaLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -94,6 +95,7 @@ public class MmAvUrlLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询音视频url日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/ntcStreamMedia";
 	}
@@ -164,6 +166,7 @@ public class MmAvUrlLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("streaming_media export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 

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

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcStreamMediaLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -91,6 +92,7 @@ public class MmFileDigestLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询文件摘要日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/mmFileDigestList";
 	}
@@ -158,6 +160,7 @@ public class MmFileDigestLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("FileDiges export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -24,6 +24,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -67,6 +68,7 @@ public class MmPicIpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("音视频图片IP日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/mmPicIpList";

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

@@ -24,6 +24,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -67,6 +68,7 @@ public class MmPicUrlController extends BaseController{
 		} catch (Exception e) {
 			logger.error("音视频图片URL日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/mmPicUrlList";

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

@@ -28,6 +28,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -74,6 +75,7 @@ public class MmPornAvSampleController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询音频色情样例日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/mmPornAudioSampleList";
 	}
@@ -117,6 +119,7 @@ public class MmPornAvSampleController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询视频色情样例日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/mmPornVideoSampleList";
 	}
@@ -182,6 +185,7 @@ public class MmPornAvSampleController extends BaseController {
 				} catch (Exception e) {
 					logger.error("Video export failed",e);
 					addMessage(redirectAttributes,"error","export_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 	

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

@@ -27,6 +27,7 @@ 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.LogUtils;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -72,6 +73,7 @@ public class MmSampleAudioController extends BaseController{
 		} catch (Exception e) {
 			logger.error("音频样例日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/mmSampleAudioList";
@@ -139,6 +141,7 @@ public class MmSampleAudioController extends BaseController{
 					} catch (Exception e) {
 						logger.error("SampleAudio export failed", e);
 						addMessage(redirectAttributes, "error", "export_failed");
+						LogUtils.saveLog(request, null, e, null);
 					}
 				}
 	

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

@@ -24,6 +24,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -67,6 +68,7 @@ public class MmSampleFaceController extends BaseController{
 		} catch (Exception e) {
 			logger.error("人脸识别日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/mmSampleFaceList";

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

@@ -23,6 +23,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -66,6 +67,7 @@ public class MmSampleLogoController extends BaseController{
 		} catch (Exception e) {
 			logger.error("台标识别日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/mmSampleLogoList";

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

@@ -27,6 +27,7 @@ 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.LogUtils;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -72,6 +73,7 @@ public class MmSamplePicController extends BaseController{
 		} catch (Exception e) {
 			logger.error("图片样例日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/mmSamplePicList";
@@ -137,6 +139,7 @@ public class MmSamplePicController extends BaseController{
 				} catch (Exception e) {
 					logger.error("SamplePic export failed", e);
 					addMessage(redirectAttributes, "error", "export_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 }

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

@@ -23,6 +23,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -66,6 +67,7 @@ public class MmSampleSpeakerController extends BaseController{
 		} catch (Exception e) {
 			logger.error("说话人识别日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/mmSampleSpeakerList";

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

@@ -24,6 +24,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -68,6 +69,7 @@ public class MmSampleVideoController extends BaseController{
 		} catch (Exception e) {
 			logger.error("视频样例日志查询失败！", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/mmSampleVideoList";
@@ -135,6 +137,7 @@ public class MmSampleVideoController extends BaseController{
 				} catch (Exception e) {
 					logger.error("SampleVideo export failed", e);
 					addMessage(redirectAttributes, "error", "export_failed");
+					LogUtils.saveLog(request, null, e, null);
 				}
 			}
 	

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

@@ -29,6 +29,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -76,6 +77,7 @@ public class MmSampleVoipLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询Voip日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/mmSampleVoipList";
 	}
@@ -144,6 +146,7 @@ public class MmSampleVoipLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("voip export failed",e);
 			addMessage(redirectAttributes,"error","export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -26,6 +26,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -86,6 +87,7 @@ public class MmVoipAccountLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询mmVoipAccount日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/mmVoipAccountList";
 	}

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

@@ -30,6 +30,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -93,6 +94,7 @@ public class MmVoipIpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询Voip日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/mmVoipIpList";
 	}
@@ -165,6 +167,7 @@ public class MmVoipIpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("av_voip_control export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 

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

@@ -25,6 +25,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -80,6 +81,7 @@ public class MmVoipLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询Voip日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/mmVoipList";
 	}

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

@@ -24,6 +24,7 @@ import com.nis.domain.log.NtcCollectRadiusLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -75,6 +76,7 @@ public class NtcCollectRadiusLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/radiusLogList";
@@ -139,6 +141,7 @@ public class NtcCollectRadiusLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("radius export failed",e);
 			addMessage(redirectAttributes,"error","export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 

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

@@ -30,6 +30,7 @@ import com.nis.exceptions.MaatConvertException;
 import com.nis.util.CodeDicUtils;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -148,6 +149,7 @@ public class NtcConnRecordLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/connRecordLogList";
@@ -179,9 +181,11 @@ public class NtcConnRecordLogController extends BaseController {
 		} catch (MaatConvertException e) {
 			logger.error("ajaxConnRecordPercent检索失败", e);
 			result.put("error", msgProp.get("request_service_failed"));
+			LogUtils.saveLog(request, null, e, null);
 		} catch (Exception e) {
 			logger.error("ajaxConnRecordPercent检索失败", e);
 			result.put("error", msgProp.get("search_error"));
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return result;
 	}
@@ -317,6 +321,7 @@ public class NtcConnRecordLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("conn_record export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 	

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

@@ -33,6 +33,7 @@ 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.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -97,6 +98,7 @@ public class OpenVpnLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询OpenVpn日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/openVpnList";
 	}
@@ -171,6 +173,7 @@ public class OpenVpnLogController extends BaseController{
 			} catch (Exception e) {
 				logger.error(name+" export failed",e);
 				addMessage(redirectAttributes,"error","export_failed");
+				LogUtils.saveLog(request, null, e, null);
 			}
 		}
 	

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

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcP2pLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -78,6 +79,7 @@ public class P2pLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/p2pList";
@@ -151,6 +153,7 @@ public class P2pLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("p2p_control export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 

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

@@ -25,6 +25,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -67,6 +68,7 @@ public class PptpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("PPTP日志查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		
 		return "/log/ntc/pptpLogList";

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

@@ -27,6 +27,7 @@ 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.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 
@@ -82,6 +83,7 @@ public class SshLogController extends BaseController{
 		} catch (Exception e) {
 			logger.error("查询Ssh日志失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 		return "/log/ntc/sshList";
 	}

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

@@ -29,6 +29,7 @@ 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.LogUtils;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -79,6 +80,7 @@ public class SslLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("SSL日志查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/sslLogList";
@@ -151,6 +153,7 @@ public class SslLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("ssl_control export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -29,6 +29,7 @@ import com.nis.domain.log.NtcSslRecordLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.LogUtils;
 import com.nis.util.StringUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
@@ -80,6 +81,7 @@ public class SslRecordLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("SSL泛收日志查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/ntc/sslRecordLogList";
@@ -153,6 +155,7 @@ public class SslRecordLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("ssl_record export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}
 }

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

@@ -32,6 +32,7 @@ import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.Encodes;
+import com.nis.util.LogUtils;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -86,6 +87,7 @@ public class PxyHttpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("查询失败", e);
 			addMessageLog(model, e.getMessage());
+			LogUtils.saveLog(request, null, e, null);
 		}
 
 		return "/log/pxy/pxyHttpList";
@@ -190,6 +192,7 @@ public class PxyHttpLogController extends BaseController {
 		} catch (Exception e) {
 			logger.error("pxyHttp export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
+			LogUtils.saveLog(request, null, e, null);
 		}
 	}