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

Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

Browse Source
This commit is contained in:
lihaochen
2018-12-22 17:44:12 +08:00
parent 70612f32af 953e00bc25
commit fb5c819025
64 changed files with 3491 additions and 2686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/nis/domain/configuration/BaseCfg.java
View File

@@ -261,18 +261,20 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
*/ */
@ExcelField(title="do_log",dictType="DO_LOG",sort=30) @ExcelField(title="do_log",dictType="DO_LOG",sort=30)
protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT; protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
@ExcelField(title="do_blacklist",dictType="DO_BLACKLIST",sort=31)
protected Integer doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
protected Integer groupId;//仅用于copy属性使用 protected Integer groupId;//仅用于copy属性使用
protected Integer regionId;//仅用于copy属性使用 protected Integer regionId;//仅用于copy属性使用
// protected Integer numberRegionGroupId;//仅用于copy属性使用 protected Integer numberRegionGroupId;//仅用于copy属性使用
protected Integer numberRegionRegionId;//仅用于copy属性使用 protected Integer numberRegionRegionId;//仅用于copy属性使用
// public Integer getNumberRegionGroupId() { public Integer getNumberRegionGroupId() {
// return numberRegionGroupId; return numberRegionGroupId;
// } }
// public void setNumberRegionGroupId(Integer numberRegionGroupId) { public void setNumberRegionGroupId(Integer numberRegionGroupId) {
// this.numberRegionGroupId = numberRegionGroupId; this.numberRegionGroupId = numberRegionGroupId;
// } }
public Integer getNumberRegionRegionId() { public Integer getNumberRegionRegionId() {
return numberRegionRegionId; return numberRegionRegionId;
} }
@@ -964,5 +966,11 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
public void setCancelRequestId(Integer cancelRequestId) { public void setCancelRequestId(Integer cancelRequestId) {
this.cancelRequestId = cancelRequestId; this.cancelRequestId = cancelRequestId;
} }
public Integer getDoBlackList() {
return doBlackList;
}
public void setDoBlackList(Integer doBlackList) {
this.doBlackList = doBlackList;
}
} }

21
src/main/java/com/nis/domain/configuration/BaseIpCfg.java
View File

@@ -69,7 +69,28 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
protected Integer appCode;//仅用于copy属性使用 protected Integer appCode;//仅用于copy属性使用
protected Integer behavCode;//仅用于copy属性使用 protected Integer behavCode;//仅用于copy属性使用
protected Integer specServiceId;//仅用于copy属性使用 protected Integer specServiceId;//仅用于copy属性使用
protected String antiddosProtocol;//仅用于copy属性使用
protected Long bpsThreadshold;//仅用于copy属性使用
protected Long ppsThreadshold;//仅用于copy属性使用
public String getAntiddosProtocol() {
return antiddosProtocol;
}
public void setAntiddosProtocol(String antiddosProtocol) {
this.antiddosProtocol = antiddosProtocol;
}
public Long getBpsThreadshold() {
return bpsThreadshold;
}
public void setBpsThreadshold(Long bpsThreadshold) {
this.bpsThreadshold = bpsThreadshold;
}
public Long getPpsThreadshold() {
return ppsThreadshold;
}
public void setPpsThreadshold(Long ppsThreadshold) {
this.ppsThreadshold = ppsThreadshold;
}
public Integer getAppCode() { public Integer getAppCode() {
return appCode; return appCode;
} }

8
src/main/java/com/nis/domain/configuration/BaseStringCfg.java
View File

@@ -44,6 +44,14 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
protected Integer behavCode;//仅用于copy属性使用 protected Integer behavCode;//仅用于copy属性使用
protected Integer specServiceId;//仅用于copy属性使用 protected Integer specServiceId;//仅用于copy属性使用
protected String domain;//仅用于copy属性使用 protected String domain;//仅用于copy属性使用
protected Integer dnsStrategyId;//仅用作复制属性使用
public Integer getDnsStrategyId() {
return dnsStrategyId;
}
public void setDnsStrategyId(Integer dnsStrategyId) {
this.dnsStrategyId = dnsStrategyId;
}
public String getDomain() { public String getDomain() {
return domain; return domain;
} }

6
src/main/java/com/nis/domain/configuration/DnsResStrategy.java
View File

@@ -16,7 +16,7 @@ public class DnsResStrategy extends BaseCfg<DnsResStrategy> {
private static final long serialVersionUID = -2720862431960415564L; private static final long serialVersionUID = -2720862431960415564L;
private String indexTable="dns_res_strategy"; private String indexTable="dns_res_strategy";
private Integer resGroup1Id; private Integer resGroup1Id;
@ExcelField(title="res_group_num",sort=3) @ExcelField(title="res_group_num",sort=4)
private Integer resGroup1Num; private Integer resGroup1Num;
private Integer resGroup2Id; private Integer resGroup2Id;
private Integer resGroup2Num; private Integer resGroup2Num;
@@ -28,9 +28,9 @@ public class DnsResStrategy extends BaseCfg<DnsResStrategy> {
private Integer resGroup5Num; private Integer resGroup5Num;
private Integer minTtl; private Integer minTtl;
private Integer maxTtl; private Integer maxTtl;
@ExcelField(title="group",sort=2) @ExcelField(title="group",sort=3)
private String group1Name; private String group1Name;
@ExcelField(title="min_ttl",sort=4) @ExcelField(title="min_ttl",sort=5)
private String miTtlmax; private String miTtlmax;
//仅作导入使用 //仅作导入使用
private String ttl; private String ttl;

5
src/main/java/com/nis/domain/maat/MaatCfg.java
View File

@@ -561,6 +561,9 @@ public class MaatCfg implements Serializable {
this.areaEffectiveIds = areaEffectiveIds; this.areaEffectiveIds = areaEffectiveIds;
} }
public Integer getDoBlackList() { public Integer getDoBlackList() {
if(doBlackList==null){
doBlackList = 1;
}
return doBlackList; return doBlackList;
} }
public void setDoBlackList(Integer doBlackList) { public void setDoBlackList(Integer doBlackList) {
@@ -678,7 +681,7 @@ public class MaatCfg implements Serializable {
} }
public void initDefaultValue() { public void initDefaultValue() {
this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT; this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT;
this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT; // this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;
this.configPercent=Constants.MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT; this.configPercent=Constants.MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT;
this.configOption=Constants.MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT; this.configOption=Constants.MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT;
this.startTime=new Date(); this.startTime=new Date();

9
src/main/java/com/nis/util/excel/ExcelCsv.java
View File

@@ -216,7 +216,14 @@ public class ExcelCsv {
} }
if(!StringUtil.isEmpty(titleStr)){ if(!StringUtil.isEmpty(titleStr)){
//去掉不需要展示的header //去掉不需要展示的header
if(!(noExportField.indexOf(","+titleStr+",") > -1)){ //去掉不需要展示的header
String noExport="";
if(noExportField.contains("&")){
noExport=noExportField.substring(0,noExportField.indexOf("&"));
}else{
noExport=noExportField;
}
if(!(noExport.indexOf(","+titleStr+",") > -1)){
//需要替换的header //需要替换的header
boolean flag=true; boolean flag=true;
if(noExportField.contains("&")){ if(noExportField.contains("&")){

8
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -2218,7 +2218,13 @@ public class ExportExcel {
} }
if(!StringUtil.isEmpty(titleStr)){ if(!StringUtil.isEmpty(titleStr)){
//去掉不需要展示的header //去掉不需要展示的header
if(!(noExportField.indexOf(","+titleStr+",") > -1)){ String noExport="";
if(noExportField.contains("&")){
noExport=noExportField.substring(0,noExportField.indexOf("&"));
}else{
noExport=noExportField;
}
if(!(noExport.indexOf(","+titleStr+",") > -1)){
//需要替换的header //需要替换的header
boolean flag=true; boolean flag=true;
if(noExportField.contains("&")){ if(noExportField.contains("&")){

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

@@ -1507,7 +1507,7 @@ public class BaseController {
List<Integer> compileIds=Lists.newArrayList(); List<Integer> compileIds=Lists.newArrayList();
List<Integer> regionIds=Lists.newArrayList(); List<Integer> regionIds=Lists.newArrayList();
List<Integer> groupIds=Lists.newArrayList(); List<Integer> groupIds=Lists.newArrayList();
// List<Integer> numRegionGroupIds=Lists.newArrayList(); List<Integer> numRegionGroupIds=Lists.newArrayList();
List<Integer> numRegionRegionIds=Lists.newArrayList(); List<Integer> numRegionRegionIds=Lists.newArrayList();
if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取 if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取
try { try {
@@ -1517,7 +1517,7 @@ public class BaseController {
regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
//需要获取数值域的id //需要获取数值域的id
if(serviceDict!=null&&serviceDict.getProtocolId()!=null&&serviceDict.getProtocolId()>0) { if(serviceDict!=null&&serviceDict.getProtocolId()!=null&&serviceDict.getProtocolId()>0) {
// numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size()); numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size()); numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
} }
} }
@@ -1558,9 +1558,9 @@ public class BaseController {
cfg.setRegionId(regionIds.get(ind)); cfg.setRegionId(regionIds.get(ind));
} }
if(serviceDict!=null&&serviceDict.getProtocolId()!=null) { if(serviceDict!=null&&serviceDict.getProtocolId()!=null) {
// if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) { if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) {
// cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind)); cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind));
// } }
if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) { if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) {
cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind)); cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind));
} }
@@ -1758,8 +1758,14 @@ public class BaseController {
while(!complexkeywordCfgs.isEmpty()) { while(!complexkeywordCfgs.isEmpty()) {
complexkeywordCfgs.drainTo(_complexkeywordCfgs, Constants.MAAT_JSON_SEND_SIZE); complexkeywordCfgs.drainTo(_complexkeywordCfgs, Constants.MAAT_JSON_SEND_SIZE);
List<Integer> compileIds=Lists.newArrayList(); List<Integer> compileIds=Lists.newArrayList();
List<Integer> groupIds=Lists.newArrayList();
List<Integer> regionIds=Lists.newArrayList();
try { try {
compileIds = ConfigServiceUtil.getId(1,_complexkeywordCfgs.size()); compileIds = ConfigServiceUtil.getId(1,_complexkeywordCfgs.size());
if(isSend.equals("1")) {
groupIds = ConfigServiceUtil.getId(2,_complexkeywordCfgs.size());
regionIds = ConfigServiceUtil.getId(3,_complexkeywordCfgs.size());
}
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
logger.info("获取编译ID出错"); logger.info("获取编译ID出错");
@@ -1776,8 +1782,23 @@ public class BaseController {
cfg.setCreatorId(UserUtils.getUser().getId()); cfg.setCreatorId(UserUtils.getUser().getId());
cfg.setDoLog(2); cfg.setDoLog(2);
cfg.setFunctionId(regionDict.getFunctionId()); cfg.setFunctionId(regionDict.getFunctionId());
cfg.setIsAudit(0); if(isSend.equals("1")) {
cfg.setIsValid(0); cfg.setIsAudit(Constants.AUDIT_YES);
cfg.setIsValid(Constants.VALID_YES);
cfg.setAuditorId(UserUtils.getUser().getId());
cfg.setAuditTime(date);
if(groupIds!=null&&groupIds.size()==_complexkeywordCfgs.size()) {
cfg.setGroupId(groupIds.get(ind));
}
if(regionIds!=null&&regionIds.size()==_complexkeywordCfgs.size()) {
cfg.setRegionId(regionIds.get(ind));
}
}else {
cfg.setIsAudit(Constants.AUDIT_NOT_YET);
cfg.setIsValid(Constants.VALID_NO);
}
//cfg.setIsAudit(0);
//cfg.setIsValid(0);
cfg.setIsAreaEffective(0); cfg.setIsAreaEffective(0);
cfg.setLable("0"); cfg.setLable("0");
cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId); cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);

8
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -333,13 +333,13 @@ public class InterceptController extends CommonController {
dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_IP", ipList);
dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList); dataMap.put("PXY_INTERCEPT_PKT_BIN", pktBinList);
} else if (entity.getFunctionId() == 200) {// IP拦截 } else if (entity.getFunctionId() == 200) {// IP拦截
cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,&userregion2:ratelimit-userregion1:certificate-"; cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,userregion2,&userregion1:intercept_file_strategy-";
titleList.add("PXY_INTERCEPT_IP"); titleList.add("PXY_INTERCEPT_IP");
classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class); classMap.put("PXY_INTERCEPT_IP", IpPortCfg.class);
noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport); noExportMap.put("PXY_INTERCEPT_IP", ipPortInfoNoExport);
dataMap.put("PXY_INTERCEPT_IP", ipList); dataMap.put("PXY_INTERCEPT_IP", ipList);
} else if (entity.getFunctionId() == 201) {// 域名拦截 } else if (entity.getFunctionId() == 201) {// 域名拦截
cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,&userregion2:ratelimit-userregion1:certificate-userregion5:intercept_intensity-"; cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,&userregion2:ratelimit-userregion1:intercept_file_strategy-userregion5:intercept_intensity-";
titleList.add("NTC_HTTP_URL"); titleList.add("NTC_HTTP_URL");
classMap.put("NTC_HTTP_URL", HttpUrlCfg.class); classMap.put("NTC_HTTP_URL", HttpUrlCfg.class);
noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport); noExportMap.put("NTC_HTTP_URL", httpUrlCfgNoExport);
@@ -357,6 +357,10 @@ public class InterceptController extends CommonController {
if (entity.getSearch_audit_time_start() == null && entity.getSearch_audit_time_end() == null) { if (entity.getSearch_audit_time_start() == null && entity.getSearch_audit_time_end() == null) {
cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport; cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport;
} }
if (!StringUtil.isEmpty(entity.gethColumns())) {
cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport;
}
noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport); noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport);
/* } */ /* } */

19
src/main/java/com/nis/web/controller/dashboard/TrafficStatisticsInfoController.java
View File

@@ -301,12 +301,19 @@ public class TrafficStatisticsInfoController extends BaseController {
*/ */
@RequestMapping(value="protocolList") @RequestMapping(value="protocolList")
@ResponseBody @ResponseBody
public List protocolList(Model model,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){ public List protocolList(Model model,Integer[] protoType,@RequestParam(required=false)String beginDate,@RequestParam(required=false)String endDate){
Map<String, Object> fromJsonList = new HashMap<String, Object>(); Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList(); List list = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_PROTOCOL_LIST; String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_PROTOCOL_LIST;
try { try {
url=urlAddDate(url,beginDate,endDate); url=urlAddDate(url,beginDate,endDate);
if(protoType!=null){
for (Integer dom : protoType) {
if(dom!=null){
url=url+"&protoType="+dom;
}
}
}
String string = HttpClientUtil.get(url); String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType()); fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
@@ -372,14 +379,18 @@ public class TrafficStatisticsInfoController extends BaseController {
*/ */
@RequestMapping(value="appList") @RequestMapping(value="appList")
@ResponseBody @ResponseBody
public List appList(@RequestParam(value="appType",required=false)Integer appType,@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){ public List appList(@RequestParam(value="appType",required=false)Integer[] appType,@RequestParam(value="beginDate",required=false)String beginDate,@RequestParam(value="endDate",required=false)String endDate){
Map<String, Object> fromJsonList = new HashMap<String, Object>(); Map<String, Object> fromJsonList = new HashMap<String, Object>();
List list = new ArrayList(); List list = new ArrayList();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_LIST; String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_APP_LIST;
try { try {
url=urlAddDate(url,beginDate,endDate); url=urlAddDate(url,beginDate,endDate);
if(!StringUtil.isEmpty(appType)){ if(appType!=null){
url=url+"&appType="+appType; for (Integer dom : appType) {
if(dom!=null){
url=url+"&appType="+dom;
}
}
} }
String string = HttpClientUtil.get(url); String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();

17
src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java
View File

@@ -42,9 +42,14 @@ public class DynamicIndexController extends BaseController {
public String dynamicIndex(HttpServletRequest request){ public String dynamicIndex(HttpServletRequest request){
String serviceIds = request.getParameter("sid"); String serviceIds = request.getParameter("sid");
String baseNum = request.getParameter("baseNum"); String baseNum = request.getParameter("baseNum");
Object trafficAreaStat = trafficAreaStat(null, Integer.parseInt(baseNum)); String hourStr = request.getParameter("hour");
Object dropStat = dropStat(null, Integer.parseInt(baseNum)); Integer hour = null;
Object logStat = logStat(null, serviceIds, Integer.parseInt(baseNum)); if(hourStr!=null &&!"".equals(hourStr)){
hour = Integer.parseInt(hourStr);
}
Object trafficAreaStat = trafficAreaStat(hour, Integer.parseInt(baseNum));
Object dropStat = dropStat(hour, Integer.parseInt(baseNum));
Object logStat = logStat(hour, serviceIds, Integer.parseInt(baseNum));
Gson gson = new GsonBuilder().create(); Gson gson = new GsonBuilder().create();
String trafficJson = gson.toJson(trafficAreaStat); String trafficJson = gson.toJson(trafficAreaStat);
String dropJson = gson.toJson(dropStat); String dropJson = gson.toJson(dropStat);
@@ -93,12 +98,12 @@ public class DynamicIndexController extends BaseController {
List<Map> results = new ArrayList<>(); List<Map> results = new ArrayList<>();
if (hour == null || hour <= 0) { if (hour == null || hour <= 0) {
hour = 24; hour = 1;
} }
Date now = new Date(); Date now = new Date();
Date start = new Date(now.getTime()-(hour*60*60*1000)); Date start = new Date(now.getTime()-(hour*60*60*1000)-(5*60*1000));
now = new Date(now.getTime()-5*60*1000);
String nowString = DateUtils.formatDate(now, "yyyy-MM-dd HH:mm:ss"); String nowString = DateUtils.formatDate(now, "yyyy-MM-dd HH:mm:ss");
String startString = DateUtils.formatDate(start, "yyyy-MM-dd HH:mm:ss"); String startString = DateUtils.formatDate(start, "yyyy-MM-dd HH:mm:ss");
/*nowString = "2018-12-05 00:00:00"; /*nowString = "2018-12-05 00:00:00";

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

@@ -130,7 +130,7 @@ public class OpenVpnLogController extends BaseController{
}else{ }else{
hColumns+=","; hColumns+=",";
} }
String cfgIndexInfoNoExport=",cfg_id,action,"+hColumns; String cfgIndexInfoNoExport=","+hColumns;
noExportMap.put("spoofing_ip_policy",cfgIndexInfoNoExport); noExportMap.put("spoofing_ip_policy",cfgIndexInfoNoExport);
dataMap.put("spoofing_ip_policy",list); dataMap.put("spoofing_ip_policy",list);
String timeRange= initLogMap(log,"spoofing_ip_policy"); String timeRange= initLogMap(log,"spoofing_ip_policy");

12
src/main/java/com/nis/web/dao/configuration/AsnPolicyCfgDao.xml
View File

@@ -28,6 +28,7 @@
<result column="user_region3" property="userRegion3" jdbcType="VARCHAR" /> <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
<result column="user_region4" property="userRegion4" jdbcType="VARCHAR" /> <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" /> <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<sql id="ConfigIndex_Column" > <sql id="ConfigIndex_Column" >
@@ -35,7 +36,7 @@
r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY, r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.user_region1, r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.user_region1,
r.user_region2,r.user_region3,r.user_region4,r.user_region5,r.do_log r.user_region2,r.user_region3,r.user_region4,r.user_region5,r.do_log,r.do_blacklist
</sql> </sql>
<select id="findPage" resultMap="CfgIndexInfoMap"> <select id="findPage" resultMap="CfgIndexInfoMap">
@@ -172,7 +173,8 @@
user_region3, user_region3,
user_region4, user_region4,
user_region5, user_region5,
do_log do_log,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -199,7 +201,8 @@
#{userRegion3,jdbcType=VARCHAR}, #{userRegion3,jdbcType=VARCHAR},
#{userRegion4,jdbcType=VARCHAR}, #{userRegion4,jdbcType=VARCHAR},
#{userRegion5,jdbcType=VARCHAR}, #{userRegion5,jdbcType=VARCHAR},
#{doLog,jdbcType=INTEGER} #{doLog,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
<update id="updateCfgIndexInfo" parameterType="com.nis.domain.configuration.CfgIndexInfo" > <update id="updateCfgIndexInfo" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
@@ -254,6 +257,9 @@
</if> </if>
<if test="functionId != null" > <if test="functionId != null" >
function_id = #{functionId,jdbcType=INTEGER}, function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="doBlackList != null">
do_blacklist = #{doBlackList,jdbcType=INTEGER},
</if> </if>
user_region1 = #{userRegion1,jdbcType=VARCHAR}, user_region1 = #{userRegion1,jdbcType=VARCHAR},
user_region2 = #{userRegion2,jdbcType=VARCHAR}, user_region2 = #{userRegion2,jdbcType=VARCHAR},

12
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -24,6 +24,7 @@
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" /> <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" /> <result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" /> <result column="do_log" property="doLog" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="AvVoipIpCfgMap" type="com.nis.domain.configuration.AvVoipIpCfg" > <resultMap id="AvVoipIpCfgMap" type="com.nis.domain.configuration.AvVoipIpCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -234,7 +235,7 @@
r.CFG_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT, r.CFG_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME, r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY, r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.do_log r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.do_log,r.do_blacklist
</sql> </sql>
<sql id="AvVoipIp_Column" > <sql id="AvVoipIp_Column" >
r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
@@ -743,7 +744,8 @@
LABLE, LABLE,
AREA_EFFECTIVE_IDS, AREA_EFFECTIVE_IDS,
function_id, function_id,
do_log do_log,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -764,7 +766,8 @@
#{lable,jdbcType=VARCHAR}, #{lable,jdbcType=VARCHAR},
#{areaEffectiveIds,jdbcType=VARCHAR}, #{areaEffectiveIds,jdbcType=VARCHAR},
#{functionId,jdbcType=INTEGER}, #{functionId,jdbcType=INTEGER},
#{doLog,jdbcType=INTEGER} #{doLog,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
<!-- insert AV_VOIP_IP_CFG表信息 --> <!-- insert AV_VOIP_IP_CFG表信息 -->
@@ -1133,6 +1136,9 @@
<if test="doLog != null" > <if test="doLog != null" >
do_log = #{doLog,jdbcType=INTEGER}, do_log = #{doLog,jdbcType=INTEGER},
</if> </if>
<if test="doBlackList != null">
do_blacklist = #{doBlackList,jdbcType=INTEGER},
</if>
</trim> </trim>
</set> </set>
<where> <where>

12
src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
View File

@@ -24,6 +24,7 @@
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" /> <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" /> <result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_log" property="doLog" jdbcType="INTEGER" /> <result column="do_log" property="doLog" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" > <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -158,7 +159,7 @@
a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT, a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist
</sql> </sql>
<sql id="IpCfg_Column" > <sql id="IpCfg_Column" >
a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -360,7 +361,8 @@
LABLE, LABLE,
AREA_EFFECTIVE_IDS, AREA_EFFECTIVE_IDS,
function_id, function_id,
do_log do_log,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -381,7 +383,8 @@
#{lable,jdbcType=VARCHAR}, #{lable,jdbcType=VARCHAR},
#{areaEffectiveIds,jdbcType=VARCHAR}, #{areaEffectiveIds,jdbcType=VARCHAR},
#{functionId,jdbcType=INTEGER}, #{functionId,jdbcType=INTEGER},
#{doLog,jdbcType=INTEGER} #{doLog,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
<!-- insert ip_port_cfg表信息 --> <!-- insert ip_port_cfg表信息 -->
@@ -629,6 +632,9 @@
</if> </if>
<if test="doLog != null" > <if test="doLog != null" >
do_log = #{doLog,jdbcType=INTEGER}, do_log = #{doLog,jdbcType=INTEGER},
</if>
<if test="doBlackList != null" >
do_blacklist = #{doBlackList,jdbcType=INTEGER},
</if> </if>
</trim> </trim>
</set> </set>

13
src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml
View File

@@ -32,6 +32,7 @@
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" /> <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
<result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" /> <result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" />
<result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" /> <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" > <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -131,7 +132,8 @@
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1, a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id,
a.do_blacklist
</sql> </sql>
<sql id="IpCfg_Column" > <sql id="IpCfg_Column" >
a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -372,7 +374,8 @@
user_region4, user_region4,
user_region5, user_region5,
do_log, do_log,
source_compile_id source_compile_id,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -400,7 +403,8 @@
#{userRegion4,jdbcType=VARCHAR}, #{userRegion4,jdbcType=VARCHAR},
#{userRegion5,jdbcType=VARCHAR}, #{userRegion5,jdbcType=VARCHAR},
#{doLog,jdbcType=INTEGER}, #{doLog,jdbcType=INTEGER},
#{sourceCompileId,jdbcType=INTEGER} #{sourceCompileId,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
@@ -677,6 +681,9 @@
</if> </if>
<if test="functionId != null" > <if test="functionId != null" >
function_id = #{functionId,jdbcType=INTEGER}, function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="doBlackList != null">
do_blacklist = #{doBlackList,jdbcType=INTEGER},
</if> </if>
user_region1 = #{userRegion1,jdbcType=VARCHAR}, user_region1 = #{userRegion1,jdbcType=VARCHAR},
user_region2 = #{userRegion2,jdbcType=VARCHAR}, user_region2 = #{userRegion2,jdbcType=VARCHAR},

8
src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
View File

@@ -36,6 +36,7 @@
<result column="user_region4" property="userRegion4" jdbcType="VARCHAR" /> <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" /> <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
<result column="do_log" property="doLog" jdbcType="INTEGER" /> <result column="do_log" property="doLog" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="AppFeatureIndexMap" type="com.nis.domain.configuration.AppFeatureIndex" > <resultMap id="AppFeatureIndexMap" type="com.nis.domain.configuration.AppFeatureIndex" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -374,6 +375,7 @@
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" /> <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
<result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" /> <result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" />
<result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" /> <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" > <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -502,6 +504,7 @@
<result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" /> <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
<result column="cfg_type" property="cfgType" jdbcType="VARCHAR" /> <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
<result column="do_log" property="doLog" jdbcType="INTEGER" /> <result column="do_log" property="doLog" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="AvFileSampleMap" type="com.nis.domain.configuration.AvFileSampleCfg" > <resultMap id="AvFileSampleMap" type="com.nis.domain.configuration.AvFileSampleCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -734,14 +737,14 @@
a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time, a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
a.area_effective_ids,a.function_id,a.do_log,a.dns_strategy_id,a.user_region1,a.user_region2, a.area_effective_ids,a.function_id,a.do_log,a.dns_strategy_id,a.user_region1,a.user_region2,
a.user_region3,a.user_region4,a.user_region5 a.user_region3,a.user_region4,a.user_region5,a.do_blacklist
</sql> </sql>
<sql id="DdosIpCfg_Column" > <sql id="DdosIpCfg_Column" >
a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time, a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.pps_threadshold, ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.pps_threadshold,
a.antiddos_protocol,a.bps_threadshold a.antiddos_protocol,a.bps_threadshold,a.do_blacklist
</sql> </sql>
<sql id="IpCfg_Column" > <sql id="IpCfg_Column" >
a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port, a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
@@ -780,7 +783,6 @@
a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time, a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable, a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2, a.area_effective_ids,a.function_id,a.do_log,a.user_region1,a.user_region2,
a.user_region3,a.user_region4,a.user_region5,a.raw_len,a.digest,a.cfds_level,a.file_url
</sql> </sql>
<sql id="PxyObjTrustedCaCertColumns"> <sql id="PxyObjTrustedCaCertColumns">
a.cfg_id,a.cfg_desc a.cfg_id,a.cfg_desc

15
src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
View File

@@ -29,6 +29,7 @@
<result column="user_region3" property="userRegion3" jdbcType="VARCHAR" /> <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
<result column="user_region4" property="userRegion4" jdbcType="VARCHAR" /> <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" /> <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" > <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -167,7 +168,8 @@
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log, a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,
a.user_region1,a.user_region2,a.user_region3,a.user_region4,a.user_region5 a.user_region1,a.user_region2,a.user_region3,a.user_region4,a.user_region5,
a.do_blacklist
</sql> </sql>
<sql id="IpCfg_Column" > <sql id="IpCfg_Column" >
a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -375,7 +377,8 @@
user_region2, user_region2,
user_region3, user_region3,
user_region4, user_region4,
user_region5 user_region5,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -401,7 +404,8 @@
#{userRegion2,jdbcType=VARCHAR}, #{userRegion2,jdbcType=VARCHAR},
#{userRegion3,jdbcType=VARCHAR}, #{userRegion3,jdbcType=VARCHAR},
#{userRegion4,jdbcType=VARCHAR}, #{userRegion4,jdbcType=VARCHAR},
#{userRegion5,jdbcType=VARCHAR} #{userRegion5,jdbcType=VARCHAR},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
<!-- insert ip_port_cfg表信息 --> <!-- insert ip_port_cfg表信息 -->
@@ -536,7 +540,10 @@
function_id = #{functionId,jdbcType=INTEGER}, function_id = #{functionId,jdbcType=INTEGER},
</if> </if>
<if test="doLog != null" > <if test="doLog != null" >
do_log = #{doLog,jdbcType=INTEGER} do_log = #{doLog,jdbcType=INTEGER},
</if>
<if test="doBlackList != null">
do_blacklist = #{doBlackList,jdbcType=INTEGER}
</if> </if>
</trim> </trim>
</set> </set>

16
src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
View File

@@ -74,6 +74,7 @@
<result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" /> <result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" />
<result column="dns_strategy_name" property="dnsStrategyName" jdbcType="VARCHAR" /> <result column="dns_strategy_name" property="dnsStrategyName" jdbcType="VARCHAR" />
<result column="do_log" property="doLog" jdbcType="INTEGER" /> <result column="do_log" property="doLog" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
<result column="user_region1" property="userRegion1" jdbcType="VARCHAR" /> <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
<result column="user_region2" property="userRegion2" jdbcType="VARCHAR" /> <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
<result column="user_region3" property="userRegion3" jdbcType="VARCHAR" /> <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
@@ -197,7 +198,7 @@
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1, a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.do_blacklist
</sql> </sql>
<sql id="IpCfg_Column" > <sql id="IpCfg_Column" >
a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -809,7 +810,8 @@
user_region3, user_region3,
user_region4, user_region4,
user_region5, user_region5,
do_log do_log,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -836,7 +838,8 @@
#{userRegion3,jdbcType=VARCHAR}, #{userRegion3,jdbcType=VARCHAR},
#{userRegion4,jdbcType=VARCHAR}, #{userRegion4,jdbcType=VARCHAR},
#{userRegion5,jdbcType=VARCHAR}, #{userRegion5,jdbcType=VARCHAR},
#{doLog,jdbcType=INTEGER} #{doLog,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
<insert id="saveCfgIndexForBatch" parameterType="com.nis.domain.configuration.CfgIndexInfo" > <insert id="saveCfgIndexForBatch" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
@@ -866,7 +869,8 @@
user_region3, user_region3,
user_region4, user_region4,
user_region5, user_region5,
do_log do_log,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -893,7 +897,8 @@
#{userRegion3,jdbcType=VARCHAR}, #{userRegion3,jdbcType=VARCHAR},
#{userRegion4,jdbcType=VARCHAR}, #{userRegion4,jdbcType=VARCHAR},
#{userRegion5,jdbcType=VARCHAR}, #{userRegion5,jdbcType=VARCHAR},
#{doLog,jdbcType=INTEGER} #{doLog,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
<!-- insert ip_port_cfg表信息 --> <!-- insert ip_port_cfg表信息 -->
@@ -984,6 +989,7 @@
cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
action = #{action,jdbcType=INTEGER}, action = #{action,jdbcType=INTEGER},
do_log = #{doLog,jdbcType=INTEGER}, do_log = #{doLog,jdbcType=INTEGER},
do_blacklist = #{doBlackList,jdbcType=INTEGER},
is_valid = #{isValid,jdbcType=INTEGER}, is_valid = #{isValid,jdbcType=INTEGER},
is_audit = #{isAudit,jdbcType=INTEGER}, is_audit = #{isAudit,jdbcType=INTEGER},
<if test="creatorId != null" > <if test="creatorId != null" >

12
src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
View File

@@ -23,6 +23,7 @@
<result column="lable" property="lable" jdbcType="VARCHAR" /> <result column="lable" property="lable" jdbcType="VARCHAR" />
<result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" /> <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
<result column="function_id" property="functionId" jdbcType="INTEGER" /> <result column="function_id" property="functionId" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" > <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -120,7 +121,7 @@
a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT, a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist
</sql> </sql>
<sql id="IpCfg_Column" > <sql id="IpCfg_Column" >
a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -312,7 +313,8 @@
LABLE, LABLE,
AREA_EFFECTIVE_IDS, AREA_EFFECTIVE_IDS,
function_id, function_id,
do_log do_log,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -333,7 +335,8 @@
#{lable,jdbcType=VARCHAR}, #{lable,jdbcType=VARCHAR},
#{areaEffectiveIds,jdbcType=VARCHAR}, #{areaEffectiveIds,jdbcType=VARCHAR},
#{functionId,jdbcType=INTEGER}, #{functionId,jdbcType=INTEGER},
#{doLog,jdbcType=INTEGER} #{doLog,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
<!-- insert ip_port_cfg表信息 --> <!-- insert ip_port_cfg表信息 -->
@@ -460,6 +463,9 @@
<if test="doLog != null" > <if test="doLog != null" >
do_log = #{doLog,jdbcType=INTEGER}, do_log = #{doLog,jdbcType=INTEGER},
</if> </if>
<if test="doBlackList != null">
do_blacklist = #{doBlackList,jdbcType=INTEGER}
</if>
</trim> </trim>
</set> </set>
where cfg_id = #{cfgId,jdbcType=BIGINT} where cfg_id = #{cfgId,jdbcType=BIGINT}

13
src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
View File

@@ -33,6 +33,7 @@
<result column="user_region5" property="userRegion5" jdbcType="VARCHAR" /> <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
<result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" /> <result column="source_compile_id" property="sourceCompileId" jdbcType="INTEGER" />
<result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" /> <result column="cancel_request_id" property="cancelRequestId" jdbcType="INTEGER" />
<result column="do_blacklist" property="doBlackList" jdbcType="INTEGER" />
</resultMap> </resultMap>
<resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" > <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
<id column="cfg_id" property="cfgId" jdbcType="BIGINT" /> <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -132,7 +133,8 @@
a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME, a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY, a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1, a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.source_compile_id,a.cancel_request_id,
a.do_blacklist
</sql> </sql>
<sql id="IpCfg_Column" > <sql id="IpCfg_Column" >
a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
@@ -476,7 +478,8 @@
user_region4, user_region4,
user_region5, user_region5,
do_log, do_log,
source_compile_id source_compile_id,
do_blacklist
)values ( )values (
#{cfgDesc,jdbcType=VARCHAR}, #{cfgDesc,jdbcType=VARCHAR},
#{action,jdbcType=INTEGER}, #{action,jdbcType=INTEGER},
@@ -504,7 +507,8 @@
#{userRegion4,jdbcType=VARCHAR}, #{userRegion4,jdbcType=VARCHAR},
#{userRegion5,jdbcType=VARCHAR}, #{userRegion5,jdbcType=VARCHAR},
#{doLog,jdbcType=INTEGER}, #{doLog,jdbcType=INTEGER},
#{sourceCompileId,jdbcType=INTEGER} #{sourceCompileId,jdbcType=INTEGER},
#{doBlackList,jdbcType=INTEGER}
) )
</insert> </insert>
<!-- insert ip_port_cfg表信息 --> <!-- insert ip_port_cfg表信息 -->
@@ -923,6 +927,9 @@
</if> </if>
<if test="functionId != null" > <if test="functionId != null" >
function_id = #{functionId,jdbcType=INTEGER}, function_id = #{functionId,jdbcType=INTEGER},
</if>
<if test="doBlackList != null">
do_blacklist = #{doBlackList,jdbcType=INTEGER},
</if> </if>
user_region1 = #{userRegion1,jdbcType=VARCHAR}, user_region1 = #{userRegion1,jdbcType=VARCHAR},
user_region2 = #{userRegion2,jdbcType=VARCHAR}, user_region2 = #{userRegion2,jdbcType=VARCHAR},

295
src/main/java/com/nis/web/service/BaseService.java
View File

@@ -80,6 +80,7 @@ import com.nis.domain.specific.SpecificServiceCfg;
import com.nis.util.ConfigServiceUtil; import com.nis.util.ConfigServiceUtil;
import com.nis.util.Configurations; import com.nis.util.Configurations;
import com.nis.util.Constants; import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.IpUtil; import com.nis.util.IpUtil;
import com.nis.util.Reflections; import com.nis.util.Reflections;
import com.nis.util.StringUtil; import com.nis.util.StringUtil;
@@ -600,7 +601,12 @@ public abstract class BaseService {
if (baseIpCfg.getProtocolId() != null && baseIpCfg.getProtocolId() != 0) { if (baseIpCfg.getProtocolId() != null && baseIpCfg.getProtocolId() != 0) {
if (numGroupId == 0) { if (numGroupId == 0) {
GroupCfg group1 = new GroupCfg(); GroupCfg group1 = new GroupCfg();
group1.setGroupId(groupId); //group1.setGroupId(groupId);
if(baseIpCfg.getNumberRegionGroupId()!=null) {
group1.setGroupId(baseIpCfg.getNumberRegionGroupId());
}else {
group1.setGroupId(ConfigServiceUtil.getId(2, 1).get(0));
}
group1.setCompileId(baseIpCfg.getCompileId()); group1.setCompileId(baseIpCfg.getCompileId());
group1.setAuditTime(baseIpCfg.getAuditTime()); group1.setAuditTime(baseIpCfg.getAuditTime());
group1.setIsValid(baseIpCfg.getIsValid()); group1.setIsValid(baseIpCfg.getIsValid());
@@ -1608,7 +1614,7 @@ public abstract class BaseService {
if("BaseIpCfg".equals(type)) { if("BaseIpCfg".equals(type)) {
List<BaseIpCfg> listPage = (List<BaseIpCfg>) list; List<BaseIpCfg> listPage = (List<BaseIpCfg>) list;
if (specificServiceCfg!=null&&regionDict.getFunctionId().equals(405)) { if (specificServiceCfg!=null&&regionDict.getFunctionId().equals(405)) {
this.saveAppIpCfg((List<BaseIpCfg>)listPage,specificServiceCfg); this.saveAppIpCfg((List<BaseIpCfg>)listPage,specificServiceCfg,send);
}else { }else {
this.saveIpBatch(regionDict,serviceDict,(List<BaseIpCfg>)listPage,send); this.saveIpBatch(regionDict,serviceDict,(List<BaseIpCfg>)listPage,send);
} }
@@ -1775,7 +1781,7 @@ public abstract class BaseService {
* @throws Exception * @throws Exception
*/ */
@Transactional(readOnly = false, rollbackFor = RuntimeException.class) @Transactional(readOnly = false, rollbackFor = RuntimeException.class)
public void saveAppIpCfg(List<BaseIpCfg> cfgs,SpecificServiceCfg specificServiceCfg){ public void saveAppIpCfg(List<BaseIpCfg> cfgs,SpecificServiceCfg specificServiceCfg,boolean send){
logger.warn("Start to save IP"); logger.warn("Start to save IP");
ConfigGroupInfoDao configGroupInfoDao=SpringContextHolder.getBean(ConfigGroupInfoDao.class); ConfigGroupInfoDao configGroupInfoDao=SpringContextHolder.getBean(ConfigGroupInfoDao.class);
SpecificServiceCfgDao specificServiceCfgDao=SpringContextHolder.getBean(SpecificServiceCfgDao.class); SpecificServiceCfgDao specificServiceCfgDao=SpringContextHolder.getBean(SpecificServiceCfgDao.class);
@@ -1800,25 +1806,182 @@ public abstract class BaseService {
Integer compileId = configGroupInfo.getCompileId(); Integer compileId = configGroupInfo.getCompileId();
// Varibles maxPacket=asnIpCfgDao.getVaribles("max_allowed_packet"); // Varibles maxPacket=asnIpCfgDao.getVaribles("max_allowed_packet");
List<AppIpCfg> tempList=Lists.newArrayList(); List<AppIpCfg> tempList=Lists.newArrayList();
int len=0; int len=0;
int index=0;
for(BaseIpCfg cfg:cfgs) { for(BaseIpCfg cfg:cfgs) {
AppIpCfg entity=new AppIpCfg(); AppIpCfg entity=new AppIpCfg();
BeanUtils.copyProperties(cfg, entity); BeanUtils.copyProperties(cfg, entity);
entity.setCompileId(compileId); entity.setCompileId(compileId);
cfg.setCompileId(compileId);
cfg.setGroupId(specificServiceCfg.getGroupId());
int tempLen=entity.toString().getBytes(Charset.forName("UTF-8")).length; int tempLen=entity.toString().getBytes(Charset.forName("UTF-8")).length;
if((len+tempLen)<Constants.MAX_ALLOWED_PACKET) { if((len+tempLen)<Constants.MAX_ALLOWED_PACKET) {
tempList.add(entity); tempList.add(entity);
len+=tempLen; len+=tempLen;
}else { }else {
appCfgDao.insertAppIpCfgBatch(tempList); appCfgDao.insertAppIpCfgBatch(tempList);
if(send) {
List<MaatCfg> configCompileList = new ArrayList();
List<GroupCfg> groupRelationList = new ArrayList();
List<IpCfg> ipRegionList = new ArrayList();
List<StringCfg> strRegionList = new ArrayList();
List<NumBoundaryCfg> numRegionList = new ArrayList();
List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
if(configGroupInfo.getIsIssued()==0) {//未下发，下发region compile,group.
MaatCfg maatCfg = new MaatCfg();
ToMaatBean maatBean = new ToMaatBean();
maatCfg.initDefaultValue();
//group
GroupCfg groupCfg=new GroupCfg();
groupCfg.setCompileId(compileId);
groupCfg.setGroupId(configGroupInfo.getGroupId());
groupCfg.setIsValid(Constants.VALID_YES);
groupCfg.setAuditTime(tempList.get(0).getAuditTime());
groupRelationList.add(groupCfg);
BeanUtils.copyProperties(cfgs.get(0), maatCfg);
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(tempList,Constants.VALID_YES,configGroupInfo.getGroupId()));
maatCfg.setAction(tempList.get(0).getAction());
maatCfg.setAuditTime(tempList.get(0).getAuditTime());
maatCfg.setIpRegionList(ipRegionList);
maatCfg.setStrRegionList(strRegionList);
maatCfg.setNumRegionList(numRegionList);
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(tempList.get(0).getIsValid());
// 设置APP自定义域
String userRegion = "APP_ID=" + tempList.get(0).getAppCode()/*+Constants.USER_REGION_SPLIT+"ASEV_ID="+businessType*/;
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(tempList.get(0).getAuditTime());
maatBean.setCreatorName(tempList.get(0).getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
// 调用服务接口下发配置数据
String json = gsonToJson(maatBean);
logger.info("app协议IP配置下发配置参数：" + json);
// 调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("app协议IP配置下发响应信息：" + result.getMsg());
configGroupInfo.setIsIssued(1);
configGroupInfo.setUpdateTime(new Date());
configGroupInfoDao.updateConfigGroupInfobyGroupId(configGroupInfo);
}else if(configGroupInfo.getIsIssued()==1) {//已经下发，分组复用下发
GroupReuseAddBean maatBean = new GroupReuseAddBean();
List<GroupReuseCfg> groupReuseList=new ArrayList<>();
GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
/*groupReuseCfg.setUserRegion(userRegion);*/
groupReuseCfg.setServiceId(tempList.get(0).getServiceId());
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(tempList,Constants.VALID_YES,configGroupInfo.getGroupId()));
groupReuseCfg.setIpRegionList(ipRegionList);
groupReuseCfg.setStrRegionList(strRegionList);
groupReuseCfg.setNumRegionList(numRegionList);
groupReuseList.add(groupReuseCfg);
maatBean.setGroupReuseCfgList(groupReuseList);
maatBean.setAuditTime(tempList.get(0).getAuditTime());
maatBean.setCreatorName(tempList.get(0).getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
//调用服务接口下发配置数据
String json=gsonToJson(maatBean);
logger.info("app协议IP域新增配置下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postGroupReuseSources(json);
logger.info("app协议IP域新增配置响应信息："+result.getMsg());
}else {
throw new RuntimeException("Unknown configGroupInfo isIssued value");
}
}
tempList.clear(); tempList.clear();
tempList.add(entity); tempList.add(entity);
len=tempLen; len=tempLen;
} }
index ++;
} }
if(tempList.size()>0) { if(tempList.size()>0) {
logger.warn("save ip size:"+tempList.size()); logger.warn("save ip size:"+tempList.size());
appCfgDao.insertAppIpCfgBatch(tempList); appCfgDao.insertAppIpCfgBatch(tempList);
if(send) {
if(send) {
List<MaatCfg> configCompileList = new ArrayList();
List<GroupCfg> groupRelationList = new ArrayList();
List<IpCfg> ipRegionList = new ArrayList();
List<StringCfg> strRegionList = new ArrayList();
List<NumBoundaryCfg> numRegionList = new ArrayList();
List<DigestCfg> digestRegionList = new ArrayList();
List<IpCfg> areaIpRegionList = new ArrayList();
if(configGroupInfo.getIsIssued()==0) {//未下发，下发region compile,group.
MaatCfg maatCfg = new MaatCfg();
ToMaatBean maatBean = new ToMaatBean();
maatCfg.initDefaultValue();
//group
GroupCfg groupCfg=new GroupCfg();
groupCfg.setCompileId(compileId);
groupCfg.setGroupId(configGroupInfo.getGroupId());
groupCfg.setIsValid(Constants.VALID_YES);
groupCfg.setAuditTime(tempList.get(0).getAuditTime());
groupRelationList.add(groupCfg);
BeanUtils.copyProperties(cfgs.get(0), maatCfg);
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(tempList,Constants.VALID_YES,configGroupInfo.getGroupId()));
maatCfg.setAction(tempList.get(0).getAction());
maatCfg.setAuditTime(tempList.get(0).getAuditTime());
maatCfg.setIpRegionList(ipRegionList);
maatCfg.setStrRegionList(strRegionList);
maatCfg.setNumRegionList(numRegionList);
maatCfg.setDigestRegionList(digestRegionList);
maatCfg.setGroupRelationList(groupRelationList);
maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(tempList.get(0).getIsValid());
// 设置APP自定义域
String userRegion = "APP_ID=" + tempList.get(0).getAppCode()/*+Constants.USER_REGION_SPLIT+"ASEV_ID="+businessType*/;
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(tempList.get(0).getAuditTime());
maatBean.setCreatorName(tempList.get(0).getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
// 调用服务接口下发配置数据
String json = gsonToJson(maatBean);
logger.info("app协议IP配置下发配置参数：" + json);
// 调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("app协议IP配置下发响应信息：" + result.getMsg());
configGroupInfo.setIsIssued(1);
configGroupInfo.setUpdateTime(new Date());
configGroupInfoDao.updateConfigGroupInfobyGroupId(configGroupInfo);
}else if(configGroupInfo.getIsIssued()==1) {//已经下发，分组复用下发
GroupReuseAddBean maatBean = new GroupReuseAddBean();
List<GroupReuseCfg> groupReuseList=new ArrayList<>();
GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
/*groupReuseCfg.setUserRegion(userRegion);*/
groupReuseCfg.setServiceId(tempList.get(0).getServiceId());
ipRegionList.addAll(groupReuseCfgAddRemoveConvert(tempList,Constants.VALID_YES,configGroupInfo.getGroupId()));
groupReuseCfg.setIpRegionList(ipRegionList);
groupReuseCfg.setStrRegionList(strRegionList);
groupReuseCfg.setNumRegionList(numRegionList);
groupReuseList.add(groupReuseCfg);
maatBean.setGroupReuseCfgList(groupReuseList);
maatBean.setAuditTime(tempList.get(0).getAuditTime());
maatBean.setCreatorName(tempList.get(0).getCurrentUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
//调用服务接口下发配置数据
String json=gsonToJson(maatBean);
logger.info("app协议IP域新增配置下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postGroupReuseSources(json);
logger.info("app协议IP域新增配置响应信息："+result.getMsg());
}else {
throw new RuntimeException("Unknown configGroupInfo isIssued value");
}
}
}
tempList.clear(); tempList.clear();
} }
long end=System.currentTimeMillis(); long end=System.currentTimeMillis();
@@ -1913,7 +2076,27 @@ public abstract class BaseService {
_cfg.setUserRegion3(StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3()); _cfg.setUserRegion3(StringUtil.isEmpty(_cfg.getUserRegion3()) ? "":_cfg.getUserRegion3());
maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+_cfg.getUserRegion3()); maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+_cfg.getUserRegion3());
} }
}else if(regionDict.getFunctionId()==510) {
maatCfg.setUserRegion(Constants.P2P_IP_TYPE_USER_REGION_KEY+"="+_cfg.getUserRegion2());
}else if(regionDict.getFunctionId()==7) {
if(!StringUtil.isEmpty(_cfg.getDnsStrategyId())){
// maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+entity.getDnsStrategyId()+Constants.USER_REGION_SPLIT);
maatCfg.setUserRegion(Constants.DNS_STRATEGY_USER_REGION_KEY+"="+_cfg.getDnsStrategyId());
}
}else if(regionDict.getFunctionId()==407) {// Protocol Identify
maatCfg.setUserRegion(Constants.PROTO_ID_REGION + "=" + _cfg.getAppCode());
}else if(regionDict.getFunctionId()==63) {// APP Policy
maatCfg.setUserRegion(Constants.APP_ID_REGION + "=" + _cfg.getAppCode()+Constants.USER_REGION_SPLIT+Constants.APP_VIGNORE_USER_REGION_KEY+"=1");
}else if(regionDict.getFunctionId()==408) {// Behavior Identify
maatCfg.setUserRegion(Constants.PROTO_ID_REGION + "=" + _cfg.getAppCode()+Constants.USER_REGION_SPLIT+Constants.APP_VIGNORE_USER_REGION_KEY+"=1");
}else if(regionDict.getFunctionId()==301) {// Anti DDOS
Map umap= new HashMap();
umap.put("protocol", _cfg.getAntiddosProtocol());
umap.put("bps_threadshold", _cfg.getBpsThreadshold());
umap.put("pps_threadshold", _cfg.getPpsThreadshold());
maatCfg.setUserRegion(new Gson().toJson(umap));
} }
configCompileList.add(maatCfg); configCompileList.add(maatCfg);
}else { }else {
//根据具体情况判断 //根据具体情况判断
@@ -1931,7 +2114,7 @@ public abstract class BaseService {
maatBean.setOpAction(Constants.INSERT_ACTION); maatBean.setOpAction(Constants.INSERT_ACTION);
// 调用服务接口下发配置数据 // 调用服务接口下发配置数据
String json = BaseService.gsonToJson(maatBean); String json = BaseService.gsonToJson(maatBean);
if(configCompileList.size()>100) { if(configCompileList.size()>10) {
logger.info("IP 配置下发配置条数：" + configCompileList.size()); logger.info("IP 配置下发配置条数：" + configCompileList.size());
}else { }else {
logger.info("IP 配置下发配置参数：" + json); logger.info("IP 配置下发配置参数：" + json);
@@ -1994,8 +2177,17 @@ public abstract class BaseService {
} }
if (send) { if (send) {
if(regionDict.getIsMaat().intValue()==1) { if(regionDict.getIsMaat().intValue()==1) {
configCompileList.add(convertMaatCfg(_cfg,2)); MaatCfg maatCfg=convertMaatCfg(_cfg,2);
//userregion处理 //userregion处理
if(regionDict.getFunctionId()==7) {
if(!StringUtil.isEmpty(_cfg.getDnsStrategyId())){
// maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+entity.getDnsStrategyId()+Constants.USER_REGION_SPLIT);
maatCfg.setUserRegion(Constants.DNS_STRATEGY_USER_REGION_KEY+"="+_cfg.getDnsStrategyId());
}
}else if(regionDict.getDictId()==159) {
maatCfg.setUserRegion(Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+_cfg.getUserRegion1());
}
configCompileList.add(maatCfg);
} }
} }
@@ -2009,7 +2201,7 @@ public abstract class BaseService {
maatBean.setOpAction(Constants.INSERT_ACTION); maatBean.setOpAction(Constants.INSERT_ACTION);
// 调用服务接口下发配置数据 // 调用服务接口下发配置数据
String json = BaseService.gsonToJson(maatBean); String json = BaseService.gsonToJson(maatBean);
if(configCompileList.size()>100) { if(configCompileList.size()>10) {
logger.info("字符串配置下发配置条数：" + configCompileList.size()); logger.info("字符串配置下发配置条数：" + configCompileList.size());
}else { }else {
logger.info("字符串配置下发配置参数：" + json); logger.info("字符串配置下发配置参数：" + json);
@@ -2037,29 +2229,78 @@ public abstract class BaseService {
*/ */
@Transactional(readOnly=false,rollbackFor=RuntimeException.class) @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void saveComplexkeywordCfgBatch(FunctionRegionDict regionDict, FunctionServiceDict serviceDict,List<ComplexkeywordCfg> data, String tableName,boolean send) { public void saveComplexkeywordCfgBatch(FunctionRegionDict regionDict, FunctionServiceDict serviceDict,List<ComplexkeywordCfg> data, String tableName,boolean send) {
SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); if (regionDict != null) {
SqlSession batchSqlSession = null; Integer regionType = regionDict.getRegionType();
try{ if (3 == regionType.intValue()) {
batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
for(int index = 0; index < data.size();index++){ List<MaatCfg> configCompileList = new ArrayList();
ComplexkeywordCfg cfg = data.get(index); SqlSession batchSqlSession = null;
cfg.setTableName(tableName); try{
if(regionDict.getDictId().intValue()==63) { batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
AppHttpCfg _cfg=new AppHttpCfg(); for(int index = 0; index < data.size();index++){
BeanUtils.copyProperties(cfg, _cfg); ComplexkeywordCfg cfg = data.get(index);
((AppCfgDao) batchSqlSession.getMapper(AppCfgDao.class)).insertAppHttpCfgBatch(_cfg); cfg.setTableName(tableName);
}else { if(regionDict.getDictId().intValue()==63) {
((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveComplexkeywordCfgBatch(cfg); AppHttpCfg _cfg=new AppHttpCfg();
} BeanUtils.copyProperties(cfg, _cfg);
((AppCfgDao) batchSqlSession.getMapper(AppCfgDao.class)).insertAppHttpCfgBatch(_cfg);
}else {
} ((StringCfgDao) batchSqlSession.getMapper(StringCfgDao.class)).saveComplexkeywordCfgBatch(cfg);
batchSqlSession.commit(); }
}finally { if (send) {
if(batchSqlSession != null){ if(regionDict.getIsMaat().intValue()==1) {
batchSqlSession.close(); MaatCfg maatCfg=convertMaatCfg(cfg,3);
//userregion处理
if(regionDict.getFunctionId()==7) {
if(!StringUtil.isEmpty(cfg.getDnsStrategyId())){
// maatCfg.setUserRegion(Constants.USER_REGION_SPLIT+entity.getDnsStrategyId()+Constants.USER_REGION_SPLIT);
maatCfg.setUserRegion(Constants.DNS_STRATEGY_USER_REGION_KEY+"="+cfg.getDnsStrategyId());
}
}else if(regionDict.getDictId()==10) {
String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, cfg.getDistrict());
if(StringUtil.isEmpty(dictValue) || dictValue.equals("默认")){
maatCfg.setUserRegion(Constants.HTTP_HEADER_USER_REGION_KEY+"="+cfg.getDistrict());
}
}else if(regionDict.getDictId()==11) {
String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, cfg.getDistrict());
if(StringUtil.isEmpty(dictValue) || dictValue.equals("默认")){
maatCfg.setUserRegion(Constants.HTTP_HEADER_USER_REGION_KEY+"="+cfg.getDistrict());
}
}
configCompileList.add(maatCfg);
}
}
}
if (send && configCompileList.size() > 0) {
ToMaatBean maatBean = new ToMaatBean();
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(new Date());
maatBean.setCreatorName(UserUtils.getUser().getName());
maatBean.setVersion(Constants.MAAT_VERSION);
maatBean.setOpAction(Constants.INSERT_ACTION);
// 调用服务接口下发配置数据
String json = BaseService.gsonToJson(maatBean);
if(configCompileList.size()>10) {
logger.info("增强字符串配置下发配置条数：" + configCompileList.size());
}else {
logger.info("增强字符串配置下发配置参数：" + json);
}
// 调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
logger.info("增强字符串配置下发响应信息：" + result.getMsg());
}
batchSqlSession.commit();
}finally {
if(batchSqlSession != null){
batchSqlSession.close();
}
}
} }
} }
} }
/** /**
* asn ip分组复用新增 * asn ip分组复用新增

6
src/main/resources/messages/message_en.properties
View File

@@ -1154,8 +1154,8 @@ area_group_manage=Grouping Area Manage
stream_media_protocol=Stream Media Protocol stream_media_protocol=Stream Media Protocol
new_link=New Link new_link=New Link
active_link=Close Link active_link=Close Link
traffic_ipactive_hour_trend=Active IP TOP10 Trend In Nearly One Hour traffic_ipactive_hour_trend=Active IP TOP10 Trend
traffic_ipactive_hour_max=Active IP TOP10 Maximum In Nearly One Hour traffic_ipactive_hour_max=Active IP TOP10 Maximum
ip_addr=IP ip_addr=IP
area_id=Area area_id=Area
link_num=Link Times link_num=Link Times
@@ -1226,7 +1226,7 @@ cfg_operation_log=Configuration Operation Log
function_name=Operation Module function_name=Operation Module
config_service_statistics=Config Statistics config_service_statistics=Config Statistics
ruleLimitTip=The number of effective rules has reached the limit(%s). ruleLimitTip=The number of effective rules has reached the limit(%s).
av_protocol_note=Note:Recognizable Protocols Include RTSP,RTMP. av_protocol_note=Note:Recognizable Protocols Include RTSP,RTMP,MMS.
ip_range_in_the_same=Start IP and end IP in a IP range must with in the same subnet ip_range_in_the_same=Start IP and end IP in a IP range must with in the same subnet
log_to_url=To HTTP URL log_to_url=To HTTP URL
source_compile_id=Configuration Source source_compile_id=Configuration Source

2502
src/main/resources/messages/message_ru.properties
View File

File diff suppressed because it is too large Load Diff

2504
src/main/resources/messages/message_zh_CN.properties
View File

File diff suppressed because it is too large Load Diff

6
src/main/resources/sql/20181222/add_doblacklist_column.sql Normal file
View File

@@ -0,0 +1,6 @@
ALTER TABLE `cfg_index_info` ADD COLUMN `do_blacklist` int(11) NOT NULL DEFAULT 1 AFTER `source_compile_id`;
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('153', 'DO_BLACKLIST', 'DO_BLACKLIST', '', '', '2018-12-22 12:39:06', '2018-12-22 12:39:06', '1');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('4075', '0', 'no', '', '0', '1', '1', '153');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('4077', '1', 'yes', '', '0', '1', '1', '153');

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

@@ -237,6 +237,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<!-- dolog end--> <!-- dolog end-->

8
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
View File

@@ -385,6 +385,7 @@
<th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th> <th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -433,6 +434,13 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if> <c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

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

@@ -237,6 +237,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<!-- dolog end--> <!-- dolog end-->

8
src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
View File

@@ -377,6 +377,7 @@
<th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th> <th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -423,6 +424,13 @@
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td> </td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>

20
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
View File

@@ -239,6 +239,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<c:set var="ipCfgIndex" value="0"></c:set> <c:set var="ipCfgIndex" value="0"></c:set>
<c:set var="strCfgIndex" value="0"></c:set> <c:set var="strCfgIndex" value="0"></c:set>

8
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
View File

@@ -357,6 +357,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -403,6 +404,13 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if> <c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

20
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pForm.jsp
View File

@@ -212,6 +212,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<c:set var="ipCfgIndex" value="0"></c:set> <c:set var="ipCfgIndex" value="0"></c:set>
<c:set var="hashCfgIndex" value="0"></c:set> <c:set var="hashCfgIndex" value="0"></c:set>

8
src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
View File

@@ -371,6 +371,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -416,6 +417,13 @@
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td> </td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>

20
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -535,6 +535,26 @@ var showHideIPSECProtocol=function(obj){
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<div class="row ratelimitAction hidden"> <div class="row ratelimitAction hidden">
<div class="col-md-6 hidden"> <div class="col-md-6 hidden">

10
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
View File

@@ -367,9 +367,10 @@
<th column="cfg_id" class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th> <th column="cfg_id" class="sort-column a.compile_id" style="display: none"><spring:message code="cfg_id"/></th>
<th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th> <th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="ratelimit" ><spring:message code="ratelimit"/></th> <th column="userregion2" ><spring:message code="ratelimit"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -425,6 +426,13 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if> <c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

20
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -243,6 +243,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<!-- dolog end--> <!-- dolog end-->
<c:set var="ipCfgIndex" value="0"></c:set> <c:set var="ipCfgIndex" value="0"></c:set>

8
src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
View File

@@ -372,6 +372,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -419,6 +420,13 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="35" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="35" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if> <c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

20
src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
View File

@@ -207,6 +207,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<!-- dolog end--> <!-- dolog end-->

8
src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
View File

@@ -371,6 +371,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -417,6 +418,13 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if> <c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

14
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -562,17 +562,17 @@
<th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th> <th column="config_describe" class="sort-column a.cfg_desc cfgDesc"><spring:message code="config_describe"/></th>
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<c:if test="${action == 16}"> <c:if test="${action == 16}">
<th column="response_code" ><spring:message code="response_code"/></th> <th column="userregion1" ><spring:message code="response_code"/></th>
<th column="response_content" ><spring:message code="response_content"/></th> <th column="userregion2" ><spring:message code="response_content"/></th>
</c:if> </c:if>
<c:if test="${action == 48}"> <c:if test="${action == 48}">
<th column="redirect_response_code" ><spring:message code="redirect_response_code"/></th> <th column="userregion1" ><spring:message code="redirect_response_code"/></th>
<th column="redirect_url" ><spring:message code="redirect_url"/></th> <th column="userregion2" ><spring:message code="redirect_url"/></th>
</c:if> </c:if>
<c:if test="${action == 80}"> <c:if test="${action == 80}">
<th column="replace_zone" ><spring:message code="replace_zone"/></th> <th column="userregion1" ><spring:message code="replace_zone"/></th>
<th column="replaced_content" ><spring:message code="replaced_content"/></th> <th column="userregion2" ><spring:message code="replaced_content"/></th>
<th column="replace_content" ><spring:message code="replace_content"/></th> <th column="userregion3" ><spring:message code="replace_content"/></th>
</c:if> </c:if>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<c:if test="${action ne 128}"> <c:if test="${action ne 128}">

21
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -219,6 +219,27 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
<div class="row">
<div class="col-md-6 policy"> <div class="col-md-6 policy">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message <label class="control-label col-md-3"><spring:message

8
src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
View File

@@ -370,6 +370,7 @@
<th column="policy_name" ><spring:message code="policy_name"/></th> <th column="policy_name" ><spring:message code="policy_name"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -420,6 +421,13 @@
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td> </td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>

20
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -281,6 +281,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<c:forEach items="${regionList}" var="region" varStatus="status"> <c:forEach items="${regionList}" var="region" varStatus="status">
<c:if test="${region.regionType eq 1 }"> <c:if test="${region.regionType eq 1 }">

8
src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
View File

@@ -527,6 +527,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -572,6 +573,13 @@
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td> </td>
<td audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>

20
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

@@ -225,6 +225,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<!-- dolog end--> <!-- dolog end-->
<c:set var="ipCfgIndex" value="0"></c:set> <c:set var="ipCfgIndex" value="0"></c:set>

8
src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
View File

@@ -368,6 +368,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -414,6 +415,13 @@
</c:if> </c:if>
</c:forEach> </c:forEach>
</td> </td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if> <c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

20
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

@@ -210,6 +210,26 @@
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_blacklist" /></label>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:choose>
<c:when test="${dict.itemCode eq _cfg.doBlackList}">
<label class="radio-inline">
<input type="radio" name="doBlackList" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:when>
<c:otherwise>
<label class="radio-inline">
<input type="radio" name="doBlackList" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
</label>
</c:otherwise>
</c:choose>
</c:forEach>
</div>
</div>
</div> </div>
<h4 class="form-section"> <h4 class="form-section">
<spring:message code="http_url_title" /> <spring:message code="http_url_title" />

8
src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
View File

@@ -349,6 +349,7 @@
<th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th> <th column="block_type" class="sort-column a.action"><spring:message code="block_type"/></th>
<th column="is_audit" ><spring:message code="is_audit"/></th> <th column="is_audit" ><spring:message code="is_audit"/></th>
<th column="do_log" ><spring:message code="do_log"/></th> <th column="do_log" ><spring:message code="do_log"/></th>
<th column="do_blacklist" ><spring:message code="do_blacklist"/></th>
<th column="log_total" ><spring:message code="log_total"/></th> <th column="log_total" ><spring:message code="log_total"/></th>
<th column="whether_area_block" ><spring:message code="whether_area_block"/></th> <th column="whether_area_block" ><spring:message code="whether_area_block"/></th>
<th column="letter" ><spring:message code="letter"/></th> <th column="letter" ><spring:message code="letter"/></th>
@@ -395,6 +396,13 @@
<spring:message code="${dict.itemValue }"/> <spring:message code="${dict.itemValue }"/>
</c:if> </c:if>
</c:forEach> </c:forEach>
</td>
<td>
<c:forEach items="${fns:getDictList('DO_BLACKLIST') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doBlackList }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td> </td>
<td audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> <td audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
<td> <td>

11
src/main/webapp/WEB-INF/views/dashboard/trafficActionTransList.jsp
View File

@@ -60,6 +60,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%> <%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
var starth=$("#beginDateh").val(); var starth=$("#beginDateh").val();
@@ -121,6 +122,16 @@ function showActionTransChart(rs){
scale:1, scale:1,
sourceWidth: 1280, sourceWidth: 1280,
sourceHeight: 500, sourceHeight: 500,
buttons: {
contextButton: {
menuItems: [
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[0],// 打印
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[1],// jpeg
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[4],// excel
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[3],// cvs
]
}
}
}, },
title: { title: {
text: null text: null

24
src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
View File

@@ -60,7 +60,7 @@
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="social_app"/></span> <span class="selectpicker form-control" ><spring:message code="social_app"/></span>
</div> </div>
<select id="appType" name="appType" class="selectpicker form-control input-medium" data-live-search="true" data-live-search-placeholder="search"> <select id="appType" name="appType" class="selectpicker form-control input-medium" data-max-options="10" data-selected-text-format="count > 2" multiple data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option> <option value=""><spring:message code="select"/></option>
<c:forEach items="${fns:getCodeList('appCode')}" var="dict" > <c:forEach items="${fns:getCodeList('appCode')}" var="dict" >
<option value="${dict.code}"><spring:message code="${dict.item}"></spring:message></option> <option value="${dict.code}"><spring:message code="${dict.item}"></spring:message></option>
@@ -84,7 +84,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;"> <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
<li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li> <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
<li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li> <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
</ul> </ul>
@@ -95,7 +95,7 @@
<table id="contentTable" class="table table-active table-striped table-bordered table-condensed text-nowrap"> <table id="contentTable" class="table table-active table-striped table-bordered table-condensed text-nowrap">
<thead> <thead>
<tr> <tr>
<th class="tl"><spring:message code="app"/></th> <th class="tl"><spring:message code="App"/></th>
<th class="tl"><spring:message code="link_num"/></th> <th class="tl"><spring:message code="link_num"/></th>
<th class="tl"><spring:message code="percentage"/> (<spring:message code="link_num"/>)</th> <th class="tl"><spring:message code="percentage"/> (<spring:message code="link_num"/>)</th>
<th class="tl"><spring:message code="packets"/></th> <th class="tl"><spring:message code="packets"/></th>
@@ -116,6 +116,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
loading();
var starth=$("#beginDateh").val(); var starth=$("#beginDateh").val();
var endh=$("#endDateh").val(); var endh=$("#endDateh").val();
$("#beginDate").val(starth); $("#beginDate").val(starth);
@@ -155,6 +156,7 @@ function ajaxAppList(start,end){
data:{"beginDate":start,"endDate":end,"appType":appType}, data:{"beginDate":start,"endDate":end,"appType":appType},
async:false, async:false,
timeout:10000, timeout:10000,
traditional:true,
success:function (data){ success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){ if(data!=null&&data.length>0&&data[0].error!=null){
top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>"); top.$.jBox.tip("<spring:message code='request_service_failed'/>", "<spring:message code='info'/>");
@@ -185,6 +187,14 @@ function ajaxAppList(start,end){
$(".export-btn").click(function(){ $(".export-btn").click(function(){
var dataType = $(this).attr("data-type"); var dataType = $(this).attr("data-type");
getPageData(1,999999);// 设置导出页条数 getPageData(1,999999);// 设置导出页条数
var start=$("#beginDate").val();
var end=$("#endDate").val();
var htmlTitle="";
htmlTitle+="<tr class='tr-title'>";
htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='App'/>"+"</th>";
htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
htmlTitle+="</tr>"
$("#contentTable thead").prepend(htmlTitle);
var te = $("#contentTable").tableExport({ var te = $("#contentTable").tableExport({
headings:true, headings:true,
footers:true, footers:true,
@@ -194,6 +204,7 @@ $(".export-btn").click(function(){
}); });
$("#myexport").click(); $("#myexport").click();
$("caption").remove(); $("caption").remove();
$(".tr-title").remove();
getPageData(1,10); getPageData(1,10);
}); });
/** /**
@@ -231,8 +242,7 @@ function htmlData(fileDataS){
}else{ }else{
$('.none-data').hide(); $('.none-data').hide();
$('.M-box').show(); $('.M-box').show();
var start=$("#beginDate").val();
var end=$("#endDate").val();
$.each(fileDataS,function (index,data){ $.each(fileDataS,function (index,data){
if(data!=null){ if(data!=null){
var totalLink = data.totalLink; var totalLink = data.totalLink;
@@ -250,7 +260,7 @@ function htmlData(fileDataS){
if(totalGByte!=null&&totalGByte!=0 ){ if(totalGByte!=null&&totalGByte!=0 ){
gbytper=((data.GByte/totalGByte)*100).toFixed(2); gbytper=((data.GByte/totalGByte)*100).toFixed(2);
} }
var html = "<tr>"; var html = "<tr>";
html+= "<td class='tc'>"+data.appName+"</td>"; html+= "<td class='tc'>"+data.appName+"</td>";
html+= "<td class='tc'>"+data.linkNum+"</td>"; html+= "<td class='tc'>"+data.linkNum+"</td>";
html+= "<td class='tc'>"+linkper+"%"+"</td>"; html+= "<td class='tc'>"+linkper+"%"+"</td>";
@@ -267,7 +277,7 @@ function htmlData(fileDataS){
html+= "<td class='tc'>"+Math.round(totalPackets*100)/100+"</td>"; html+= "<td class='tc'>"+Math.round(totalPackets*100)/100+"</td>";
html+= "<td class='tc'>"+"100%"+"</td>"; html+= "<td class='tc'>"+"100%"+"</td>";
html+= "<td class='tc'>"+Math.round(totalGByte*100)/100+"</td>"; html+= "<td class='tc'>"+Math.round(totalGByte*100)/100+"</td>";
html+= "<td class='tc'>"+start+"--"+ end +"</td>"; html+= "<td class='tc'>"+"100%"+"</td>";
html+="</tr>" html+="</tr>"
} }
} }

23
src/main/webapp/WEB-INF/views/dashboard/trafficBandwidthList.jsp
View File

@@ -83,6 +83,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/series-label.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
var starth=$("#beginDateh").val(); var starth=$("#beginDateh").val();
@@ -366,6 +367,16 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
scale:1, scale:1,
sourceWidth: 1280, sourceWidth: 1280,
sourceHeight: 550, sourceHeight: 550,
buttons: {
contextButton: {
menuItems: [
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[0],// 打印
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[1],// jpeg
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[4],// excel
Highcharts.getOptions().exporting.buttons.contextButton.menuItems[3],// cvs
]
}
}
}, },
yAxis: { yAxis: {
title: { title: {
@@ -377,18 +388,8 @@ function showBandwidthChart(id,unitType,xdata,ydata,title){
enabled:true enabled:true
}, },
xAxis:{ xAxis:{
type: 'datetime', type:'category',
// tickmarkPlacement: 'on', // tickmarkPlacement: 'on',
dateTimeLabelFormats: {
millisecond: '%H:%M:%S.%L',
second: '%H:%M',
minute: '%H:%M',
hour: '%H:%M',
day: '%m-%d',
week: '%m-%d',
month: '%Y-%m',
year: '%Y'
},
labels: { labels: {
rotation: -45, //倾斜的角度 rotation: -45, //倾斜的角度
}, },

6
src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp
View File

@@ -44,11 +44,11 @@ $(document).ready(function(){
}); });
//活跃IP一小时间隔五分钟统计 //活跃IP一小时间隔五分钟统计
function domainTrans(){ function domainTrans(){
loading();
var beginDate=$("#beginDate").val(); var beginDate=$("#beginDate").val();
var endDate=$("#endDate").val(); var endDate=$("#endDate").val();
var entranceId=$("#entranceId").val(); var entranceId=$("#entranceId").val();
var domain=$("#domain").val(); var domain=$("#domain").val();
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/traffic/ajaxDomainTrans', url: '${ctx}/dashboard/traffic/ajaxDomainTrans',
type : "get" , type : "get" ,
@@ -80,11 +80,9 @@ function showDomainTrans(rs){
var xData=new Array(); var xData=new Array();
xData=rs[0].statTime; xData=rs[0].statTime;
var series=new Array(); var series=new Array();
console.log(rs[0].statTime)
console.log(rs[0].count)
// $(rs).each(function(i, d) { // $(rs).each(function(i, d) {
series.push({ series.push({
name: ' ', name: 'unique',
data: rs[0].count data: rs[0].count
}); });
// }) // })

13
src/main/webapp/WEB-INF/views/dashboard/trafficHttpStatisticList.jsp
View File

@@ -61,7 +61,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;"> <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
<li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li> <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
<li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li> <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
</ul> </ul>
@@ -93,6 +93,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
loading();
var starth=$("#beginDateh").val(); var starth=$("#beginDateh").val();
var endh=$("#endDateh").val(); var endh=$("#endDateh").val();
$("#beginDate").val(starth); $("#beginDate").val(starth);
@@ -166,6 +167,14 @@ function ajaxProtocolList(start,end){
$(".export-btn").click(function(){ $(".export-btn").click(function(){
var dataType = $(this).attr("data-type"); var dataType = $(this).attr("data-type");
getPageData(1,999999);// 设置导出页条数 getPageData(1,999999);// 设置导出页条数
var start=$("#beginDate").val();
var end=$("#endDate").val();
var htmlTitle="";
htmlTitle+="<tr class='tr-title'>";
htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='service'/>"+"</th>";
htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
htmlTitle+="</tr>"
$("#contentTable thead").prepend(htmlTitle);
var te = $("#contentTable").tableExport({ var te = $("#contentTable").tableExport({
headings:true, headings:true,
footers:true, footers:true,
@@ -175,6 +184,7 @@ $(".export-btn").click(function(){
}); });
$("#myexport").click(); $("#myexport").click();
$("caption").remove(); $("caption").remove();
$(".tr-title").remove();
getPageData(1,10); getPageData(1,10);
}); });
/** /**
@@ -233,7 +243,6 @@ function htmlData(fileDataS){
html+= "<td class='tc'>"+"100%"+"</td>"; html+= "<td class='tc'>"+"100%"+"</td>";
html+= "<td class='tc'>"+(data.allGByte/1073741824).toFixed(2)+"</td>"; html+= "<td class='tc'>"+(data.allGByte/1073741824).toFixed(2)+"</td>";
html+= "<td class='tc'>"+"100%"+"</td>"; html+= "<td class='tc'>"+"100%"+"</td>";
html+= "<td class='tc'>"+start+"--"+ end +"</td>";
html+="</tr>" html+="</tr>"
} }
} }

17
src/main/webapp/WEB-INF/views/dashboard/trafficIpActiveList.jsp
View File

@@ -64,7 +64,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;"> <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
<li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li> <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
<li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li> <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
</ul> </ul>
@@ -108,6 +108,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/exporting-data.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
loading();
var starth=$("#beginDateh").val(); var starth=$("#beginDateh").val();
var endh=$("#endDateh").val(); var endh=$("#endDateh").val();
$("#beginDate").val(starth); $("#beginDate").val(starth);
@@ -128,6 +129,14 @@ $(document).ready(function(){
//导出列表 //导出列表
$(".export-btn").click(function(){ $(".export-btn").click(function(){
var dataType = $(this).attr("data-type"); var dataType = $(this).attr("data-type");
var start=$("#beginDate").val();
var end=$("#endDate").val();
var htmlTitle="";
htmlTitle+="<tr class='tr-title'>";
htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='traffic_ipactive_hour_max'/>"+"</th>";
htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
htmlTitle+="</tr>"
$("#contentTable thead").prepend(htmlTitle);
var te = $("#contentTable").tableExport({ var te = $("#contentTable").tableExport({
headings:true, headings:true,
footers:true, footers:true,
@@ -137,6 +146,7 @@ $(".export-btn").click(function(){
}); });
$("#myexport").click(); $("#myexport").click();
$("caption").remove(); $("caption").remove();
$(".tr-title").remove();
}); });
function searchList(){ function searchList(){
var start=$("#beginDate").val(); var start=$("#beginDate").val();
@@ -228,13 +238,11 @@ function showIpActiveChart(rs){
}, },
error: function(data, textStatus, errorThrown){ error: function(data, textStatus, errorThrown){
closeTip(); closeTip();
// warning_prompt("获取实时列表数据失败！",1500);
}, },
complete:function(XMLHttpRequest,status){//超时设置 complete:function(XMLHttpRequest,status){//超时设置
closeTip(); closeTip();
} }
}); });
} }
//活跃IP一小时统计 //活跃IP一小时统计
function ipActiveOneHourList(beginDate,endDate){ function ipActiveOneHourList(beginDate,endDate){
@@ -292,7 +300,7 @@ function showIpActiveChart(rs){
html+= "<td class='tc'>"+totalc2sPkt+"</td>"; html+= "<td class='tc'>"+totalc2sPkt+"</td>";
html+= "<td class='tc'>"+totals2cPkt+"</td>"; html+= "<td class='tc'>"+totals2cPkt+"</td>";
html+= "<td class='tc'>"+totalpacket+"</td>"; html+= "<td class='tc'>"+totalpacket+"</td>";
html+= "<td class='tc'>"+beginDate+"--"+ endDate +"</td>"; html+= "<td class='tc'>"+"--"+"</td>";
html+="</tr>" html+="</tr>"
} }
$("#tbodyData").append(html); $("#tbodyData").append(html);
@@ -304,7 +312,6 @@ function showIpActiveChart(rs){
}, },
error: function(data, textStatus, errorThrown){ error: function(data, textStatus, errorThrown){
closeTip(); closeTip();
// warning_prompt("获取实时列表数据失败！",1500);
}, },
complete:function(XMLHttpRequest,status){//超时设置 complete:function(XMLHttpRequest,status){//超时设置
closeTip(); closeTip();

57
src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
View File

@@ -34,17 +34,30 @@
</div> </div>
<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium" <input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/> value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'#F{$dp.$D(\'endDate\')}'});"/>
</div> </div>
</div> </div>
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span> <span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'${endDate}'});"/>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="protocol_type"/></span>
</div> </div>
<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium" <select id="protoType" name="protoType" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search">
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,minDate:'#F{$dp.$D(\'beginDate\')}',maxDate:'${endDate}'});"/> <option value=""><spring:message code="select"/></option>
</div> <c:forEach items="${fns:getCodeList('protocolCode')}" var="dict" >
</div> <option value="${dict.code}"><spring:message code="${dict.item}"></spring:message></option>
</c:forEach>
</select>
</div>
</div>
<div class="pull-left"> <div class="pull-left">
<button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button> <button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
@@ -61,7 +74,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;"> <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
<li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li> <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
<li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li> <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
</ul> </ul>
@@ -93,6 +106,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
loading();
var starth=$("#beginDateh").val(); var starth=$("#beginDateh").val();
var endh=$("#endDateh").val(); var endh=$("#endDateh").val();
$("#beginDate").val(starth); $("#beginDate").val(starth);
@@ -114,7 +128,7 @@ $(document).ready(function(){
},500000);// 五分钟调用一次 },500000);// 五分钟调用一次
}); });
function searchList(){ function searchList(){
// loading(); loading();
var start=$("#beginDate").val(); var start=$("#beginDate").val();
var end=$("#endDate").val(); var end=$("#endDate").val();
if(start==''||end==''||end==null||start==null){ if(start==''||end==''||end==null||start==null){
@@ -124,14 +138,16 @@ function searchList(){
} }
} }
function ajaxProtocolList(start,end){ function ajaxProtocolList(start,end){
// loading(); var protoType=$("#protoType").val();
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/traffic/protocolList', url: '${ctx}/dashboard/traffic/protocolList',
type: 'get', type: 'get',
dataType: "json", dataType: "json",
data:{"beginDate":start,"endDate":end}, data:{"beginDate":start,"endDate":end,"protoType":protoType},
async:false, async:false,
timeout:10000, timeout:40000,
traditional:true,
beforeSend:function(){ beforeSend:function(){
loading(); loading();
}, },
@@ -165,6 +181,14 @@ function ajaxProtocolList(start,end){
$(".export-btn").click(function(){ $(".export-btn").click(function(){
var dataType = $(this).attr("data-type"); var dataType = $(this).attr("data-type");
getPageData(1,999999);// 设置导出页条数 getPageData(1,999999);// 设置导出页条数
var start=$("#beginDate").val();
var end=$("#endDate").val();
var htmlTitle="";
htmlTitle+="<tr class='tr-title'>";
htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='protocol_type'/>"+"</th>";
htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
htmlTitle+="</tr>"
$("#contentTable thead").prepend(htmlTitle);
var te = $("#contentTable").tableExport({ var te = $("#contentTable").tableExport({
headings:true, headings:true,
footers:true, footers:true,
@@ -174,6 +198,7 @@ $(".export-btn").click(function(){
}); });
$("#myexport").click(); $("#myexport").click();
$("caption").remove(); $("caption").remove();
$(".tr-title").remove();
getPageData(1,10); getPageData(1,10);
}); });
/** /**
@@ -246,7 +271,7 @@ function htmlData(fileDataS){
html+= "<td class='tc'>"+Math.round(totalPackets*100)/100+"</td>"; html+= "<td class='tc'>"+Math.round(totalPackets*100)/100+"</td>";
html+= "<td class='tc'>"+"100%"+"</td>"; html+= "<td class='tc'>"+"100%"+"</td>";
html+= "<td class='tc'>"+Math.round(totalGByte*100)/100+"</td>"; html+= "<td class='tc'>"+Math.round(totalGByte*100)/100+"</td>";
html+= "<td class='tc'>"+start+"--"+ end +"</td>"; html+= "<td class='tc'>"+"100%"+"</td>";
html+="</tr>" html+="</tr>"
} }
} }

21
src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp
View File

@@ -69,14 +69,14 @@
<div class="input-group-btn"> <div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="domain_name"/></span> <span class="selectpicker form-control" ><spring:message code="domain_name"/></span>
</div> </div>
<select id="domain" name="domain" class="selectpicker form-control" data-max-options="50" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search"> <select id="domain" name="domain" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 2" multiple max-width="100px" data-live-search="true" data-live-search-placeholder="search">
<option value=""><spring:message code="select"/></option> <option value=""><spring:message code="select"/></option>
<c:forEach items="${domainList}" var="dict" > <c:forEach items="${domainList}" var="dict" >
<option value="${dict.id}"><spring:message code="${dict.domain}"></spring:message></option> <option value="${dict.id}"><spring:message code="${dict.domain}"></spring:message></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
</div> </div>
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
@@ -124,7 +124,7 @@
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <spring:message code="export"/>
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -9px;"> <ul class="dropdown-menu" role="menu" style="min-width: 81px;right: -16px;">
<li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li> <li><a class="btn export-btn" data-type="xlsx" id="export-btn"><i class="fa fa-download"> </i> excel </a><li>
<li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li> <li><a class="btn export-btn" data-type="csv" id="export-btn"><i class="fa fa-download"> </i> csv &nbsp;&nbsp;&nbsp;</a><li>
</ul> </ul>
@@ -168,6 +168,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
loading();
var starth = $("#beginDateh").val(); var starth = $("#beginDateh").val();
var endh = $("#endDateh").val(); var endh = $("#endDateh").val();
$("#beginDate").val(starth); $("#beginDate").val(starth);
@@ -200,9 +201,9 @@
} }
} }
function ajaxWebTypeList(start, end) { function ajaxWebTypeList(start, end) {
loading();
var domain = $("#domain").val(); var domain = $("#domain").val();
var entranceId = $("#entranceId").val(); var entranceId = $("#entranceId").val();
loading();
$.ajax({ $.ajax({
url : '${ctx}/dashboard/traffic/websiteList', url : '${ctx}/dashboard/traffic/websiteList',
type : 'get', type : 'get',
@@ -250,6 +251,14 @@
$(".export-btn").click(function(){ $(".export-btn").click(function(){
var dataType = $(this).attr("data-type"); var dataType = $(this).attr("data-type");
getPageData(1,999999);// 设置导出页条数 getPageData(1,999999);// 设置导出页条数
var start=$("#beginDate").val();
var end=$("#endDate").val();
var htmlTitle="";
htmlTitle+="<tr class='tr-title'>";
htmlTitle+= "<th class='tc' colspan='1'>"+"<spring:message code='domain_name'/>"+"</th>";
htmlTitle+= "<th class='tc' colspan='2'>"+start+"--"+ end +"</th>";
htmlTitle+="</tr>"
$("#contentTable thead").prepend(htmlTitle);
var te = $("#contentTable").tableExport({ var te = $("#contentTable").tableExport({
headings:true, headings:true,
footers:true, footers:true,
@@ -259,6 +268,7 @@
}); });
$("#myexport").click(); $("#myexport").click();
$("caption").remove(); $("caption").remove();
$(".tr-title").remove();
getPageData(1, 10); getPageData(1, 10);
}); });
$("#print-btn").click(function() { $("#print-btn").click(function() {
@@ -334,7 +344,6 @@
html+= "<td class='tc'>"+"100%"+"</td>"; html+= "<td class='tc'>"+"100%"+"</td>";
html+= "<td class='tc'>"+totalGbyte+"</td>"; html+= "<td class='tc'>"+totalGbyte+"</td>";
html+= "<td class='tc'>"+"100%"+"</td>"; html+= "<td class='tc'>"+"100%"+"</td>";
html+= "<td class='tc'>"+start+"--"+ end +"</td>";
html+="</tr>" html+="</tr>"
} }
} }

7
src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp
View File

@@ -1136,7 +1136,7 @@
$.ajax({ $.ajax({
type:'get', type:'get',
dataType: 'json', dataType: 'json',
url:"${pageContext.request.contextPath}/nis/dynamicpage/indexTraffic?baseNum=" + top.baseNum, url:"${pageContext.request.contextPath}/nis/dynamicpage/indexTraffic?hour=2&baseNum=" + top.baseNum,
success:function(res){//处理返回结果 success:function(res){//处理返回结果
if(res) { if(res) {
data = res; data = res;
@@ -1189,7 +1189,7 @@
$.ajax({ $.ajax({
type:'get', type:'get',
dataType: 'json', dataType: 'json',
url:'${pageContext.request.contextPath}/nis/dynamicpage/indexLog?sid=' + top.indexLogServiceId + "&baseNum=" + top.baseNum, url:'${pageContext.request.contextPath}/nis/dynamicpage/indexLog?hour=24&sid=' + top.indexLogServiceId + "&baseNum=" + top.baseNum,
success:function(res){//处理返回结果 success:function(res){//处理返回结果
logData = res; logData = res;
_logData = logData.shift(); _logData = logData.shift();
@@ -1219,6 +1219,7 @@
/* 数字特效 */ /* 数字特效 */
function animalNum(dropNum){ function animalNum(dropNum){
$("#dataNums").empty();
//var dropNum = rand(100,99999);; //var dropNum = rand(100,99999);;
$("#dataNums").rollNum({ $("#dataNums").rollNum({
deVal:dropNum deVal:dropNum
@@ -1240,7 +1241,7 @@
$.ajax({ $.ajax({
type:'get', type:'get',
dataType: 'json', dataType: 'json',
url:'${pageContext.request.contextPath}/nis/dynamicpage/indexDrop' + "?baseNum=" + top.baseNum, url:'${pageContext.request.contextPath}/nis/dynamicpage/indexDrop?hour=24' + "&baseNum=" + top.dropBaseNum,
success:function(res){//处理返回结果 success:function(res){//处理返回结果
if(res) { if(res) {
dropData = res; dropData = res;

3
src/main/webapp/WEB-INF/views/home.jsp.new
View File

@@ -17,6 +17,7 @@
var indexLogServiceIdArr = [16,17,20,129,33]; var indexLogServiceIdArr = [16,17,20,129,33];
var indexLogServiceNameArr = ["IP BLK", "HTTP BLK", "MAIL BLK", "HTTP MON", "APP MON"]; var indexLogServiceNameArr = ["IP BLK", "HTTP BLK", "MAIL BLK", "HTTP MON", "APP MON"];
var baseNum = 10000; var baseNum = 10000;
var dropBaseNum = 30000;
/* var indexLogServiceId = "128,131,149,16,33"; /* var indexLogServiceId = "128,131,149,16,33";
var indexLogServiceIdArr = [128,131,149,16,33]; var indexLogServiceIdArr = [128,131,149,16,33];
var indexLogServiceNameArr = ["IP Mon", "SSL Mon", "ASN Mon", "IP Blk", "APP Mon"]; */ var indexLogServiceNameArr = ["IP Mon", "SSL Mon", "ASN Mon", "IP Blk", "APP Mon"]; */
@@ -72,7 +73,7 @@
// console(window.frames['mainFrame'].location); // console(window.frames['mainFrame'].location);
// if(window.frames['mainFrame'].location.search("/dynamicIndex/")!=-1){ // if(window.frames['mainFrame'].location.search("/dynamicIndex/")!=-1){
//关闭菜单 //关闭菜单
$('.page-sidebar .sidebar-toggler').click(); //$('.page-sidebar .sidebar-toggler').click();
//f11全屏 //f11全屏
//fullScreen(); //fullScreen();
//} //}

37
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -69,15 +69,19 @@ $(document).ready(function() {
} }
}); });
//ajaxServiceLogTotal(); //ajaxServiceLogTotal();
$("#export-btn").click(function(){ $(".export-btn").click(function(){
var suffix = $(this).data("export-type");
totaltb(1,-1); totaltb(1,-1);
getExportHead();
var te = $(".in table").tableExport({ var te = $(".in table").tableExport({
headings:true, headings:true,
footers:true, footers:true,
formats:["xlsx"], formats:[suffix],
fileName: getXlsxFileName(), fileName: getFileName(),
bootstrap:false bootstrap:false
}); });
$(".exportFirst").remove();
$("#myexport").click(); $("#myexport").click();
$("caption").remove(); $("caption").remove();
//totaltb(pato,size); //totaltb(pato,size);
@@ -93,8 +97,20 @@ $(document).ready(function() {
var li=document.getElementById("liwhite").offsetWidth; var li=document.getElementById("liwhite").offsetWidth;
var lipx=Number(li/6); var lipx=Number(li/6);
$(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'}); $(".lireport").css({'width':lipx+'px','text-overflow':'ellipsis','overflow':'hidden'});
}); });
function getXlsxFileName() { function getExportHead(){
// 报表导出 文件增加表头
var timeType = $("#reportType").find("option:selected").text();
var time = $("#intype").val();
var tabName = $("#liwhite").find("li[class='active'] a").attr("title");
var addTr = "<tr class='exportFirst' class='hidden'><td><spring:message code='${bean.cfgName}'/> "+timeType+"："+time+" "+tabName+"</td></tr>";
$(".table-responsive").find("table > thead").prepend(addTr);
}
function getFileName() {
var cfgName = $("[name=cfgName2]").val() + "_"; var cfgName = $("[name=cfgName2]").val() + "_";
if ("${bean.serviceId}") { if ("${bean.serviceId}") {
var action = $("[name=serviceId]").find('[value=' + "${bean.serviceId}" + ']').text() + "_"; var action = $("[name=serviceId]").find('[value=' + "${bean.serviceId}" + ']').text() + "_";
@@ -467,7 +483,18 @@ white-space:nowrap;
<div class="pull-left"> <div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button> <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button> <button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="export-btn"><i class="fa fa-download"> <spring:message code="export"/></i></button> <%-- <button type="button" class="btn btn-default" id="export-btn"><i class="fa fa-download"> <spring:message code="export"/></i></button> --%>
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right" style="min-width: 110px;" >
<li><a href="javascript:;" class="export-btn" data-export-type="xlsx"><i class="fa fa-download"> <spring:message code="Excel"/></i></a></li>
<li><a href="javascript:;" class="export-btn" data-export-type="csv"><i class="fa fa-download"> <spring:message code="CSV"/></i></a></li>
</ul>
</div>
<%-- <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button> --%> <%-- <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/><i class="fa fa-angle-double-down"></i></button> --%>
</div> </div>
<div class="pull-right"> <div class="pull-right">

42
src/main/webapp/static/global/plugins/highcharts/js/series-label.js
View File

@@ -1,20 +1,22 @@
/* /*
Highcharts JS v6.1.0 (2018-04-13) Highcharts JS v7.0.1 (2018-12-19)
(c) 2009-2017 Torstein Honsi (c) 2009-2018 Torstein Honsi
License: www.highcharts.com/license License: www.highcharts.com/license
*/ */
(function(r){"object"===typeof module&&module.exports?module.exports=r:r(Highcharts)})(function(r){(function(n){function r(c,b,a,k,d,e){c=(e-b)*(a-c)-(k-b)*(d-c);return 0<c?!0:0>c?!1:!0}function w(c,b,a,k,d,e,f,m){return r(c,b,d,e,f,m)!==r(a,k,d,e,f,m)&&r(c,b,a,k,d,e)!==r(c,b,a,k,f,m)}function A(c,b,a,k,d,e,f,m){return w(c,b,c+a,b,d,e,f,m)||w(c+a,b,c+a,b+k,d,e,f,m)||w(c,b+k,c+a,b+k,d,e,f,m)||w(c,b,c,b+k,d,e,f,m)}var D=n.addEvent,u=n.each,B=n.extend,y=n.isNumber,x=n.pick,z=n.Series,E=n.SVGRenderer, (function(r){"object"===typeof module&&module.exports?module.exports=r:"function"===typeof define&&define.amd?define(function(){return r}):r("undefined"!==typeof Highcharts?Highcharts:void 0)})(function(r){(function(n){function r(c,b,a,k,d,e){c=(e-b)*(a-c)-(k-b)*(d-c);return 0<c?!0:0>c?!1:!0}function v(c,b,a,k,d,e,f,m){return r(c,b,d,e,f,m)!==r(a,k,d,e,f,m)&&r(c,b,a,k,d,e)!==r(c,b,a,k,f,m)}function z(c,b,a,k,d,e,f,m){return v(c,b,c+a,b,d,e,f,m)||v(c+a,b,c+a,b+k,d,e,f,m)||v(c,b+k,c+a,b+k,d,e,f,m)||
C=n.Chart;n.setOptions({plotOptions:{series:{label:{enabled:!0,connectorAllowed:!1,connectorNeighbourDistance:24,minFontSize:null,maxFontSize:null,onArea:null,style:{fontWeight:"bold"},boxesToAvoid:[]}}}});E.prototype.symbols.connector=function(c,b,a,k,d){var e=d&&d.anchorX;d=d&&d.anchorY;var f,m,h=a/2;y(e)&&y(d)&&(f=["M",e,d],m=b-d,0>m&&(m=-k-m),m<a&&(h=e<c+a/2?m:a-m),d>b+k?f.push("L",c+h,b+k):d<b?f.push("L",c+h,b):e<c?f.push("L",c,b+k/2):e>c+a&&f.push("L",c+a,b+k/2));return f||[]};z.prototype.getPointsOnGraph= v(c,b,c,b+k,d,e,f,m)}var C=n.addEvent,A=n.extend,w=n.isNumber,x=n.pick,y=n.Series,D=n.SVGRenderer,B=n.Chart;n.setOptions({plotOptions:{series:{label:{enabled:!0,connectorAllowed:!1,connectorNeighbourDistance:24,minFontSize:null,maxFontSize:null,onArea:null,style:{fontWeight:"bold"},boxesToAvoid:[]}}}});D.prototype.symbols.connector=function(c,b,a,k,d){var e=d&&d.anchorX;d=d&&d.anchorY;var f,m,h=a/2;w(e)&&w(d)&&(f=["M",e,d],m=b-d,0>m&&(m=-k-m),m<a&&(h=e<c+a/2?m:a-m),d>b+k?f.push("L",c+h,b+k):d<b?f.push("L",
function(){if(this.xAxis||this.yAxis){var c=this.points,b,a,k=[],d,e,f,m;e=this.graph||this.area;f=e.element;var h=this.chart.inverted,q=this.xAxis;b=this.yAxis;var v=h?b.pos:q.pos,h=h?q.pos:b.pos,q=x(this.options.label.onArea,!!this.area),p=b.getThreshold(this.options.threshold);if(this.getPointSpline&&f.getPointAtLength&&!q){e.toD&&(a=e.attr("d"),e.attr({d:e.toD}));m=f.getTotalLength();for(d=0;d<m;d+=16)b=f.getPointAtLength(d),k.push({chartX:v+b.x,chartY:h+b.y,plotX:b.x,plotY:b.y});a&&e.attr({d:a}); c+h,b):e<c?f.push("L",c,b+k/2):e>c+a&&f.push("L",c+a,b+k/2));return f||[]};y.prototype.getPointsOnGraph=function(){if(this.xAxis||this.yAxis){var c=this.points,b,a,k=[],d,e,f,m;e=this.graph||this.area;f=e.element;var h=this.chart.inverted,q=this.xAxis;b=this.yAxis;var u=h?b.pos:q.pos,h=h?q.pos:b.pos,q=x(this.options.label.onArea,!!this.area),p=b.getThreshold(this.options.threshold);if(this.getPointSpline&&f.getPointAtLength&&!q){e.toD&&(a=e.attr("d"),e.attr({d:e.toD}));m=f.getTotalLength();for(d=
b=c[c.length-1];b.chartX=v+b.plotX;b.chartY=h+b.plotY;k.push(b)}else for(m=c.length,d=0;d<m;d+=1){b=c[d];a=c[d-1];b.chartX=v+b.plotX;b.chartY=h+b.plotY;q&&(b.chartCenterY=h+(b.plotY+x(b.yBottom,p))/2);if(0<d&&(e=Math.abs(b.chartX-a.chartX),f=Math.abs(b.chartY-a.chartY),e=Math.max(e,f),16<e))for(e=Math.ceil(e/16),f=1;f<e;f+=1)k.push({chartX:a.chartX+f/e*(b.chartX-a.chartX),chartY:a.chartY+f/e*(b.chartY-a.chartY),chartCenterY:a.chartCenterY+f/e*(b.chartCenterY-a.chartCenterY),plotX:a.plotX+f/e*(b.plotX- 0;d<m;d+=16)b=f.getPointAtLength(d),k.push({chartX:u+b.x,chartY:h+b.y,plotX:b.x,plotY:b.y});a&&e.attr({d:a});b=c[c.length-1];b.chartX=u+b.plotX;b.chartY=h+b.plotY;k.push(b)}else for(m=c.length,d=0;d<m;d+=1){b=c[d];a=c[d-1];b.chartX=u+b.plotX;b.chartY=h+b.plotY;q&&(b.chartCenterY=h+(b.plotY+x(b.yBottom,p))/2);if(0<d&&(e=Math.abs(b.chartX-a.chartX),f=Math.abs(b.chartY-a.chartY),e=Math.max(e,f),16<e))for(e=Math.ceil(e/16),f=1;f<e;f+=1)k.push({chartX:a.chartX+f/e*(b.chartX-a.chartX),chartY:a.chartY+f/
a.plotX),plotY:a.plotY+f/e*(b.plotY-a.plotY)});y(b.plotY)&&k.push(b)}return k}};z.prototype.labelFontSize=function(c,b){return c+this.sum/this.chart.labelSeriesMaxSum*(b-c)+"px"};z.prototype.checkClearPoint=function(c,b,a,k){var d=Number.MAX_VALUE,e=Number.MAX_VALUE,f,m,h=this.options.label.connectorAllowed,q=x(this.options.label.onArea,!!this.area),v=this.chart,p,l,n,r,t,g;for(t=0;t<v.boxesToAvoid.length;t+=1)if(l=v.boxesToAvoid[t],g=c+a.width,p=b,n=b+a.height,!(c>l.right||g<l.left||p>l.bottom|| e*(b.chartY-a.chartY),chartCenterY:a.chartCenterY+f/e*(b.chartCenterY-a.chartCenterY),plotX:a.plotX+f/e*(b.plotX-a.plotX),plotY:a.plotY+f/e*(b.plotY-a.plotY)});w(b.plotY)&&k.push(b)}return k}};y.prototype.labelFontSize=function(c,b){return c+this.sum/this.chart.labelSeriesMaxSum*(b-c)+"px"};y.prototype.checkClearPoint=function(c,b,a,k){var d=Number.MAX_VALUE,e=Number.MAX_VALUE,f,m,h=this.options.label.connectorAllowed,q=x(this.options.label.onArea,!!this.area),u=this.chart,p,l,n,r,t,g;for(t=0;t<u.boxesToAvoid.length;t+=
n<l.top))return!1;for(t=0;t<v.series.length;t+=1)if(p=v.series[t],l=p.interpolatedPoints,p.visible&&l){for(g=1;g<l.length;g+=1){if(l[g].chartX>=c-16&&l[g-1].chartX<=c+a.width+16){if(A(c,b,a.width,a.height,l[g-1].chartX,l[g-1].chartY,l[g].chartX,l[g].chartY))return!1;this===p&&!f&&k&&(f=A(c-16,b-16,a.width+32,a.height+32,l[g-1].chartX,l[g-1].chartY,l[g].chartX,l[g].chartY))}!h&&!f||this===p&&!q||(n=c+a.width/2-l[g].chartX,r=b+a.height/2-l[g].chartY,d=Math.min(d,n*n+r*r))}if(!q&&h&&this===p&&(k&&!f|| 1)if(l=u.boxesToAvoid[t],g=c+a.width,p=b,n=b+a.height,!(c>l.right||g<l.left||p>l.bottom||n<l.top))return!1;for(t=0;t<u.series.length;t+=1)if(p=u.series[t],l=p.interpolatedPoints,p.visible&&l){for(g=1;g<l.length;g+=1){if(l[g].chartX>=c-16&&l[g-1].chartX<=c+a.width+16){if(z(c,b,a.width,a.height,l[g-1].chartX,l[g-1].chartY,l[g].chartX,l[g].chartY))return!1;this===p&&!f&&k&&(f=z(c-16,b-16,a.width+32,a.height+32,l[g-1].chartX,l[g-1].chartY,l[g].chartX,l[g].chartY))}!h&&!f||this===p&&!q||(n=c+a.width/2-
d<Math.pow(this.options.label.connectorNeighbourDistance,2))){for(g=1;g<l.length;g+=1)f=Math.min(Math.pow(c+a.width/2-l[g].chartX,2)+Math.pow(b+a.height/2-l[g].chartY,2),Math.pow(c-l[g].chartX,2)+Math.pow(b-l[g].chartY,2),Math.pow(c+a.width-l[g].chartX,2)+Math.pow(b-l[g].chartY,2),Math.pow(c+a.width-l[g].chartX,2)+Math.pow(b+a.height-l[g].chartY,2),Math.pow(c-l[g].chartX,2)+Math.pow(b+a.height-l[g].chartY,2)),f<e&&(e=f,m=l[g]);f=!0}}return!k||f?{x:c,y:b,weight:d-(m?e:0),connectorPoint:m}:!1};C.prototype.drawSeriesLabels= l[g].chartX,r=b+a.height/2-l[g].chartY,d=Math.min(d,n*n+r*r))}if(!q&&h&&this===p&&(k&&!f||d<Math.pow(this.options.label.connectorNeighbourDistance,2))){for(g=1;g<l.length;g+=1)f=Math.min(Math.pow(c+a.width/2-l[g].chartX,2)+Math.pow(b+a.height/2-l[g].chartY,2),Math.pow(c-l[g].chartX,2)+Math.pow(b-l[g].chartY,2),Math.pow(c+a.width-l[g].chartX,2)+Math.pow(b-l[g].chartY,2),Math.pow(c+a.width-l[g].chartX,2)+Math.pow(b+a.height-l[g].chartY,2),Math.pow(c-l[g].chartX,2)+Math.pow(b+a.height-l[g].chartY,2)),
function(){var c=this,b=this.labelSeries;c.boxesToAvoid=[];u(b,function(a){a.interpolatedPoints=a.getPointsOnGraph();u(a.options.label.boxesToAvoid||[],function(a){c.boxesToAvoid.push(a)})});u(c.series,function(a){function b(a,b,c){return a>l&&a<=l+w-c.width&&b>=r&&b<=r+t-c.height}if(a.xAxis||a.yAxis){var d,e,f,m=[],h,q,n=a.options.label,p=c.inverted,l=p?a.yAxis.pos:a.xAxis.pos,r=p?a.xAxis.pos:a.yAxis.pos,w=c.inverted?a.yAxis.len:a.xAxis.len,t=c.inverted?a.xAxis.len:a.yAxis.len,g=a.interpolatedPoints, f<e&&(e=f,m=l[g]);f=!0}}return!k||f?{x:c,y:b,weight:d-(m?e:0),connectorPoint:m}:!1};B.prototype.drawSeriesLabels=function(){var c=this,b=this.labelSeries;c.boxesToAvoid=[];b.forEach(function(a){a.interpolatedPoints=a.getPointsOnGraph();(a.options.label.boxesToAvoid||[]).forEach(function(a){c.boxesToAvoid.push(a)})});c.series.forEach(function(a){function b(a,b,c){return a>l&&a<=l+v-c.width&&b>=r&&b<=r+t-c.height}if(a.xAxis||a.yAxis){var d,e,f,m=[],h,q,n=a.options.label,p=c.inverted,l=p?a.yAxis.pos:
u=x(n.onArea,!!a.area),p=a.labelBySeries;d=n.minFontSize;e=n.maxFontSize;if(a.visible&&!a.isSeriesBoosting&&g){p||(a.labelBySeries=p=c.renderer.label(a.name,0,-9999,"connector").css(B({color:u?c.renderer.getContrast(a.color):a.color},a.options.label.style)),d&&e&&p.css({fontSize:a.labelFontSize(d,e)}),p.attr({padding:0,opacity:c.renderer.forExport?1:0,stroke:a.color,"stroke-width":1,zIndex:3}).add().animate({opacity:1},{duration:200}));d=p.getBBox();d.width=Math.round(d.width);for(q=g.length-1;0< a.xAxis.pos,r=p?a.xAxis.pos:a.yAxis.pos,v=c.inverted?a.yAxis.len:a.xAxis.len,t=c.inverted?a.xAxis.len:a.yAxis.len,g=a.interpolatedPoints,w=x(n.onArea,!!a.area),p=a.labelBySeries;d=n.minFontSize;e=n.maxFontSize;if(a.visible&&!a.isSeriesBoosting&&g){p||(a.labelBySeries=p=c.renderer.label(a.name,0,-9999,"connector").css(A({color:w?c.renderer.getContrast(a.color):a.color},a.options.label.style)),d&&e&&p.css({fontSize:a.labelFontSize(d,e)}),p.attr({padding:0,opacity:c.renderer.forExport?1:0,stroke:a.color,
q;--q)u?(e=g[q].chartX-d.width/2,f=g[q].chartCenterY-d.height/2):(e=g[q].chartX+3,f=g[q].chartY-d.height-3,b(e,f,d)&&(h=a.checkClearPoint(e,f,d)),h&&m.push(h),e=g[q].chartX+3,f=g[q].chartY+3,b(e,f,d)&&(h=a.checkClearPoint(e,f,d)),h&&m.push(h),e=g[q].chartX-d.width-3,f=g[q].chartY+3,b(e,f,d)&&(h=a.checkClearPoint(e,f,d)),h&&m.push(h),e=g[q].chartX-d.width-3,f=g[q].chartY-d.height-3),b(e,f,d)&&(h=a.checkClearPoint(e,f,d)),h&&m.push(h);if(n.connectorAllowed&&!m.length&&!u)for(e=l+w-d.width;e>=l;e-=16)for(f= "stroke-width":1,zIndex:3}).add().animate({opacity:1},{duration:200}));d=p.getBBox();d.width=Math.round(d.width);for(q=g.length-1;0<q;--q)w?(e=g[q].chartX-d.width/2,f=g[q].chartCenterY-d.height/2):(e=g[q].chartX+3,f=g[q].chartY-d.height-3,b(e,f,d)&&(h=a.checkClearPoint(e,f,d)),h&&m.push(h),e=g[q].chartX+3,f=g[q].chartY+3,b(e,f,d)&&(h=a.checkClearPoint(e,f,d)),h&&m.push(h),e=g[q].chartX-d.width-3,f=g[q].chartY+3,b(e,f,d)&&(h=a.checkClearPoint(e,f,d)),h&&m.push(h),e=g[q].chartX-d.width-3,f=g[q].chartY-
r;f<r+t-d.height;f+=16)(h=a.checkClearPoint(e,f,d,!0))&&m.push(h);if(m.length){if(m.sort(function(a,b){return b.weight-a.weight}),h=m[0],c.boxesToAvoid.push({left:h.x,right:h.x+d.width,top:h.y,bottom:h.y+d.height}),m=Math.sqrt(Math.pow(Math.abs(h.x-p.x),2),Math.pow(Math.abs(h.y-p.y),2)))n={opacity:c.renderer.forExport?1:0,x:h.x,y:h.y},g={opacity:1},10>=m&&(g={x:n.x,y:n.y},n={}),a.labelBySeries.attr(B(n,{anchorX:h.connectorPoint&&h.connectorPoint.plotX+l,anchorY:h.connectorPoint&&h.connectorPoint.plotY+ d.height-3),b(e,f,d)&&(h=a.checkClearPoint(e,f,d)),h&&m.push(h);if(n.connectorAllowed&&!m.length&&!w)for(e=l+v-d.width;e>=l;e-=16)for(f=r;f<r+t-d.height;f+=16)(h=a.checkClearPoint(e,f,d,!0))&&m.push(h);if(m.length){if(m.sort(function(a,b){return b.weight-a.weight}),h=m[0],c.boxesToAvoid.push({left:h.x,right:h.x+d.width,top:h.y,bottom:h.y+d.height}),m=Math.sqrt(Math.pow(Math.abs(h.x-p.x),2),Math.pow(Math.abs(h.y-p.y),2)))n={opacity:c.renderer.forExport?1:0,x:h.x,y:h.y},g={opacity:1},10>=m&&(g={x:n.x,
r})).animate(g),a.options.kdNow=!0,a.buildKDTree(),a=a.searchPoint({chartX:h.x,chartY:h.y},!0),p.closest=[a,h.x-a.plotX,h.y-a.plotY]}else p&&(a.labelBySeries=p.destroy())}}})};D(C,"render",function(){var c=this,b=Math.max(n.animObject(c.renderer.globalAnimation).duration,250),a=!c.hasRendered;c.labelSeries=[];c.labelSeriesMaxSum=0;n.clearTimeout(c.seriesLabelTimer);u(c.series,function(k){var d=k.options.label,e=k.labelBySeries,f=e&&e.closest;d.enabled&&k.visible&&(k.graph||k.area)&&!k.isSeriesBoosting&& y:n.y},n={}),a.labelBySeries.attr(A(n,{anchorX:h.connectorPoint&&h.connectorPoint.plotX+l,anchorY:h.connectorPoint&&h.connectorPoint.plotY+r})).animate(g),a.options.kdNow=!0,a.buildKDTree(),a=a.searchPoint({chartX:h.x,chartY:h.y},!0),p.closest=[a,h.x-a.plotX,h.y-a.plotY]}else p&&(a.labelBySeries=p.destroy())}else p&&(a.labelBySeries=p.destroy())}})};C(B,"render",function(){var c=this,b=Math.max(n.animObject(c.renderer.globalAnimation).duration,250),a=!c.hasRendered;c.labelSeries=[];c.labelSeriesMaxSum=
(c.labelSeries.push(k),d.minFontSize&&d.maxFontSize&&(k.sum=n.reduce(k.yData,function(a,b){return(a||0)+(b||0)},0),c.labelSeriesMaxSum=Math.max(c.labelSeriesMaxSum,k.sum)),a&&(b=Math.max(b,n.animObject(k.options.animation).duration)),f&&(void 0!==f[0].plotX?e.animate({x:f[0].plotX+f[1],y:f[0].plotY+f[2]}):e.attr({opacity:0})))});c.seriesLabelTimer=n.syncTimeout(function(){c.series&&c.labelSeries&&c.drawSeriesLabels()},c.renderer.forExport?0:b)})})(r)}); 0;n.clearTimeout(c.seriesLabelTimer);c.series.forEach(function(k){var d=k.options.label,e=k.labelBySeries,f=e&&e.closest;d.enabled&&k.visible&&(k.graph||k.area)&&!k.isSeriesBoosting&&(c.labelSeries.push(k),d.minFontSize&&d.maxFontSize&&(k.sum=k.yData.reduce(function(a,b){return(a||0)+(b||0)},0),c.labelSeriesMaxSum=Math.max(c.labelSeriesMaxSum,k.sum)),a&&(b=Math.max(b,n.animObject(k.options.animation).duration)),f&&(void 0!==f[0].plotX?e.animate({x:f[0].plotX+f[1],y:f[0].plotY+f[2]}):e.attr({opacity:0})))});
c.seriesLabelTimer=n.syncTimeout(function(){c.series&&c.labelSeries&&c.drawSeriesLabels()},c.renderer.forExport?0:b)})})(r)});
//# sourceMappingURL=series-label.js.map

1
src/main/webapp/static/global/plugins/tableExport-3.3.13/tableexport.js
View File

@@ -247,6 +247,7 @@
if ($(val).is(emptyCSS)) { if ($(val).is(emptyCSS)) {
return " " return " "
} }
titleText=$cols.is("th")?"\t"+titleText:titleText;
return '"' + TableExport.prototype.formatValue(isTrimWhitespace, titleText.replace(/"/g, '""')) + '"'; return '"' + TableExport.prototype.formatValue(isTrimWhitespace, titleText.replace(/"/g, '""')) + '"';
}).get().join(colD); }).get().join(colD);
}).get().join(rdel), }).get().join(rdel),

2
src/main/webapp/static/pages/css/data_text.css
View File

@@ -4,7 +4,7 @@
/*overflow-x: hidden;*/ /*overflow-x: hidden;*/
/* min-width: 1366px; */ /* min-width: 1366px; */
/* background-color: #303030; */ /* background-color: #303030; */
padding-top: 15px; padding-top: 18px;
/* padding-bottom: 10px; */ /* padding-bottom: 10px; */
background: url("../img/dashboard-back.jpg")no-repeat; background: url("../img/dashboard-back.jpg")no-repeat;
width:100%; width:100%;

2
src/main/webapp/static/pages/scripts/importExcel.js
View File

@@ -20,7 +20,7 @@ $(function(){
if($(".requestIdSel").hasClass("hidden")){ if($(".requestIdSel").hasClass("hidden")){
$(".attributeSel").addClass("hidden"); $(".attributeSel").addClass("hidden");
$(".classifySel").addClass("hidden"); $(".classifySel").addClass("hidden");
$("select[name='requestId']").empty();
if($(".appSelDiv").length == 0){ if($(".appSelDiv").length == 0){
// 新增文件div上移 // 新增文件div上移
var fileDiv = $(".fileSelDiv").clone(); var fileDiv = $(".fileSelDiv").clone();