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://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
This commit is contained in:
duandongmei
2018-07-11 16:18:23 +08:00
parent 89ec630a33 f067b24fba
commit 4466b9c1e1
17 changed files with 493 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,7 @@ public class IpMultiplexPoolCfgController extends BaseController {
}
@RequestMapping(value = {"/audit"})
//@RequiresPermissions(value={"ip:mulitiplex:pool:audit"})
@RequiresPermissions(value={"ip:mulitiplex:pool:audit"})
public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
if(!StringUtil.isEmpty(ids)){
String[] idArray = ids.split(",");

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

@@ -1,6 +1,9 @@
package com.nis.web.controller.configuration.ntc;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -39,6 +42,7 @@ import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.ToMaatResult.ResponseData;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
@@ -107,33 +111,45 @@ public class AvController extends BaseController {
public String saveFileSample(Model model,HttpServletRequest request,HttpServletResponse response, RedirectAttributes redirectAttributes,
String ids,AvFileSampleCfg entity,MultipartFile srcFile,MultipartFile sampleFile){
try{
if(srcFile!=null && sampleFile!=null &&
srcFile.getSize()>0 && sampleFile.getSize()>0){
// if(srcFile!=null && sampleFile!=null &&
// srcFile.getSize()>0 && sampleFile.getSize()>0){
if(srcFile!=null && srcFile.getSize()>0){
String sep = System.getProperty("file.separator");
String srcFilePath = request.getRealPath("/")+"srcFile";
String sampleFilePath = request.getRealPath("/")+"sampleFile";
String srcFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"srcFile";//源文件保存路径
String sampleFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"sampleFile";//样例文件保存路径
String resultFilePath = Constants.AV_FILE_PATH+entity.getCfgType()+sep+"resultFile";//结果文件保存路径
FileUtils.createDirectory(srcFilePath);
FileUtils.createDirectory(sampleFilePath);
String srcFileName = UUID.randomUUID()+FileUtils.getSuffix(srcFile.getOriginalFilename(), true);
String sampleFileName = UUID.randomUUID()+FileUtils.getSuffix(sampleFile.getOriginalFilename(), true);
File uploadSrcFile = new File(srcFilePath+sep+srcFileName);
File uploadSampleFile = new File(sampleFilePath+sep+sampleFileName);
FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);
FileCopyUtils.copy(sampleFile.getBytes(),uploadSampleFile);
String fileName = UUID.randomUUID()+"";
String srcFileAllPath = srcFilePath+sep+fileName+FileUtils.getSuffix(srcFile.getOriginalFilename(), true);
String sampleFileAllPath = sampleFilePath+sep+fileName+".sample";
String resultFileAllPath = resultFilePath+sep+fileName+".result";
entity.setSrcPath(srcFileAllPath);
entity.setSamplePath(sampleFileAllPath);
entity.setResultPath(resultFileAllPath);
File uploadSrcFile = new File(srcFileAllPath);
File uploadSampleFile = new File(sampleFileAllPath);
FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);//保存源文件
String host = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
String srcUrl = host+"/srcFile/"+uploadSrcFile.getName();
String sampleUrl = host+"/sampleFile/"+uploadSampleFile.getName();
String srcUrl = host+srcFilePath.substring(srcFilePath.indexOf(Constants.AV_FILE_PATH)+Constants.AV_FILE_PATH.length()-1)+sep+uploadSrcFile.getName();
String sampleUrl = host+sampleFilePath.substring(sampleFilePath.indexOf(Constants.AV_FILE_PATH)+Constants.AV_FILE_PATH.length()-1)+sep+uploadSampleFile.getName();
srcUrl = srcUrl.replace("\\", "/");
sampleUrl = sampleUrl.replace("\\", "/");
logger.info("srcUrl:"+srcUrl);
logger.info("sampleUrl:"+sampleUrl);
String srcMd5 = FileUtils.getFileMD5(uploadSrcFile);
String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile);
entity.setSrcUrl(srcUrl);
entity.setSrcPath(uploadSrcFile.getPath());
entity.setSampleUrl(sampleUrl);
entity.setSamplePath(uploadSampleFile.getPath());
entity.setSrcMd5(srcMd5);
entity.setSampleMd5(sampleMd5);
// File uploadSrcFile = new File(srcFilePath);
// FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);
// String srcMd5 = FileUtils.getFileMD5(uploadSrcFile);
// File uploadSampleFile = new File(sampleFilePath);
// String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile);
// entity.setSrcMd5(srcMd5);
// entity.setSampleMd5(sampleMd5);
}
avCfgService.saveOrUpdateAvFileSample(entity);