http、网页关键字日志url和website参数添加html转码

pxyhttp日志增加url和website的查询条件

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
@@ -29,6 +30,7 @@ import com.nis.domain.log.NtcKeywordsUrlLog;
 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.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -46,10 +48,12 @@ public class HttpKeyLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			if (StringUtils.isNotBlank(log.getUrl())) {
-				params.put("searchUrl", log.getUrl());
+				String httpurl = StringEscapeUtils.unescapeHtml(log.getUrl());
+				params.put("searchUrl", httpurl);
 			}
 			if (StringUtils.isNotBlank(log.getWebsite())) {
-				params.put("searchWebsite", log.getWebsite());
+			    String website = StringEscapeUtils.unescapeHtml(log.getWebsite());
+				params.put("searchWebsite", website);
 			}
 			initLogSearchValue(log, params);
 
@@ -103,10 +107,12 @@ public class HttpKeyLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			if (StringUtils.isNotBlank(log.getUrl())) {
-				params.put("searchUrl", log.getUrl());
+				String httpurl = StringEscapeUtils.unescapeHtml(log.getUrl());
+				params.put("searchUrl", httpurl);
 			}
 			if (StringUtils.isNotBlank(log.getWebsite())) {
-				params.put("searchWebsite", log.getWebsite());
+				String website =StringEscapeUtils.unescapeHtml(log.getWebsite());
+				params.put("searchWebsite", website);
 			}
 			initLogSearchValue(log, params);
 
@@ -141,6 +147,8 @@ public class HttpKeyLogController extends BaseController {
 			String cfgIndexInfoNoExport = "," + hColumns;
 			noExportMap.put("http_keyword", cfgIndexInfoNoExport);
 			dataMap.put("http_keyword", list);
+//			String timeRange= initLogMap(log,"http_keyword");
+//			noExportMap.put("timeRange", timeRange);
 			/* } */
 			if ("csv".equals(type)) {
 				this._exportCsv(model, request, response, redirectAttributes, "http_keyword", titleList, classMap,

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -26,6 +27,7 @@ import com.nis.domain.log.NtcHttpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.Encodes;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -43,10 +45,12 @@ public class HttpLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			if (StringUtils.isNotBlank(log.getUrl())) {
-				params.put("searchUrl", log.getUrl());
+				String httpurl =StringEscapeUtils.unescapeHtml(log.getUrl());
+				params.put("searchUrl", httpurl);
 			}
 			if (StringUtils.isNotBlank(log.getWebsite())) {
-				params.put("searchWebsite", log.getWebsite());
+				String website = StringEscapeUtils.unescapeHtml(log.getWebsite());
+				params.put("searchWebsite", website);
 			}
 			initLogSearchValue(log, params);
 
@@ -99,10 +103,12 @@ public class HttpLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			if (StringUtils.isNotBlank(log.getUrl())) {
-				params.put("searchUrl", log.getUrl());
+				String httpurl = StringEscapeUtils.unescapeHtml(log.getUrl());
+				params.put("searchUrl", httpurl);
 			}
 			if (StringUtils.isNotBlank(log.getWebsite())) {
-				params.put("searchWebsite", log.getWebsite());
+				String website = StringEscapeUtils.unescapeHtml(log.getWebsite());
+				params.put("searchWebsite", website);
 			}
 			initLogSearchValue(log, params);
 
@@ -137,6 +143,8 @@ public class HttpLogController extends BaseController {
 			String cfgIndexInfoNoExport = "," + hColumns;
 			noExportMap.put("HTTP", cfgIndexInfoNoExport);
 			dataMap.put("HTTP", list);
+			/*String timeRange= initLogMap(log,"HTTP");
+			noExportMap.put("timeRange", timeRange);*/
 			/* } */
 			if ("csv".equals(type)) {
 				this._exportCsv(model, request, response, redirectAttributes, "HTTP", titleList, classMap, dataMap,

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

@@ -8,6 +8,7 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
@@ -30,6 +31,7 @@ import com.nis.domain.log.PxyHttpLog;
 import com.nis.domain.maat.LogRecvData;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
+import com.nis.util.Encodes;
 import com.nis.util.httpclient.HttpClientUtil;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
@@ -43,12 +45,19 @@ public class PxyHttpLogController extends BaseController {
 			HttpServletResponse response) {
 		try {
 			setLogInfo(request, model, log);
-
+			
 			PageLog<PxyHttpLog> page = new PageLog<PxyHttpLog>(request, response);
 			Map<String, Object> params = new HashMap<String, Object>();
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
-
+			if (StringUtils.isNotBlank(log.getWebsite())) {
+				String website = StringEscapeUtils.unescapeHtml(log.getWebsite());
+				params.put("searchWebsite", website);
+			}
+			if (StringUtils.isNotBlank(log.getUrl())) {
+				String httpurl = StringEscapeUtils.unescapeHtml(log.getUrl());
+				params.put("searchUrl", httpurl);
+			}
 			initLogSearchValue(log, params);
 
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
@@ -112,7 +121,6 @@ public class PxyHttpLogController extends BaseController {
 	@RequestMapping(value = "exportPxy")
 	public void exportPxy(@ModelAttribute("log") PxyHttpLog log, Model model, String hColumns, String type,
 			HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
-		String name= "pxy";
 		try {
 			// export data info
 			setLogInfo(request, model, log);
@@ -128,7 +136,14 @@ public class PxyHttpLogController extends BaseController {
 			params.put("pageSize", page.getPageSize());
 			params.put("pageNo", page.getPageNo());
 			initLogSearchValue(log, params);
-
+			if (StringUtils.isNotBlank(log.getUrl())) {
+				String httpurl = StringEscapeUtils.unescapeHtml(log.getUrl());
+				params.put("searchUrl", httpurl);
+			}
+			if (StringUtils.isNotBlank(log.getWebsite())) {
+				String website = StringEscapeUtils.unescapeHtml(log.getWebsite());
+				params.put("searchWebsite", website);
+			}
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
 			System.out.print(log.getFunctionId());
 			model.addAttribute("serviceList", serviceList);
@@ -150,18 +165,10 @@ public class PxyHttpLogController extends BaseController {
 				l.setFunctionId(log.getFunctionId());
 				setLogAction(l, serviceList);
 			}
-			if(log.getFunctionId()==210){
-				name="http_monit";
-			}else if(log.getFunctionId()==207){
-				name="http_block";
-			}else if(log.getFunctionId()==208){
-				name="http_redirect";
-			}else if(log.getFunctionId()==209){
-				name="http_replace";
-			}
 			
-			titleList.add(name);
+			String pxyName=getPxyName(log.getFunctionId());
-			classMap.put(name, PxyHttpLog.class);
+			titleList.add(pxyName);
+			classMap.put(pxyName, PxyHttpLog.class);
 			SysUser user = UserUtils.getUser();
 			if (!user.isAdmin()) {
 				hColumns += ",scene_file,";
@@ -169,19 +176,40 @@ public class PxyHttpLogController extends BaseController {
 				hColumns += ",";
 			}
 			String cfgIndexInfoNoExport = "," + hColumns;
-			noExportMap.put(name, cfgIndexInfoNoExport);
+			noExportMap.put(pxyName, cfgIndexInfoNoExport);
-			dataMap.put(name, list);
+			dataMap.put(pxyName, list);
-			
+			/*String timeRange= initLogMap(log,pxyName);
+			noExportMap.put("timeRange", timeRange);*/
 			if ("csv".equals(type)) {
-				this._exportCsv(model, request, response, redirectAttributes, name, titleList, classMap,
+				this._exportCsv(model, request, response, redirectAttributes, pxyName, titleList, classMap,
 						dataMap, noExportMap);
 			} else {
-				this._export(model, request, response, redirectAttributes, name, titleList, classMap, dataMap,
+				this._export(model, request, response, redirectAttributes, pxyName, titleList, classMap, dataMap,
 						noExportMap);
 			}
 		} catch (Exception e) {
-			logger.error(name +" export failed", e);
+			logger.error("pxyHttp export failed", e);
 			addMessage(redirectAttributes, "error", "export_failed");
 		}
 	}
+	
+	public String getPxyName(Integer functionId){
+		String pxyName="";
+		if (functionId == 200) {
+			pxyName="ip_intercept";
+		} else if (functionId == 201) {
+			pxyName="domain_intercept";
+		} else if (functionId == 207) {
+			pxyName="http_block";
+		} else if (functionId == 208) {
+			pxyName="http_redirect";
+		} else if (functionId == 209) {
+			pxyName="http_replace";
+		} else if (functionId == 210) {
+			pxyName="http_monit";
+		}
+		return pxyName;
+	}
+	
+	
 }

src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp

@@ -196,6 +196,18 @@
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 								</div>
+								<div class="col-md-4">
+									<div class="form-group">
+										<label>URL：</label>
+										<input name="url" type="text" class="form-control" value="${log.url }"/>
+									</div>
+								</div>
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="website"></spring:message>：</label>
+										<input name="website" type="text" class="form-control" value="${log.website }"/>
+									</div>
+								</div>
 								</div>
 							</div>
 						<!-- /筛选搜索内容栏    结束-->