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

修改配置中记录日志默认值为2，流媒体跟VoIP，缓存策略，拦截策略默认为1，修改httpclient gson转换时错误

Browse Source
This commit is contained in:
zhanghongqing
2018-11-23 19:23:57 +08:00
parent c1ee4468d4
commit 966bf52b36
19 changed files with 45 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/util/Constants.java
View File

@@ -15,10 +15,10 @@ public final class Constants {
/**
* MaatConfig 默认值
*/
public static Integer MAAT_CFG_DOLOG_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_default", 1);
public static Integer MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_doblacklist_default", 1);
public static Integer MAAT_CFG_DOLOG_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_default", 2);
public static Integer MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_doblacklist_default", 2);
public static Integer MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configpercent_default", 100);
public static Integer MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configoption_default", 1);
public static Integer MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configoption_default", 2);
/**
* iP默认值
*/

8
src/main/java/com/nis/util/httpclient/HttpClientUtil.java
View File

@@ -42,6 +42,8 @@ import com.nis.exceptions.MaatConvertException;
import com.nis.util.Constants;
import com.nis.util.Encodes;
import com.nis.util.StringUtil;
import net.sf.json.JSONObject;
/**
* @ClassName: HttpClientBean.java
* @Description: TODO
@@ -298,8 +300,8 @@ public class HttpClientUtil {
* @return
*/
public static String galaxyMessageFormat(String recv){
Gson gson = new Gson();
Map parse = gson.fromJson(recv,Map.class);
JSONObject jobj = JSONObject.fromObject(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");
@@ -331,7 +333,7 @@ public class HttpClientUtil {
}
map.put("list", reslist);
parse.put("data", map);
recv = gson.toJson(parse);
recv = parse.toString();
}
return recv;
}

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

@@ -633,7 +633,8 @@ public class AvController extends BaseController {
FileUtils.createDirectory(srcFilePath);
//保存源文件
for (CommonsMultipartFile sinFile : srcFile) {
String srcFileAllPath = srcFilePath+sep+random+FileUtils.getSuffix(sinFile.getOriginalFilename(), true);//新的文件名
String r = UUID.randomUUID()+"";
String srcFileAllPath = srcFilePath+sep+r+FileUtils.getSuffix(sinFile.getOriginalFilename(), true);//新的文件名
File uploadSrcFile = new File(srcFileAllPath);
try {
FileCopyUtils.copy(sinFile.getBytes(), uploadSrcFile);