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:
DuanDongmei
2018-11-26 09:43:54 +08:00
parent 00ec6b4fb0 966bf52b36
commit 2dd94d97f1
20 changed files with 55 additions and 39 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;
}

14
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -1371,7 +1371,7 @@ public class BaseController {
_cfg.setCfgType(regionDict.getConfigRegionValue());
_cfg.setCreateTime(date);
_cfg.setCreatorId(UserUtils.getUser().getId());
_cfg.setDoLog(1);
_cfg.setDoLog(2);
_cfg.setFunctionId(regionDict.getFunctionId());
_cfg.setIsAudit(0);
if(fullMap.get(Long.parseLong(_cfg.getUserRegion1()))) {
@@ -1425,12 +1425,12 @@ public class BaseController {
if(isSend.equals("1")) {
groupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
}
//需要获取数值域的id
if(serviceDict!=null&&serviceDict.getProtocolId()!=null) {
if(serviceDict!=null&&serviceDict.getProtocolId()!=null&&serviceDict.getProtocolId()>0) {
// numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
}
}
} catch (Exception e) {
e.printStackTrace();
logger.info("获取编译ID出错");
@@ -1454,7 +1454,7 @@ public class BaseController {
cfg.setCfgType(regionDict.getConfigRegionValue());
cfg.setCreateTime(date);
cfg.setCreatorId(UserUtils.getUser().getId());
cfg.setDoLog(1);
cfg.setDoLog(2);
cfg.setFunctionId(regionDict.getFunctionId());
if(isSend.equals("1")) {
cfg.setIsAudit(Constants.AUDIT_YES);
@@ -1589,7 +1589,7 @@ public class BaseController {
cfg.setCfgType(regionDict.getConfigRegionValue());
cfg.setCreateTime(date);
cfg.setCreatorId(UserUtils.getUser().getId());
cfg.setDoLog(1);
cfg.setDoLog(2);
cfg.setFunctionId(regionDict.getFunctionId());
if(isSend.equals("1")) {
cfg.setIsAudit(Constants.AUDIT_YES);
@@ -1680,7 +1680,7 @@ public class BaseController {
cfg.setCfgType(regionDict.getConfigRegionValue());
cfg.setCreateTime(date);
cfg.setCreatorId(UserUtils.getUser().getId());
cfg.setDoLog(1);
cfg.setDoLog(2);
cfg.setFunctionId(regionDict.getFunctionId());
cfg.setIsAudit(0);
cfg.setIsValid(0);
@@ -1759,7 +1759,7 @@ public class BaseController {
cfg.setCfgType(regionDict.getConfigRegionValue());
cfg.setCreateTime(date);
cfg.setCreatorId(UserUtils.getUser().getId());
cfg.setDoLog(1);
cfg.setDoLog(2);
cfg.setFunctionId(regionDict.getFunctionId());
cfg.setIsAudit(0);
cfg.setIsValid(0);

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);

14
src/main/resources/nis.properties
View File

@@ -511,10 +511,10 @@ ipv6_default_ip_range_value=::-::
port_default=0
port_mask_default=0/65535
#MAAT CFG \u4e00\u4e9b\u9ed8\u8ba4\u503c
maat_cfg_dolog_default=1
maat_cfg_dolog_doblacklist_default=1
maat_cfg_dolog_default=2
maat_cfg_dolog_doblacklist_default=2
maat_cfg_dolog_configpercent_default=100
maat_cfg_dolog_configoption_default=1
maat_cfg_dolog_configoption_default=2
#app\uff0c\u57fa\u7840\u534f\u8bae\uff0c\u7279\u5b9a\u670d\u52a1\u7684userregion\u5206\u9694\u7b26
app_cfg_userregion_splitor=&
app_id_region=APP_ID
@@ -543,17 +543,17 @@ ipv4_ip_range_regexp_new=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d
ipv4_ip_subnet_regexp_original=^(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|[1-9])\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)\\.(0|1\\d{2}|2[0-4]\\d|25[0-5]|[1-9]\\d|\\d)/(3[0-2]|1[0-9]|2[0-9]|[0-9])$
#\u57df\u540d\u9a8c\u8bc1\u6b63\u5219
domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+$
#IP复用maat json中的ip region单次send 最大个数
#IP\u590D\u7528maat json\u4E2D\u7684ip region\u5355\u6B21send \u6700\u5927\u4E2A\u6570
maat_json_send_size=20000
#导入验证的线程数量
#\u5BFC\u5165\u9A8C\u8BC1\u7684\u7EBF\u7A0B\u6570\u91CF
mulity_thread_size=5
ntcRadiusReport=ntcRadiusReport
ntcCollectVoipLog=ntcCollectVoipLogs
ntcKeywordsUrlLog=ntcKeywordsUrlLogs
save_and_del_thread_size=5
#mysql 单个sql大小限制,根据mariadb相关参数配置
#mysql \u5355\u4E2Asql\u5927\u5C0F\u9650\u5236,\u6839\u636Emariadb\u76F8\u5173\u53C2\u6570\u914D\u7F6E
max_allowed_packet=1048576
#http client连接池相关参数，http_max_connection:最大连接数，default_max_perroute:每个主机地址的并发数，poolcm_socket_timeout:socket超时时间
#http client\u8FDE\u63A5\u6C60\u76F8\u5173\u53C2\u6570\uFF0Chttp_max_connection:\u6700\u5927\u8FDE\u63A5\u6570\uFF0Cdefault_max_perroute:\u6BCF\u4E2A\u4E3B\u673A\u5730\u5740\u7684\u5E76\u53D1\u6570\uFF0Cpoolcm_socket_timeout:socket\u8D85\u65F6\u65F6\u95F4
http_max_connection=1000
default_max_perroute=100
poolcm_socket_timeout=3000

2
src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
View File

@@ -143,7 +143,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
View File

@@ -143,7 +143,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
View File

@@ -176,7 +176,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
View File

@@ -174,7 +174,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
View File

@@ -221,7 +221,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>

2
src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp
View File

@@ -125,7 +125,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
<input type="hidden" id="appCode" name="appCode" value="${_cfg.appCode}">
<input type="hidden" id="behavCode" name="behavCode" value="${_cfg.behavCode}">
<input type="hidden" id="doLog" name="doLog" value="1">
<input type="hidden" id="doLog" name="doLog" value="2">
<!-- 配置域类型 -->
<div class="form-body">
<div class="row">

2
src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
View File

@@ -175,7 +175,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>

2
src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
View File

@@ -163,7 +163,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>

2
src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
View File

@@ -238,7 +238,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq 1}">
<c:if test="${dict.itemCode eq 2}">
<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</c:if>
<%-- <c:choose>

3
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
View File

@@ -13,6 +13,9 @@
$(document)
.ready(
function() {
if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
$("input[name=doLog][value=1]").prop("checked",true);
}
/* $(".glyphicon-plus").first().click(); */
/* $("#cancel").on("click", function() {
window.history.back();

3
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -13,6 +13,9 @@
$(document)
.ready(
function() {
if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
$("input[name=doLog][value=1]").prop("checked",true);
}
$(".glyphicon-plus").first().click();
/* $("#cancel").on("click", function() {
window.history.back();

5
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -13,6 +13,9 @@
$(document)
.ready(
function() {
if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
$("input[name=doLog][value=1]").prop("checked",true);
}
$(".action").on("change", function() {
switchAction($("input[name=action]:checked").val());
//拦截根据action切换动作部分
@@ -454,7 +457,7 @@
</div>
</div>
<!-- dolog begin-->
<div class="row interceptDoLog hidden">
<div class="row interceptDoLog">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

9
src/main/webapp/WEB-INF/views/cfg/proxy/cache/form.jsp vendored
View File

@@ -13,6 +13,9 @@
$(document)
.ready(
function() {
if($("input[name='compileId']").val()==null||$("input[name='compileId']").val()==''){
$("input[name=doLog][value=1]").prop("checked",true);
}
$(".switch").bootstrapSwitch({
/* onText:"<spring:message code='ON'/>",
offText:"<spring:message code='OFF'/>", */
@@ -78,11 +81,11 @@
$("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId"));
if($(this).val()==128){
$("#doLog").val(0);
$("input:radio[name='doLog']").attr("disabled",true);
// $("#doLog").val(0);
// $("input:radio[name='doLog']").attr("disabled",true);
$(".cacheAction").hide();
}else{
$("input:radio[name='doLog']").attr("disabled",false);
// $("input:radio[name='doLog']").attr("disabled",false);
$(".cacheAction").show();
}
});

1
src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
View File

@@ -48,6 +48,7 @@
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
<input id="isLogTotalSearch" name="isLogTotalSearch" type="hidden" value="${log.isLogTotalSearch}"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">

4
src/main/webapp/static/global/scripts/common.js
View File

@@ -864,7 +864,7 @@ var switchAction=function(action){
/*************************action切换时，隐藏白名单和drop的是否记录日志*****************************/
//drop whitelist
if(action == 32 || action==128 || action==96){
/* if(action == 32 || action==128 || action==96){
$(".doLog").addClass("hidden");
$("input[name=doLog][value=0]").prop("checked",true);
$(".interceptDoLog").find("input[name=doLog][value=0]").prop("checked",true);
@@ -890,7 +890,7 @@ var switchAction=function(action){
}
if(action !=128 && action !=32 &&action !=96){
$(".doLog").removeClass("hidden");
}
}*/
}
//ipType、ipPattern、portPattern选项变化时调用此方法，添加默认值
var switchIpInfo=function(obj){