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

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

Browse Source 
develop

Conflicts:
	src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
This commit is contained in:
DuanDongmei
2018-12-05 09:41:05 +08:00
parent c02af9efb2 ebbf999cf7
commit 53555aa73a
70 changed files with 575 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/nis/domain/dashboard/TrafficIpActiveStatistic.java
View File

@@ -9,15 +9,15 @@ public class TrafficIpActiveStatistic{
@ExcelField(title="Area",sort=20)
String areaId;
@ExcelField(title="Number",sort=30)
Integer linkNum;
Long linkNum;
@ExcelField(title="C2S(Pkt)",sort=40)
Integer c2sPktNum;
Long c2sPktNum;
@ExcelField(title="S2C(Pkt)",sort=50)
Integer s2cPktNum;
Long s2cPktNum;
@ExcelField(title="C2S(Byte)",sort=60)
Integer c2sByteLen;
Long c2sByteLen;
@ExcelField(title="S2C(Byte)",sort=70)
Integer s2cByteLen;
Long s2cByteLen;
@ExcelField(title="Time",sort=80)
String statTime;
@@ -48,34 +48,34 @@ public class TrafficIpActiveStatistic{
public void setAreaId(String areaId) {
this.areaId = areaId;
}
public Integer getLinkNum() {
public Long getLinkNum() {
return linkNum;
}
public void setLinkNum(Integer linkNum) {
public void setLinkNum(Long linkNum) {
this.linkNum = linkNum;
}
public Integer getC2sPktNum() {
public Long getC2sPktNum() {
return c2sPktNum;
}
public void setC2sPktNum(Integer c2sPktNum) {
public void setC2sPktNum(Long c2sPktNum) {
this.c2sPktNum = c2sPktNum;
}
public Integer getS2cPktNum() {
public Long getS2cPktNum() {
return s2cPktNum;
}
public void setS2cPktNum(Integer s2cPktNum) {
public void setS2cPktNum(Long s2cPktNum) {
this.s2cPktNum = s2cPktNum;
}
public Integer getC2sByteLen() {
public Long getC2sByteLen() {
return c2sByteLen;
}
public void setC2sByteLen(Integer c2sByteLen) {
public void setC2sByteLen(Long c2sByteLen) {
this.c2sByteLen = c2sByteLen;
}
public Integer getS2cByteLen() {
public Long getS2cByteLen() {
return s2cByteLen;
}
public void setS2cByteLen(Integer s2cByteLen) {
public void setS2cByteLen(Long s2cByteLen) {
this.s2cByteLen = s2cByteLen;
}

2
src/main/java/com/nis/util/ConfigServiceUtil.java
View File

@@ -717,6 +717,7 @@ public class ConfigServiceUtil {
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
}
} catch (Exception e) {
e.printStackTrace();
throw e;
}finally {
if (response != null) {
@@ -781,6 +782,7 @@ public class ConfigServiceUtil {
//创建连接
WebTarget wt = ClientUtil.getWebTarger(url);
logger.info("sync_send url:"+url);
logger.info("Last-Completed-Tag:"+completeTag);
//获取响应结果
Builder header = wt.request(MediaType.APPLICATION_JSON)
.header("Content-Type", MediaType.APPLICATION_JSON)

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

@@ -697,6 +697,7 @@ public final class Constants {
public static final String TRAFFIC_IPACTIVE_FIVEMINUTE=Configurations.getStringProperty("trafficIpActiveFiveMinute","trafficIpActiveFiveMinute");
public static final String TRAFFIC_IPACTIVE_ONEHOUR=Configurations.getStringProperty("trafficIpActiveOneHour","trafficIpActiveOneHour");
public static final String NTC_RADIUS_REPORT=Configurations.getStringProperty("ntcRadiusReport","ntcRadiusReport");
public static final String TRAFFIC_BANDWIDTH_TRANS=Configurations.getStringProperty("trafficBandwidthTrans","trafficBandwidthTrans");
/**
* httpclient 工具超时时间设置

7
src/main/java/com/nis/web/controller/configuration/maintenance/IpAddrPoolController.java
View File

@@ -1,6 +1,5 @@
package com.nis.web.controller.configuration.maintenance;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -9,9 +8,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.eclipse.jetty.util.ajax.JSON;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -21,12 +18,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.IpReuseIpCfg;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.IpAddrPoolCfg;
import com.nis.domain.configuration.IpMultiplexPoolCfg;
import com.nis.domain.configuration.UserManage;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.ConfigServiceUtil;
import com.nis.util.Constants;

44
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -24,9 +24,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
@@ -34,7 +32,6 @@ import com.nis.domain.SysDataDictionaryItem;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.BaseIpCfg;
import com.nis.domain.configuration.IpAddrPoolCfg;
import com.nis.domain.configuration.IpMultiplexPoolCfg;
import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.IpReusePolicyCfg;
import com.nis.domain.configuration.UserManage;
@@ -167,23 +164,9 @@ public class IpMultiplexController extends CommonController {
// 获取用户信息 地址池信息
List<UserManage> users = userManageService.findUsers();
List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
List<IpAddrPoolCfg> addrPoolsNew=new ArrayList<>();
for (IpAddrPoolCfg addrPool : addrPools) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("addr_pool_id", addrPool.getCfgId());
String url =Constants.IP_REUSE_CALL_CGI_URL ;
Map<String, Object> resultMap=ConfigServiceUtil.getCGIInfo(url, Constants.IP_NUM_GET, params);
if(!StringUtil.isEmpty(resultMap)
&& !StringUtil.isEmpty(resultMap.get("num"))
&& Integer.parseInt(resultMap.get("num").toString()) > 0) {
addrPoolsNew.add(addrPool);
}
}
model.addAttribute("_cfg", cfg);
model.addAttribute("users", users);
model.addAttribute("addrPools", addrPoolsNew);
model.addAttribute("urlPrefix","/manipulation/ipmulitiplex");
return "/cfg/manipulation/ipmulitiplex/snatPolicyForm2";
}
@@ -250,6 +233,31 @@ public class IpMultiplexController extends CommonController {
return "redirect:" + adminPath +"/manipulation/ipmulitiplex/snatPolicyList?functionId="+functionId;
}
/**
* 异步获取地址池信息
* @param request
* @param response
* @return
*/
@ResponseBody
@RequestMapping(value = {"/ajaxGetAddrPools"})
public List<IpAddrPoolCfg> ajaxGetAddrPools(HttpServletRequest request, HttpServletResponse response){
List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
List<IpAddrPoolCfg> addrPoolsNew=new ArrayList<>();
for (IpAddrPoolCfg addrPool : addrPools) {
Map<String, Object> params = new HashMap<String, Object>();
params.put("addr_pool_id", addrPool.getCfgId());
String url =Constants.IP_REUSE_CALL_CGI_URL ;
Map<String, Object> resultMap=ConfigServiceUtil.getCGIInfo(url, Constants.IP_NUM_GET, params);
if(!StringUtil.isEmpty(resultMap)
&& !StringUtil.isEmpty(resultMap.get("num"))
&& Integer.parseInt(resultMap.get("num").toString()) > 0) {
addrPoolsNew.add(addrPool);
}
}
return addrPoolsNew;
}
@RequestMapping(value = {"/dnatPolicyList"})
public String dnatPolicyList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response);

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

@@ -171,7 +171,6 @@ public class DashboardController extends BaseController{
addMessage(redirectAttributes,"request_service_failed");
}
model.addAttribute("ipActiveList", ipActiveList);
return "/dashboard/trafficIpActiveList";
}
@@ -661,29 +660,13 @@ public class DashboardController extends BaseController{
ip.setId(i);
ip.setIpAddr(3+i+".1.1."+i);
ip.setAreaId("11");
ip.setLinkNum(1212);
ip.setLinkNum(1212l);
list.add(ip);
}
page.setList(list);
model.addAttribute("page", page);
return "/dashboard/trafficWebTypeList";
}
@RequestMapping(value="bandwidthList")
public String bandwidthList( HttpServletRequest request, HttpServletResponse response, Model model){
PageLog<TrafficIpActiveStatistic> page = new PageLog<TrafficIpActiveStatistic>(request, response);
List list = new ArrayList();
for (int i = 1; i < 10; i++) {
TrafficIpActiveStatistic ip = new TrafficIpActiveStatistic();
ip.setId(i);
ip.setIpAddr(3+i+".1.1."+i);
ip.setAreaId("11");
ip.setLinkNum(1212);
list.add(ip);
}
page.setList(list);
model.addAttribute("page", page);
return "/dashboard/trafficBandwidthList";
}
////////////////////////////////////////test
@RequestMapping(value="showChart")

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

@@ -6,15 +6,23 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.beust.jcommander.internal.Maps;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.nis.domain.PageLog;
import com.nis.domain.dashboard.TrafficIpActiveStatistic;
import com.nis.util.Constants;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
@@ -97,5 +105,52 @@ public class TrafficStatisticsInfoController extends BaseController {
}
return m;
}
/**
* 根据ip46,协议tcp,udp查询带宽 间隔5分钟数据
*/
@RequestMapping(value="bandwidthTrans")
@ResponseBody
public Map ipActiveMinuteList(@RequestParam("addrType")String addrType,@RequestParam("transType")Integer transType){
Map<String, Object> fromJsonList = new HashMap<String, Object>();
Map map = new HashMap();
String url = Constants.DASHBOARD_URL+Constants.TRAFFIC_BANDWIDTH_TRANS;
if(!StringUtil.isBlank(addrType)){
url=url+"?addrType="+addrType;
}
if(transType!=null){
url=url+"?transType="+transType;
}
try {
String string = HttpClientUtil.get(url);
Gson gson = new GsonBuilder().create();
fromJsonList = gson.fromJson(string, new TypeToken<Map>(){}.getType());
logger.info("带宽1小时,间隔5分钟数据"+fromJsonList);
List list = (ArrayList) fromJsonList.get("data");
if(!StringUtil.isEmpty(list)){
map=(Map) list.get(0);
}
return map;
} catch (Exception e) {
e.printStackTrace();
logger.error("带宽详情数据获取错误"+e);
}
return map;
}
@RequestMapping(value="bandwidthList")
public String bandwidthList( HttpServletRequest request, HttpServletResponse response, Model model){
PageLog<TrafficIpActiveStatistic> page = new PageLog<TrafficIpActiveStatistic>(request, response);
List list = new ArrayList();
for (int i = 1; i < 10; i++) {
TrafficIpActiveStatistic ip = new TrafficIpActiveStatistic();
ip.setId(i);
ip.setIpAddr(3+i+".1.1."+i);
ip.setAreaId("11");
ip.setLinkNum(1212l);
list.add(ip);
}
page.setList(list);
model.addAttribute("page", page);
return "/dashboard/trafficBandwidthList";
}
}

2
src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java
View File

@@ -36,7 +36,7 @@ public class NtcDestIpReportController extends BaseController {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

2
src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java
View File

@@ -35,7 +35,7 @@ public class NtcEntranceReportController extends BaseController {
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

4
src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java
View File

@@ -34,10 +34,10 @@ public class NtcLwhhReportController extends BaseController {
@RequestMapping("/ajaxNtcLwhhReport")
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
List<RequestInfo> requestInfos=requestInfoService.getAllLwhhRequestInfo();
List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
model.addAttribute("requestInfos", requestInfos);
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

2
src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java
View File

@@ -35,7 +35,7 @@ public class NtcSrcipDomesticReportController extends BaseController {
public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

2
src/main/java/com/nis/web/controller/report/NtcTagReportController.java
View File

@@ -37,7 +37,7 @@ public class NtcTagReportController extends BaseController {
List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
model.addAttribute("labels", labels);
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

2
src/main/java/com/nis/web/controller/report/NtcXzReportController.java
View File

@@ -38,7 +38,7 @@ public class NtcXzReportController extends BaseController {
List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
model.addAttribute("xzs", xzs);
if(bean.getServiceId()!=null){
bean.setServices(bean.getServiceId().toString());
bean.setSearchService(bean.getServiceId().toString());
}else{
StringBuffer serviceId=new StringBuffer();
for(int i=0;i<serviceList.size();i++){

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

@@ -24,6 +24,7 @@ import com.nis.domain.configuration.AppStringCfg;
import com.nis.domain.configuration.AppTcpCfg;
import com.nis.domain.configuration.AppTopicDomainCfg;
import com.nis.domain.configuration.AvFileSampleCfg;
import com.nis.domain.configuration.AvSignSampleCfg;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.BaseStringCfg;
import com.nis.domain.configuration.CfgIndexInfo;
@@ -78,6 +79,7 @@ public interface ConfigSynchronizationDao {
public List<FileDigestCfg> getFileDigestListByService(BaseCfg entity);
public List<AvFileSampleCfg> getAvFileCfgList(BaseCfg entity);
public List<AvSignSampleCfg> getAvSignCfgList(BaseCfg entity);
public List<PxyObjKeyring> getPxyObjKeyringCfgList(BaseCfg entity);
public List<PxyObjTrustedCaCert> getPxyObjTrustedCertCfgList(BaseCfg entity);
public List<PxyObjTrustedCaCrl> getPxyObjTrustedCrlCfgList(BaseCfg entity);

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

@@ -1216,11 +1216,26 @@
</trim>
ORDER BY a.CFG_ID
</select>
<select id="getAvSignSampleById" resultMap="AvSignSampleMap" parameterType="java.lang.Long" >
<select id="getAvSignCfgList" resultMap="AvSignSampleMap" parameterType="com.nis.domain.configuration.BaseCfg" >
SELECT
<include refid="AvSignSample_Column" />
FROM av_sign_sample_cfg a
WHERE a.CFG_ID = #{cfgId,jdbcType=BIGINT}
left join sys_user s on a.creator_id=s.id
left join sys_user u on a.auditor_id=u.id
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="serviceId != null">
AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
</if>
<if test="functionId != null">
AND a.function_id=#{functionId,jdbcType=INTEGER}
</if>
<if test="action != null">
AND a.action=#{action,jdbcType=INTEGER}
</if>
and a.is_valid=#{isValid} and a.is_audit=#{isAudit}
and a.is_valid!=-1
</trim>
ORDER BY a.CFG_ID
</select>
<select id="getDnsStrategyList" resultMap="DnsResStrategyMap">
SELECT

6
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -136,12 +136,12 @@ public class ConfigSynchronizationService extends BaseService{
handleCallbackData(className,page,entity,request,response,false);
}
if(!isFinished && lastServiceTag){//如果业务没有配置数据，并且为最后一个业务，需要发送给服务接口一个结束标识
String json = "";
if("1".equals(serviceType)){
String json = "{}";
/*if("1".equals(serviceType)){
json="{}";
}else{
json="[]";
}
}*/
JSONObject result = ConfigServiceUtil.configSync(json,Integer.parseInt(serviceType),entity.getServiceId(),entity.getTableName(),"FINISHED");
}
}

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

@@ -964,12 +964,12 @@ encrypted_tunnel_behavior_ratelimit=Behavior Identify Rate Limit
encrypted_tunnel_behavior_monit=Behavior Identify Monitor
encrypted_tunnel_behavior_drop=Behavior Identify Drop
ip_protocol=IP Protocol
MM_AV_IP=AV IP
MM_PIC_IP=Picture IP
MM_PIC_URL=Picture URL
MM_AV_URL=AV URL
INLINE_IP_CB=IP Drop
MM_VOIP_IP=VoIP IP
MM_AV_IP=IP
MM_PIC_IP=IP
MM_PIC_URL=URL
MM_AV_URL=URL
INLINE_IP_CB=IP
MM_VOIP_IP=IP
MM_VOIP_ACCOUNT=VoIP Account
drop_ip=IP Drop
loop_ip=IP Loop
@@ -1336,4 +1336,5 @@ address_pool_is_used=Address pool is used and cannot perform this operation!
cgi_service_failed=Request CGI server failed
available_ip=Available IP
config_sync=Configuration Synchronization
info_failed=Information Acquisition Failure
info_failed=Information Acquisition Failure
address_pool_ip_configuration=Address Pool IP Configuration

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

@@ -1334,4 +1334,5 @@ address_pool_id=Address Pool ID
log_to_cfg=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
address_pool_is_used=Address pool is used and cannot perform this operation!
available_ip=Available IP
config_sync=Configuration Synchronization
config_sync=Configuration Synchronization
address_pool_ip_configuration=Address Pool IP Configuration

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

@@ -1334,4 +1334,5 @@ address_pool_is_used=\u5730\u5740\u6C60\u5DF2\u88AB\u4F7F\u7528\uFF0C\u65E0\u6CD
cgi_service_failed=\u8BF7\u6C42CGI\u670D\u52A1\u63A5\u53E3\u5931\u8D25
available_ip=\u53EF\u7528IP\u5730\u5740
config_sync=\u914D\u7F6E\u540C\u6B65
info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
info_failed=\u4FE1\u606F\u83B7\u53D6\u5931\u8D25
address_pool_ip_configuration=\u5730\u5740\u6C60 IP\u914D\u7F6E

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

@@ -567,4 +567,6 @@ userGet=UserGet
userList=UserList
ip_reuse_call_cgi_url=http://192.168.11.137:8090/command
ipNumGet=IpNumGet
allIpGet=AllIpGet
allIpGet=AllIpGet
#\u6D41\u91CF\u7EDF\u8BA1\u5E26\u5BBD\u8BE6\u60C5
trafficBandwidthTrans=trafficBandwidthTrans

15
src/main/resources/service/service_config.xml
View File

@@ -86,7 +86,7 @@
</service>
<service id="66" functionId="37" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址白名单">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
</service>
<!--<service id="132" functionId="34" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测">
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
@@ -98,12 +98,12 @@
</service>-->
<service id="132" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址监测">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
<service id="20" functionId="35" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="邮件地址封堵">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="3" tableName="mail_keyword_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service>
@@ -178,9 +178,9 @@
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<userRegion regionKey="keyring_id" regionColumn="userRegion1" userRegionPosition="0" ></userRegion>
</service>
<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
<!-- <service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP拦截白名单">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
</service>
</service> -->
<service id="513" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截监测">
<serviceCfg cfgType="2" tableName=" http_url_cfg" ></serviceCfg>
<userRegion regionKey="DOMAIN_ID" regionColumn="compileId" userRegionPosition="0"></userRegion>
@@ -188,7 +188,8 @@
<userRegion regionKey="keyring_id" regionColumn="userRegion1" userRegionPosition="0"></userRegion>
<userRegion regionKey="intensity" regionColumn="userRegion5" userRegionPosition="0"></userRegion>
</service>
<service id="521" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截白名单">
<service id="521" functionId="200" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP或域名拦截白名单">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="http_url_cfg" ></serviceCfg>
</service>
<service id="515" functionId="201" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="域名拦截限速">
@@ -373,6 +374,8 @@
<service id="65" functionId="400" serviceType="2" tableName="dns_res_strategy" className="DnsResStrategy" desc="DNS响应策略"/>
<service id="64" functionId="400" serviceType="2" tableName="dns_ip_cfg" className="DnsIpCfg" desc="DNS欺骗IP"/>
<service id="266" functionId="33" serviceType="2" tableName="av_sign_sample_cfg" className="AvSignSampleCfg" desc="色情场景封堵"></service>
<service id="394" functionId="33" serviceType="2" tableName="av_sign_sample_cfg" className="AvSignSampleCfg" desc="色情场景监测"></service>
<!-- 回调类配置结束-->
</serviceList>

7
src/main/resources/sql/20181203/add_sys_data_dictionary_name.sql Normal file
View File

@@ -0,0 +1,7 @@
#日志查询-串联设备链路号字典添加
INSERT INTO `sys_data_dictionary_name` (`id`, `module_name`, `mark`, `remark`, `revision`, `create_time`, `modify_time`, `status`) VALUES ('147', '串联设备链路号', 'LINK', '串联设备链路号', 'user:管理员,2018-12-03 18:39:24edit', '2018-12-03 16:13:24', '2018-12-03 18:39:24', '1');
#日志查询-出入口字典添加
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3168', '1', 'astana', 'astana', '0', '1', '1', '81');
INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3169', '2', 'almaty', 'almaty', '0', '1', '1', '81');

6
src/main/resources/sql/20181204/update_function_service_dict.sql Normal file
View File

@@ -0,0 +1,6 @@
-- ftp
UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 42 AND function_id = 51;
-- mail地址
UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 149 AND function_id = 37;
-- mail高级
UPDATE function_service_dict SET is_valid = 0 WHERE dict_id = 37 AND function_id = 35;

6
src/main/resources/sql/truncate_tables.sql
View File

@@ -59,4 +59,8 @@ DELETE FROM app_ip_range_cfg;
DELETE FROM app_string_feature_cfg;
DELETE FROM pxy_obj_trusted_ca_crl;
DELETE FROM pxy_obj_trusted_ca_cert;
UPDATE specific_service_cfg SET group_id=0;
UPDATE specific_service_cfg SET group_id=0;
DELETE FROM ip_reuse_addr_pool;
DELETE FROM ip_reuse_ip_cfg;
DELETE FROM ip_reuse_policy_cfg;
DELETE FROM user_manage;

282
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
View File

@@ -11,6 +11,7 @@ $(function(){
if($(".ipDiv").hasClass("hidden")){
$(".ipDiv").remove();
}
$(".addDiv").removeClass("hidden");
if('${fn:length(serviceList)}'>1){
$("#serviceId").val($(".action:checked").attr("serviceId"));
$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -39,23 +40,23 @@ $(function(){
ipInfoDiv.removeClass("ipDiv");
ipInfoDiv.removeClass("hidden");
ipInfoDiv.find("button").each(function(){
$(this).removeClass("addDivBut");
$(this).children("font").attr("color","#ed6b75").attr("class","fa fa-times");
});
setFirstIpDiv();
resetIndex();
});
var resetDiv = function(obj){
// 添加 or 删除
if($(obj).hasClass("addDivBut")){
if($(obj).hasClass("addDiv")){
$(".ipInfo").last().after(ipInfoDiv.clone());
}else{
$(obj).parents(".ipInfo:first").remove();
if($(".ipInfo").length == 1){
top.$.jBox.tip("<spring:message code='one_more'/>");
return;
}else{
$(obj).parents(".ipInfo:first").remove();
}
}
$(".selectpicker").selectpicker("render");// 重新渲染页面
$(".selectpicker").selectpicker("render");// 重新渲染
$("select[name$='ipType']").on("change",function(){
switchIpInfo(this);
});
@@ -65,15 +66,6 @@ var resetDiv = function(obj){
resetIndex();
}
// 设置第一个div +
var setFirstIpDiv = function(){
$(".ipInfo").not(".ipDiv").first().find("button").each(function(){
$(this).addClass("addDivBut");
$(this).children("font").attr("color","#27a4b0").attr("class","fa fa-plus");
});
}
var resetIndex = function(){
// 设置索引
$(".ipInfo").not(".hidden").each(function(index,element){
@@ -178,15 +170,27 @@ var resetIndex = function(){
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="desc"/>:</label>
<div class="col-md-6">
<form:textarea path="description" htmlEscape="false" rows="1" maxlength="128" class="form-control" />
<form:textarea path="description" htmlEscape="false" maxlength="128" class="form-control" />
</div>
</div>
</div>
</div>
<div class="row ipInfo ipDiv <c:if test="${!empty _cfg.ipCfgs}">hidden</c:if>">
<h5 class="page-header"></h5>
<h4 class="form-section">
<spring:message code="address_pool_ip_configuration" />
<small>
<span class="glyphicon glyphicon-plus addDiv"
onClick="resetDiv(this)" title="add"></span>
</small>
</h4>
<div class="row ipInfo boxSolid ipDiv <c:if test="${!empty _cfg.ipCfgs}">hidden</c:if>">
<input type="hidden" name="ipCfgs[0].protocolId" value="0">
<div class="row">
<div class="pull-right">
<span class="glyphicon glyphicon-remove pull-right" title="remove"
onClick="resetDiv(this);" />
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
@@ -203,86 +207,7 @@ var resetIndex = function(){
<div for="ipCfgs[0].ipType"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
<div class="col-md-6">
<div class="input-group">
<input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress">
<span class="input-group-btn">
<button class="btn btn-default addDivBut" onclick="resetDiv(this)" type="button"><font color="#27a4b0" class="fa fa-plus"></font></button>
</span>
</div>
</div>
<div for="ipCfgs[0].srcIpAddress"></div>
</div>
</div>
</div>
<div class="row port">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
<select name="ipCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}">
<spring:message code="${ipPatternC.itemValue}"/>
</option>
</c:forEach>
</select>
</div>
<div for="ipCfgs[0].ipPattern"></div>
</div>
</div>
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select name="ipCfgs[0].portPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}">
<spring:message code="${portPatternC.itemValue}"/>
</option>
</c:forEach>
</select>
</div>
<div for="ipCfgs[0].portPattern"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
<div class="col-md-6">
<input class="form-control required portCheck" type="text" name="ipCfgs[0].srcPort">
</div>
<div for="ipCfgs[0].srcPort"></div>
</div>
</div>
</div>
<div class="row destPort">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text" name="ipCfgs[0].destIpAddress">
</div>
<div for="ipCfgs[0].destIpAddress"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
<div class="col-md-6">
<input class="form-control required portCheck" type="text" name="ipCfgs[0].destPort">
</div>
<div for="ipCfgs[0].destPort"></div>
</div>
</div>
</div>
<div class="row hidden protocol">
<div class="col-md-6">
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="protocol" /></label>
@@ -298,7 +223,83 @@ var resetIndex = function(){
</div>
<div for="ipCfgs[0].protocol"></div>
</div>
</div>
</div>
</div>
<div class="row ip">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
<select name="ipCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
<option value="${ipPatternC.itemCode}">
<spring:message code="${ipPatternC.itemValue}"/>
</option>
</c:forEach>
</select>
</div>
<div for="ipCfgs[0].ipPattern"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress">
</div>
<div for="ipCfgs[0].srcIpAddress"></div>
</div>
</div>
</div>
<div class="row port">
<div class="col-md-6">
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select name="ipCfgs[0].portPattern" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
<option value="${portPatternC.itemCode}">
<spring:message code="${portPatternC.itemValue}"/>
</option>
</c:forEach>
</select>
</div>
<div for="ipCfgs[0].portPattern"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
<div class="col-md-6">
<input class="form-control required portCheck" type="text" name="ipCfgs[0].srcPort">
</div>
<div for="ipCfgs[0].srcPort"></div>
</div>
</div>
</div>
<div class="row destPort">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text" name="ipCfgs[0].destIpAddress">
</div>
<div for="ipCfgs[0].destIpAddress"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
<div class="col-md-6">
<input class="form-control required portCheck" type="text" name="ipCfgs[0].destPort">
</div>
<div for="ipCfgs[0].destPort"></div>
</div>
</div>
</div>
<div class="row protocol">
<div class="col-md-6">
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font>
@@ -320,9 +321,14 @@ var resetIndex = function(){
</div>
<c:forEach items="${_cfg.ipCfgs }" var="ipCfg" varStatus="index">
<div class="row ipInfo">
<h5 class="page-header"></h5>
<div class="row ipInfo boxSolid">
<input type="hidden" name="ipCfgs[0].protocolId" value="0">
<div class="row">
<div class="pull-right">
<span class="glyphicon glyphicon-remove pull-right" title="remove"
onClick="resetDiv(this);" />
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
@@ -343,22 +349,28 @@ var resetIndex = function(){
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
<div class="col-md-6">
<div class="input-group">
<input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress" value="${ipCfg.srcIpAddress }">
<span class="input-group-btn">
<button class="btn btn-default" onclick="resetDiv(this)" type="button"><font color="#ed6b75" class="fa fa-times"></font></button>
</span>
</div>
</div>
<div for="ipCfgs[0].srcIpAddress"></div>
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="protocol" /></label>
<div class="col-md-6">
<select name="ipCfgs[0].protocol"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}"
<c:if test="${ipCfg.protocol == protocolC.itemCode}">
selected
</c:if>>
<spring:message code="${protocolC.itemValue}"/>
</option>
</c:forEach>
</select>
</div>
<div for="ipCfgs[0].protocol"></div>
</div>
</div>
</div>
</div>
<div class="row port">
<div class="row ip">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
@@ -377,7 +389,19 @@ var resetIndex = function(){
<div for="ipCfgs[0].ipPattern"></div>
</div>
</div>
<div class="col-md-6 hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text" name="ipCfgs[0].srcIpAddress" value="${ipCfg.srcIpAddress }">
</div>
<div for="ipCfgs[0].srcIpAddress"></div>
</div>
</div>
</div>
<div class="row port">
<div class="col-md-6 hidden">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
@@ -407,7 +431,7 @@ var resetIndex = function(){
</div>
<div class="row destPort">
<div class="col-md-6">
<div class="form-group ">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
<div class="col-md-6">
<input class="form-control required ipCheck" type="text" name="ipCfgs[0].destIpAddress" value="${ipCfg.destIpAddress }">
@@ -416,7 +440,7 @@ var resetIndex = function(){
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
<div class="col-md-6">
<input class="form-control required portCheck" type="text" name="ipCfgs[0].destPort" value="${ipCfg.destPort }">
@@ -425,27 +449,7 @@ var resetIndex = function(){
</div>
</div>
</div>
<div class="row hidden protocol">
<div class="col-md-6">
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="protocol" /></label>
<div class="col-md-6">
<select name="ipCfgs[0].protocol"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
<option value="${protocolC.itemCode}"
<c:if test="${ipCfg.protocol == protocolC.itemCode}">
selected
</c:if>>
<spring:message code="${protocolC.itemValue}"/>
</option>
</c:forEach>
</select>
</div>
<div for="ipCfgs[0].protocol"></div>
</div>
</div>
<div class="row protocol">
<div class="col-md-6">
<div class="form-group hidden">
<label class="control-label col-md-3"><font color="red">*</font>

31
src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyForm2.jsp
View File

@@ -18,7 +18,29 @@ $(function(){
form.submit();
},
errorContainer: "#messageBox"
});
});
// 获取地址池信息
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.lastIndexOf("/nis")+4);
$.ajax({
type:'get',
url:pathName+'/manipulation/ipmulitiplex/ajaxGetAddrPools',
dataType:'json',
success:function(data){
if(data != null){
//$("#addrPoolSel").empty();
$.each(data, function(i, n){
if("${_cfg.addrPoolId}" == data[i].cfgId){
var option = new Option(data[i].addrPoolName, data[i].cfgId, null, true);
}else{
var option = new Option(data[i].addrPoolName, data[i].cfgId);
}
$("#addrPoolSel")[0].options.add(option);
});
$("#addrPoolSel").selectpicker("refresh");
}
}
});
});
</script>
</head>
@@ -157,12 +179,9 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="address_pool"/></label>
<div class="col-md-6">
<select name="addrPoolId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<select id="addrPoolSel" name="addrPoolId" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<option value="" ><spring:message code="select"/></option>
<c:forEach items="${addrPools }" var="addrPool">
<option value="${addrPool.cfgId}" <c:if test="${_cfg.addrPoolId eq addrPool.cfgId }">selected</c:if>><spring:message code="${addrPool.addrPoolName}"/></option>
</c:forEach>
</select>
</select>
</div>
<div for="addrPoolId"></div>
</div>

8
src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
View File

@@ -33,17 +33,16 @@
<div class="text_1">
<div class="fr_fc">
<div class="fl_visual">
<i class="fa fa-cloud-download"></i>
<a href="${ctx}/dashboard/traffic/bandwidthList"><i class="fa fa-cloud-download"></i></a>
</div>
<div class="fl_fc">
<%-- <a href="${ctx}/dashboard/bandwidthList"> 详情显示--%>
<p>
<label data-original-title="<spring:message code="bandwith"/>" class="tooltips" data-flag="false" data-html="true" data-placement="top">
<!-- 网络带宽 --><spring:message code="bandwith"/>
</label>
</p>
<p class="csNum">In <span class="c2sNum">0</span> | Out <span class="s2cNum">0</span> </p>
<span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span>
<a href="${ctx}/dashboard/traffic/bandwidthList"><p class="csNum">In <span class="c2sNum">0</span> | Out <span class="s2cNum">0</span> </p>
<span class="numberRun4">0</span > <span class="numberRun4-unit">bps</span></a>
</div>
</div>
<div class="fr_fc">
@@ -51,7 +50,6 @@
<i class="fa fa-ban"></i>
</div>
<div class="fl_fc">
<!-- <a href="javacript:;"> -->
<p style="margin-left: 0px;width:100%">
<label data-original-title="<spring:message code="action_reject"/>"
class="tooltips" data-flag="false" data-html="true" data-placement="top">

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

@@ -3,7 +3,7 @@
<html>
<head>
<title>
<spring:message code="traffic_ip_active"></spring:message>
<spring:message code="bandwith"></spring:message>
</title>
</head>
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/bandwidth.css">
@@ -13,35 +13,36 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/bandwidthList'"><spring:message code="refresh"/></button>
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/logChart'"><spring:message code="back"/></button>
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/traffic/bandwidthList'"><i class="fa fa-refresh"></i></button>
<button type="button" class="btn btn-default" onClick="javascript:window.location='${ctx}/dashboard/logChart'"><i class="fa fa-history"></i></button>
</div>
<h3 class="page-title">
<spring:message code="Bandwidth"></spring:message>
<spring:message code="bandwith"></spring:message>
</h3>
<h5 class="page-header"></h5>
<div class="row">
<div class="col-md-3" style="padding-right: 1px; ">
<div class="row">
<!-- <div class="col-md-3" style="padding-right: 1px; ">
<div class="panel panel-default">
<div class="panel-body" style="height: 500px;">
<h5 class="ng-binding">Bandwidth Data</h5>
<div id="deviceRank" class="drank hm-scroll">
<table>
<tbody>
<!-- ngRepeat: item in rankItems -->
ngRepeat: item in rankItems
<tr class="dtr active" onClick="rankItemChanged(id, name)" style="">
<td class="dtd1"><span class="ng-binding" style="">Total</span></td>
<td class="dtd2"><span class="tz" style="width: 100%; max-width: 100px;"></span></td>
<td class="dtd3"><span class="dy ng-binding1">234567891</span></td>
</tr>
<!-- end ngRepeat: item in rankItems -->
end ngRepeat: item in rankItems
<tr class="dtr" onClick="rankItemChanged(id, name)" style="">
<td class="dtd1"><span class="ng-binding">c2s</span></td>
<td class="dtd2"><span class="tz tz-from" style="width: 86.55%; max-width: 100px;"></span></td>
<td class="dtd3"><span class="dy ng-binding2">123456789</span></td>
</tr>
<!-- end ngRepeat: item in rankItems -->
end ngRepeat: item in rankItems
<tr class="dtr" onClick="rankItemChanged(id, name)" style="">
<td class="dtd1"><span class="ng-binding">s2c</span></td>
<td class="dtd2"><span class="tz tz-to" style="width: 5.59%; max-width: 100px;"></span></td>
@@ -51,31 +52,42 @@
</div>
</div>
</div>
</div>
</div> -->
<div class="col-md-9" style="padding-left: 8px;">
<div class="panel panel-default">
<div class="panel-body" style="height: 500px">
<h5 class="ng-binding">Bandwidth Trend</h5>
<div id="trend" style="height: 400px; position: relative;" >
<div class="col-md-12">
<select id="unitType" class="selectpicker select2 input-small">
<option value="Gbps">Gbps</option>
<option value="pps">pps</option>
<option value="linkNumber"><spring:message code="link_num"/>/S</option>
</select>
<br>
<div id="trend" style="height: 480px; position: relative;" >
<div style="position: relative;">
<div id="chart" style="width:96%;height:400px;"></div>
<div id="chart" style="width:97%;height:480px;"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<link rel="stylesheet" href="${pageContext.request.contextPath}/static/pages/css/bandwidth.css" type="text/css" />
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.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/offline-exporting.js"></script>
<script type="text/javascript">
$(document).ready(function(){
showBandwidthChart();
clickTrShowChart();
var unitType=$("#unitType").val();
changeBandwidth(unitType);
$("#unitType").on("change",function(){
changeBandwidth($("#unitType").val());
});
setInterval(function(){
changeBandwidth($("#unitType").val());
},500000);// 五分钟调用一次
});
function ajaxBandwidth(){
}
//点击列表显示统计图
function clickTrShowChart(response){
$("tbody .dtr").on("click",function(){
@@ -84,63 +96,109 @@ function clickTrShowChart(response){
showBandwidthChart();//
})
}
//点击列表显示统计图
function rankItemChanged(id,name){
// 默认显示四条线 ip46,tcp,udp
function rankItemChanged(addrType,transType){
loading();
var result=null;
$.ajax({
url:"${ctx}/#",
url:"${ctx}/dashboard/traffic/bandwidthTrans",
type:"get",
data:{"id":id},
data:{"addrType":addrType,"transType":transType},
dataType:"json",
async:true,
async:false,
timeout:10000,
success:function (data){
showBandwidthChart();
if(data!=null){
result=(data)
}
closeTip();
},
error: function(data, textStatus, errorThrown){
closeTip();
// warning_prompt("获取实时列表数据失败！",1500);
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
return result;
}
// 根据单位切换数据
function changeBandwidth(unitType){
var ipv4=rankItemChanged(4,null);
var ipv6=rankItemChanged(6,null);
var transTcp=rankItemChanged(null,6);
var transUdp=rankItemChanged(null,17);
var xdata=ipv4.statTime;
if(unitType=="Gbps"){
ipv4data=ipv4.gbps;
ipv6data=ipv6.gbps;
tcpdata=transTcp.gbps;
udpdata=transUdp.gbps;
}
if(unitType=="pps"){
ipv4data=ipv4.pps;
ipv6data=ipv6.pps;
tcpdata=transTcp.pps;
udpdata=transUdp.pps;
}
if(unitType=="linkNumber"){
ipv4data=ipv4.linkNum;
ipv6data=ipv6.linkNum;
tcpdata=transTcp.linkNum;
udpdata=transUdp.linkNum;
}
var series=new Array();
series.push({
name: "IPv4",
data: ipv4data
},{
name: "IPv6",
data: ipv6data
},{
name: "TCP",
data: tcpdata
},{
name: "UDP",
data: udpdata
});
showBandwidthChart(unitType,xdata,series);
}
/* 网络带宽时间维度趋势图 */
function showBandwidthChart(){
function showBandwidthChart(unitType,xdata,ydata){
var chart = Highcharts.chart('chart', {
title: {
text: null
},
navigation: {
buttonOptions: {
y: -15,
x: 5
}
},
exporting: {
filename:'Bandwidth',
scale:1,
sourceWidth: 1280,
sourceHeight: 550,
},
yAxis: {
title: {
text: 'bps'
text: unitType
}
},
legend: {
enabled:false
enabled:true
},
xAxis:{
type:'datetime',
dateTimeLabelFormats:{
day:'%Y-%m-%d %h'
}
categories: xdata,
},
plotOptions: {
series: {
pointStart: Date.UTC(2018, 8, 16,1),
pointInterval: 3600*1000,
// pointIntervalUnit:'day'
}
credits:{//是否有highcharts水印
enabled:false
},
series: [{
name: 'bps',
// type:'spline',
data: [43934, 32503, 57177, 69658, 97031, 69931, 87133, 54175]
}],
responsive: {
rules: [{
condition: {
maxWidth: 500
},
chartOptions: {
}
}]
}
series: ydata,
});

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

@@ -134,7 +134,7 @@ function showIpActiveChart(rs){
},
yAxis: {
title: {
text: 'linkNumber'
text: 'bytes'
}
},
credits:{//是否有highcharts水印
@@ -150,7 +150,7 @@ function showIpActiveChart(rs){
}
//活跃IP一小时间隔五分钟统计
function ipActiveMinuteList(){
loading();
$.ajax({
url: '${ctx}/dashboard/ipActiveMinuteList',
type : "get" ,
@@ -158,10 +158,13 @@ function showIpActiveChart(rs){
cache:false,async:true,
success:function (rs) {
showIpActiveChart(rs);
closeTip();
},
error: function(data, textStatus, errorThrown){
closeTip();
// warning_prompt("获取实时列表数据失败！",1500);
}
},
});
}

6
src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
View File

@@ -221,7 +221,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -266,8 +266,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

2
src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
View File

@@ -169,7 +169,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

6
src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
View File

@@ -210,7 +210,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -251,8 +251,8 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

2
src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp
View File

@@ -140,7 +140,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column pid"><spring:message code="pid"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
<th class="sort-column recv_time"><spring:message code="recv_time"/></th>

6
src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
View File

@@ -201,7 +201,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -248,8 +248,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
View File

@@ -218,7 +218,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -267,8 +267,8 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
View File

@@ -211,7 +211,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -252,8 +252,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
View File

@@ -245,7 +245,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><input type="checkbox" class="i-checks" id="checkAll"> <spring:message code="log_to_cfg"/></th>
<th><input type="checkbox" class="i-checks" id="checkAll"> <spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -288,8 +288,8 @@
<tr>
<td>
<input type="checkbox" class="i-checks child-checks" compileId="${log.cfgId }" url="${log.url}" value="${log.cfgId }">
<span id="open${status.index}" class="log-open-cfg" compileId2="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId2="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
View File

@@ -219,7 +219,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -268,8 +268,8 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

4
src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
View File

@@ -212,7 +212,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -248,7 +248,7 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span> --%>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>

2
src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
View File

@@ -156,7 +156,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

2
src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
View File

@@ -168,7 +168,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
View File

@@ -210,7 +210,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -254,7 +254,7 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span> --%>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>

2
src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
View File

@@ -168,7 +168,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

2
src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
View File

@@ -167,7 +167,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

6
src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
View File

@@ -209,7 +209,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -254,8 +254,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

2
src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
View File

@@ -167,7 +167,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

2
src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
View File

@@ -164,7 +164,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

2
src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
View File

@@ -167,7 +167,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

4
src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
View File

@@ -208,7 +208,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,7 +253,7 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span> --%>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
View File

@@ -267,7 +267,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -313,8 +313,8 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
View File

@@ -208,7 +208,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,8 +253,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
View File

@@ -208,7 +208,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,8 +253,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
View File

@@ -208,7 +208,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,8 +253,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
View File

@@ -208,7 +208,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -253,8 +253,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
View File

@@ -209,7 +209,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -254,8 +254,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
View File

@@ -208,7 +208,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -259,8 +259,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

2
src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
View File

@@ -167,7 +167,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

6
src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
View File

@@ -209,7 +209,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -262,8 +262,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

6
src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
View File

@@ -208,7 +208,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -247,8 +247,8 @@ $(document).ready(function(){
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

2
src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
View File

@@ -169,7 +169,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

6
src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
View File

@@ -210,7 +210,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -251,8 +251,8 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

2
src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
View File

@@ -166,7 +166,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

2
src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
View File

@@ -169,7 +169,7 @@ $(document).ready(function(){
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>

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

@@ -223,7 +223,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -265,7 +265,7 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span> --%>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>

6
src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
View File

@@ -196,7 +196,7 @@
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="log_to_cfg"/></th>
<th><spring:message code="log"/></th>
<th class="sort-column cfg_id " isVisible="false" ><spring:message code="cfg_id"/></th>
<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -249,8 +249,8 @@
<c:forEach var="log" items="${page.list }" varStatus="status">
<tr>
<td>
<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
<%-- <span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
--%> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td>
<td>${log.cfgId }</td>
<td>

8
src/main/webapp/WEB-INF/views/report/entranceId.jsp
View File

@@ -20,7 +20,13 @@ $(function(){
<c:forEach items="${datas}" var="data">
trContent += "<tr>";
<c:forEach items="${data.key}" var="entranceId" varStatus="status">
trContent += "<td>${entranceId}</td>";
trContent += "<td>";
<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
<c:if test="${dic.itemCode eq entranceId}">
trContent += "<spring:message code="${dic.itemValue}"/>";
</c:if>
</c:forEach>
trContent += "</td>";
</c:forEach>
<c:forEach items="${data.value}" var="cloumn" varStatus="status">
trContent += "<td>${cloumn}</td>";

2
src/main/webapp/static/global/css/components.css
View File

@@ -22614,7 +22614,7 @@ span[id^='close']{
background: #e7ecf1;
border:none
}
.form-section + .boxSolid {
.form-section ~ .boxSolid {
border: 1px solid #eeeeee;
margin-top:-14px;
margin-bottom:10px

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

@@ -42,6 +42,18 @@ p{
position: relative;
margin-top: 15px;
}
.data_content .data_info .fr_fc .fl_visual a:link {
color: #C5C5C5 !important;
}
.data_content .data_info .fr_fc .fl_visual a:visited {
color: #C5C5C5 !important;
}
.data_content .data_info .fr_fc .fl_visual a:hover {
color: #716D6D !important;
}
.data_content .data_info .fr_fc .fl_visual a:active {
color: #716D6D !important;
}
.data_content .data_info .fr_fc .fl_fc{
width: 70%;
height: 110px;

22
src/main/webapp/static/pages/scripts/echart.js
View File

@@ -152,7 +152,7 @@
series: [{
type: 'pie',
innerSize: '70%',//圆环的大小
name: 'count',
name: 'bytes',
data: data
}],
// drilldown:{
@@ -285,7 +285,7 @@
yAxis: {
min: 0,
title: {
text: 'Link Number',
text: 'bytes',
align:'high',
style: {//设置字体颜色
color: '#fff',
@@ -327,7 +327,7 @@
enabled:false
},
series: [{
name: 'Link Number',
name: 'bytes',
colorByPoint: true,
data: data
}],
@@ -447,7 +447,7 @@
yAxis: {
min: 0,
title: {
text: 'Link Number',
text: 'bytes',
align:'high',
style: {//设置字体颜色
color: '#fff',
@@ -473,7 +473,7 @@
},
plotOptions: {
column: {
dataLabels: {//数字显示
dataLabels: {// 柱形图上的数字显示
enabled: true,
allowOverlap: true, // 允许数据标签重叠
style: {//设置字体颜色
@@ -481,13 +481,15 @@
fontSize:'10px',
fontFamily:'Microsoft YaHei'
},
// format:"{point.y:.2f}",
},
showInLegend:false
},
},
series: [{
name: 'count',
name: 'bytes',
colorByPoint: true,
data: data
}],
@@ -629,7 +631,7 @@ function echart_2(rs){
useHTML: true
},
series: [{
name: 'count',
name: 'bytes',
colorByPoint: true,
data: data
}],
@@ -773,7 +775,7 @@ function echart_5(rs){
useHTML: true
},
series: [{
name: 'count',
name: 'bytes',
colorByPoint: true,
data: data
}],
@@ -911,7 +913,7 @@ function echart_4(rs){
useHTML: true
},
series: [{
name: 'count',
name: 'bytes',
colorByPoint: true,
data: data,
}],
@@ -1049,7 +1051,7 @@ function echart_6(rs){
useHTML: true
},
series: [{
name: 'count',
name: 'bytes',
colorByPoint: true,
data: data,
}],

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

@@ -1,6 +1,6 @@
$(document).ready(function() {
// 隱藏日誌詳情
$("table.logTb .icon-book-open").hide();
// $("table.logTb .icon-book-open").hide();
// 界面鼠标悬停事件
/* $("table.logTb").find("td").not(":has(a)").bind("mouseover", function(){
var str = $(this).html(this.innerHTML.trim()).text();