gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
leijun
2018-10-10 15:29:14 +08:00
parent 1b3ee67f4c 1f93df146c
commit 8cc18a96a7
42 changed files with 563 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ public class DkBehaviorLogController extends BaseController{
logger.info("查询行为识别日志成功");
}
} catch (Exception e) {
logger.info("查询行为识别日志失败", e);
logger.error("查询行为识别日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/manipulation/dkBehaviorList";

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

@@ -76,7 +76,7 @@ public class AppLogController extends BaseController{
logger.info("查询App日志成功");
}
} catch (Exception e) {
logger.info("查询App日志失败", e);
logger.error("查询App日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/appList";

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

@@ -1,7 +1,5 @@
package com.nis.web.controller.log.ntc;
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -10,23 +8,18 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.util.FileUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.log.NtcIpLog;
import com.nis.domain.log.NtcBGPLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.httpclient.HttpClientUtil;
@@ -37,9 +30,9 @@ import com.nis.web.controller.BaseController;
public class BgpLogController extends BaseController {
@RequestMapping(value = {"list", ""})
public String list(@ModelAttribute("log") NtcIpLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
public String list(@ModelAttribute("log") NtcBGPLog log, Model model, HttpServletRequest request, HttpServletResponse response) {
try {
PageLog<NtcIpLog> page = new PageLog<NtcIpLog>(request, response);
PageLog<NtcBGPLog> page = new PageLog<NtcBGPLog>(request, response);
Map<String, Object> params = new HashMap<String, Object>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
@@ -55,11 +48,11 @@ public class BgpLogController extends BaseController {
logger.info("查询结果:" + recv);
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcIpLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcIpLog>>(){}.getType());
LogRecvData<NtcBGPLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcBGPLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
page.setList(fromJson.getData().getList());
List<NtcIpLog> list = page.getList();
for (NtcIpLog l : list) {
List<NtcBGPLog> list = page.getList();
for (NtcBGPLog l : list) {
l.setFunctionId(log.getFunctionId());
setLogAction(l,serviceList);
}

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

@@ -91,7 +91,7 @@ public class DdosLogController extends BaseController{
logger.info("查询Ddos日志成功");
}
} catch (Exception e) {
logger.info("查询Ddos日志失败", e);
logger.error("查询Ddos日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/ddosList";

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

@@ -78,7 +78,7 @@ public class FtpLogController extends BaseController{
logger.info("查询Ftp日志成功");
}
} catch (Exception e) {
logger.info("查询Ftp日志失败", e);
logger.error("查询Ftp日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/ftpList";

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

@@ -76,7 +76,7 @@ public class IpsecLogController extends BaseController{
logger.info("查询Ipsec日志成功");
}
} catch (Exception e) {
logger.info("查询Ipsec日志失败", e);
logger.error("查询Ipsec日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/ipsecList";

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

@@ -62,7 +62,7 @@ public class L2tpLogController extends BaseController {
model.addAttribute("page", page);
}
} catch (Exception e) {
logger.info("L2TP日志查询失败", e);
logger.error("L2TP日志查询失败", e);
addMessageLog(model, e.getMessage());
}

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

@@ -76,7 +76,7 @@ public class MmAvIpLogController extends BaseController{
logger.info("查询音视频IP日志成功");
}
} catch (Exception e) {
logger.info("查询音视频IP日志失败", e);
logger.error("查询音视频IP日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmAvIpList";

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

@@ -76,7 +76,7 @@ public class MmAvUrlLogController extends BaseController{
logger.info("查询音视频url日志成功");
}
} catch (Exception e) {
logger.info("查询音视频url日志失败", e);
logger.error("查询音视频url日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmAvUrlList";

85
src/main/java/com/nis/web/controller/log/ntc/MmFileDigestLogController.java Normal file
View File

@@ -0,0 +1,85 @@
package com.nis.web.controller.log.ntc;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.http.client.ClientProtocolException;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.log.MmFileDigestLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@Controller
@RequestMapping(value = "${adminPath}/log/ntc/mmFileDigestLogs")
public class MmFileDigestLogController extends BaseController{
/**
* 音视频url日志
* @param model
* @param entry
* @param request
* @param response
* @return
* @throws ClientProtocolException
* @throws IOException
*/
@RequestMapping(value={"list",""})
public String list(Model model,@ModelAttribute("log")MmFileDigestLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
try {
PageLog<MmFileDigestLog> page = new PageLog<MmFileDigestLog>(request, response);
Map<String, Object> params=new HashMap<>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
//查询值判断
initLogSearchValue(entry,params);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
model.addAttribute("serviceList", serviceList);
String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_MMFILEDIGEST_LOG;
String jsonString = HttpClientUtil.getMsg(url,params,request);
Gson gson = new GsonBuilder().create();
//gson泛型支持
LogRecvData<MmFileDigestLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<MmFileDigestLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<MmFileDigestLog> data = fromJson.getData();
page.setList(data.getList());
List<MmFileDigestLog> list = page.getList();
for (MmFileDigestLog l : list) {
l.setFunctionId(entry.getFunctionId());
setLogAction(l,serviceList);
}
model.addAttribute("page", page);
logger.info("查询文件摘要日志成功");
}
} catch (Exception e) {
logger.error("查询文件摘要日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmFileDigestList";
}
}

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

@@ -61,7 +61,7 @@ public class MmPicIpLogController extends BaseController {
logger.info("音视频图片IP日志查询成功！");
}
} catch (Exception e) {
logger.info("音视频图片IP日志查询失败！", e);
logger.error("音视频图片IP日志查询失败！", e);
addMessageLog(model, e.getMessage());
}

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

@@ -61,7 +61,7 @@ public class MmPicUrlController extends BaseController{
logger.info("音视频图片URL日志查询成功！");
}
} catch (Exception e) {
logger.info("音视频图片URL日志查询失败！", e);
logger.error("音视频图片URL日志查询失败！", e);
addMessageLog(model, e.getMessage());
}

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

@@ -63,7 +63,7 @@ public class MmPornAvSampleController extends BaseController {
logger.info("查询音频色情样例日志成功");
}
} catch (Exception e) {
logger.info("查询音频色情样例日志失败", e);
logger.error("查询音频色情样例日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmPornAudioSampleList";
@@ -104,7 +104,7 @@ public class MmPornAvSampleController extends BaseController {
logger.info("查询视频色情样例日志成功");
}
} catch (Exception e) {
logger.info("查询视频色情样例日志失败", e);
logger.error("查询视频色情样例日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmPornVideoSampleList";

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

@@ -61,7 +61,7 @@ public class MmSampleAudioController extends BaseController{
logger.info("音频样例日志查询成功！");
}
} catch (Exception e) {
logger.info("音频样例日志查询失败！", e);
logger.error("音频样例日志查询失败！", e);
addMessageLog(model, e.getMessage());
}

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

@@ -61,7 +61,7 @@ public class MmSampleFaceController extends BaseController{
logger.info("人脸识别日志查询成功！");
}
} catch (Exception e) {
logger.info("人脸识别日志查询失败！", e);
logger.error("人脸识别日志查询失败！", e);
addMessageLog(model, e.getMessage());
}

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

@@ -61,7 +61,7 @@ public class MmSampleLogoController extends BaseController{
logger.info("台标识别日志查询成功！");
}
} catch (Exception e) {
logger.info("台标识别日志查询失败！", e);
logger.error("台标识别日志查询失败！", e);
addMessageLog(model, e.getMessage());
}

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

@@ -61,7 +61,7 @@ public class MmSamplePicController extends BaseController{
logger.info("图片样例日志查询成功！");
}
} catch (Exception e) {
logger.info("图片样例日志查询失败！", e);
logger.error("图片样例日志查询失败！", e);
addMessageLog(model, e.getMessage());
}

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

@@ -61,7 +61,7 @@ public class MmSampleSpeakerController extends BaseController{
logger.info("说话人识别日志查询成功！");
}
} catch (Exception e) {
logger.info("说话人识别日志查询失败！", e);
logger.error("说话人识别日志查询失败！", e);
addMessageLog(model, e.getMessage());
}

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

@@ -61,7 +61,7 @@ public class MmSampleVideoController extends BaseController{
logger.info("视频样例日志查询成功！");
}
} catch (Exception e) {
logger.info("视频样例日志查询失败！", e);
logger.error("视频样例日志查询失败！", e);
addMessageLog(model, e.getMessage());
}

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

@@ -68,7 +68,7 @@ public class MmSampleVoipLogController extends BaseController {
logger.info("查询Voip样例日志成功");
}
} catch (Exception e) {
logger.info("查询Voip日志失败", e);
logger.error("查询Voip日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmSampleVoipList";

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

@@ -75,7 +75,7 @@ public class MmVoipAccountLogController extends BaseController{
logger.info("查询mmVoipAccount日志成功");
}
} catch (Exception e) {
logger.info("查询mmVoipAccount日志失败", e);
logger.error("查询mmVoipAccount日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmVoipAccountList";

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

@@ -75,7 +75,7 @@ public class MmVoipIpLogController extends BaseController{
logger.info("查询VoipIp日志成功");
}
} catch (Exception e) {
logger.info("查询VoipIp日志失败", e);
logger.error("查询VoipIp日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmVoipIpList";

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

@@ -75,7 +75,7 @@ public class MmVoipLogController extends BaseController{
logger.info("查询Voip日志成功");
}
} catch (Exception e) {
logger.info("查询Voip日志失败", e);
logger.error("查询Voip日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmVoipList";

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

@@ -77,7 +77,7 @@ public class OpenVpnLogController extends BaseController{
logger.info("查询OpenVpn日志成功");
}
} catch (Exception e) {
logger.info("查询OpenVpn日志失败", e);
logger.error("查询OpenVpn日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/openVpnList";

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

@@ -42,7 +42,7 @@ public class P2pLogController extends BaseController {
String url = Constants.LOG_BASE_URL + Constants.NTC_P2P_LOG;
String recv = HttpClientUtil.getMsg(url, params, request);
logger.info("查询结果:" + recv);
logger.error("查询结果:" + recv);
if (StringUtils.isNotBlank(recv)) {
Gson gson = new GsonBuilder().create();
LogRecvData<NtcP2pLog> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<NtcP2pLog>>(){}.getType());

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

@@ -62,7 +62,7 @@ public class PptpLogController extends BaseController {
model.addAttribute("page", page);
}
} catch (Exception e) {
logger.info("PPTP日志查询失败", e);
logger.error("PPTP日志查询失败", e);
addMessageLog(model, e.getMessage());
}

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

@@ -77,7 +77,7 @@ public class SshLogController extends BaseController{
logger.info("查询Ssh日志成功");
}
} catch (Exception e) {
logger.info("查询Ssh日志失败", e);
logger.error("查询Ssh日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/sshList";

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

@@ -66,7 +66,7 @@ public class SslLogController extends BaseController {
model.addAttribute("page", page);
}
} catch (Exception e) {
logger.info("SSL日志查询失败", e);
logger.error("SSL日志查询失败", e);
addMessageLog(model, e.getMessage());
}