From ba63b9ca0ab0634f19382e23bd9e160507182bde Mon Sep 17 00:00:00 2001 From: dell Date: Mon, 8 Jan 2018 18:05:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A1=86=E6=9E=B6=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/ControlLog.java | 120 -- .../java/com/nis/domain/DfJitLogEntity.java | 179 --- .../java/com/nis/domain/DfReportEntity.java | 149 --- src/main/java/com/nis/domain/LogEntity.java | 841 ------------ .../java/com/nis/domain/StatLogEntity.java | 203 --- src/main/java/com/nis/domain/SysRole.java | 2 +- .../interceptor/DataSourceCInterceptor.java | 98 +- .../interceptor/DataSourceDInterceptor.java | 83 +- .../interceptor/DataSourceEInterceptor.java | 78 +- .../PropertyPlaceholderConfigurerCrypt.java | 4 +- .../elasticsearch/ElasticsearchSqlDao.java | 278 ---- .../java/com/nis/web/dao/ConfigCompileDao.xml | 338 ----- .../nis/web/dao/ConfigGroupRelationDao.xml | 114 -- .../java/com/nis/web/dao/ConfigPzIdDao.xml | 21 - .../java/com/nis/web/dao/ControlLogDao.java | 31 - .../com/nis/web/dao/DataDictionaryDao.xml | 112 -- .../java/com/nis/web/dao/DfDjLogStatDao.xml | 150 --- .../java/com/nis/web/dao/DfDjNestLogDao.xml | 43 - .../java/com/nis/web/dao/DfIpPortUdpDao.xml | 240 ---- .../com/nis/web/dao/DfJitLogSearchDao.xml | 692 ---------- .../com/nis/web/dao/DfKeyConvertUrlDao.xml | 44 - .../java/com/nis/web/dao/DfKeyMailAddDao.xml | 45 - .../java/com/nis/web/dao/DfLogSearchDao.xml | 1190 ----------------- .../com/nis/web/dao/DfLogSearchDaoCluster.xml | 1120 ---------------- .../web/dao/DfMultiDimensionalReportDao.xml | 230 ---- .../web/dao/DfMultiDimensionalStatLogDao.xml | 475 ------- src/main/java/com/nis/web/dao/DfReportDao.xml | 824 ------------ .../java/com/nis/web/dao/DfStatLogDao.xml | 857 ------------ .../com/nis/web/dao/DjJitLogSearchDao.xml | 776 ----------- .../java/com/nis/web/dao/DjLogSearchDao.xml | 1105 --------------- .../web/dao/DjMultiDimensionalReportDao.xml | 230 ---- .../web/dao/DjMultiDimensionalStatLogDao.xml | 475 ------- src/main/java/com/nis/web/dao/DjReportDao.xml | 617 --------- .../java/com/nis/web/dao/DjStatLogDao.xml | 858 ------------ src/main/java/com/nis/web/dao/DmbCkDao.xml | 119 -- src/main/java/com/nis/web/dao/DmbPortDao.xml | 176 --- .../java/com/nis/web/dao/DnsFakeInfoDao.xml | 182 --- .../java/com/nis/web/dao/DnsFakeIpDao.xml | 284 ---- .../java/com/nis/web/dao/DnsGroupTypeDao.xml | 141 -- .../nis/web/dao/DnsResponseStrategyDao.xml | 377 ------ .../com/nis/web/dao/EncryptProtoRandomDao.xml | 112 -- .../nis/web/dao/FakeIpConfigCompileDao.xml | 170 --- .../com/nis/web/dao/FakeIpConfigGroupDao.xml | 51 - src/main/java/com/nis/web/dao/FwqInfoDao.xml | 106 -- .../com/nis/web/dao/IntervalTimeSearchDao.xml | 44 - .../nis/web/dao/IpLocationPublicMapper.xml | 238 ---- src/main/java/com/nis/web/dao/IpRegionDao.xml | 221 --- src/main/java/com/nis/web/dao/JdjInfoDao.xml | 135 -- .../java/com/nis/web/dao/NumRegionDao.xml | 134 -- .../com/nis/web/dao/ServicesRequestLogDao.xml | 53 +- .../java/com/nis/web/dao/StrRegionDao.xml | 160 --- .../com/nis/web/dao/SystemFunStatusDao.xml | 53 - .../resources/applicationContext-mybatis.xml | 136 +- src/main/resources/jdbc.properties | 2 +- src/main/resources/spring-mvc.xml | 2 +- src/main/webapp/WEB-INF/views/home.jsp | 6 +- src/main/webapp/static/common/login.css | 2 +- .../webapp/static/images/bs_bannerleft.jpg | Bin 67971 -> 0 bytes src/test/java/com/nis/test/RestfulTest.java | 23 +- 59 files changed, 199 insertions(+), 15350 deletions(-) delete mode 100644 src/main/java/com/nis/domain/ControlLog.java delete mode 100644 src/main/java/com/nis/domain/DfJitLogEntity.java delete mode 100644 src/main/java/com/nis/domain/DfReportEntity.java delete mode 100644 src/main/java/com/nis/domain/LogEntity.java delete mode 100644 src/main/java/com/nis/domain/StatLogEntity.java delete mode 100644 src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java delete mode 100644 src/main/java/com/nis/web/dao/ConfigCompileDao.xml delete mode 100644 src/main/java/com/nis/web/dao/ConfigGroupRelationDao.xml delete mode 100644 src/main/java/com/nis/web/dao/ConfigPzIdDao.xml delete mode 100644 src/main/java/com/nis/web/dao/ControlLogDao.java delete mode 100644 src/main/java/com/nis/web/dao/DataDictionaryDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfDjLogStatDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfDjNestLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfIpPortUdpDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfJitLogSearchDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfKeyConvertUrlDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfKeyMailAddDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfLogSearchDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.xml delete mode 100644 src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfReportDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DfStatLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjJitLogSearchDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjLogSearchDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjReportDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DjStatLogDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DmbCkDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DmbPortDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DnsFakeInfoDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DnsFakeIpDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DnsGroupTypeDao.xml delete mode 100644 src/main/java/com/nis/web/dao/DnsResponseStrategyDao.xml delete mode 100644 src/main/java/com/nis/web/dao/EncryptProtoRandomDao.xml delete mode 100644 src/main/java/com/nis/web/dao/FakeIpConfigCompileDao.xml delete mode 100644 src/main/java/com/nis/web/dao/FakeIpConfigGroupDao.xml delete mode 100644 src/main/java/com/nis/web/dao/FwqInfoDao.xml delete mode 100644 src/main/java/com/nis/web/dao/IntervalTimeSearchDao.xml delete mode 100644 src/main/java/com/nis/web/dao/IpLocationPublicMapper.xml delete mode 100644 src/main/java/com/nis/web/dao/IpRegionDao.xml delete mode 100644 src/main/java/com/nis/web/dao/JdjInfoDao.xml delete mode 100644 src/main/java/com/nis/web/dao/NumRegionDao.xml delete mode 100644 src/main/java/com/nis/web/dao/StrRegionDao.xml delete mode 100644 src/main/java/com/nis/web/dao/SystemFunStatusDao.xml delete mode 100644 src/main/webapp/static/images/bs_bannerleft.jpg diff --git a/src/main/java/com/nis/domain/ControlLog.java b/src/main/java/com/nis/domain/ControlLog.java deleted file mode 100644 index b7c9ef6d7..000000000 --- a/src/main/java/com/nis/domain/ControlLog.java +++ /dev/null @@ -1,120 +0,0 @@ -/** -* @Title: ControlLog.java -* @Package com.nis.domain -* @Description: TODO(用一句话描述该文件做什么) -* @author （darnell） -* @date 2016年8月15日 下午4:11:12 -* @version V1.0 -*/ -package com.nis.domain; - -import java.util.Date; - -import com.wordnik.swagger.annotations.ApiModel; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: ControlLog -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (darnell) -* @date 2016年8月15日 下午4:11:12 -* @version V1.0 -*/ -@ApiModel -public class ControlLog extends BaseEntity { - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = 7644628891063420679L; - /** - */ - @ApiModelProperty(value="域名", required=true) - private String domain; - @ApiModelProperty(value="标题", required=true) - private String title; - @ApiModelProperty(value="源IP", required=true) - private String srcIp; - @ApiModelProperty(value="应答IP", required=true) - private String resIp; - @ApiModelProperty(value="状态", required=true) - private Integer status; - @ApiModelProperty(value="操作时间", required=true) - private Date optTime; - /** - * @return domain - */ - public String getDomain() { - return domain; - } - /** - * @param domain 要设置的 domain - */ - public void setDomain(String domain) { - this.domain = domain; - } - /** - * @return title - */ - public String getTitle() { - return title; - } - /** - * @param title 要设置的 title - */ - public void setTitle(String title) { - this.title = title; - } - /** - * @return srcIp - */ - public String getSrcIp() { - return srcIp; - } - /** - * @param srcIp 要设置的 srcIp - */ - public void setSrcIp(String srcIp) { - this.srcIp = srcIp; - } - /** - * @return resIp - */ - public String getResIp() { - return resIp; - } - /** - * @param resIp 要设置的 resIp - */ - public void setResIp(String resIp) { - this.resIp = resIp; - } - - /** - * @return status - */ - public Integer getStatus() { - return status; - } - /** - * @param status 要设置的 status - */ - public void setStatus(Integer status) { - this.status = status; - } - /** - * @return optTime - */ - public Date getOptTime() { - return optTime; - } - /** - * @param optTime 要设置的 optTime - */ - public void setOptTime(Date optTime) { - this.optTime = optTime; - } - - - - -} diff --git a/src/main/java/com/nis/domain/DfJitLogEntity.java b/src/main/java/com/nis/domain/DfJitLogEntity.java deleted file mode 100644 index 5d967c0af..000000000 --- a/src/main/java/com/nis/domain/DfJitLogEntity.java +++ /dev/null @@ -1,179 +0,0 @@ -/** -* @Title: LogEntity.java -* @Package com.nis.domain -* @Description: TODO(用一句话描述该文件做什么) -* @author （darnell） -* @date 2016年9月1日 上午10:16:54 -* @version V1.0 -*/ -package com.nis.domain; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; -import javax.xml.bind.annotation.XmlTransient; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.common.collect.Maps; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** - * - * @ClassName: DfJitLogEntity - * @Description: TODO(实时统计公共实体部分) - * @author (rkg) - * @date 2016年9月13日下午2:54:12 - * @version V1.0 - */ -public abstract class DfJitLogEntity implements Serializable { - - @ApiModelProperty(value = "id", required = true) - protected Long statId; - @ApiModelProperty(value = "统计时间", required = true) - protected Date reportTime; - @ApiModelProperty(value = "ip所属国家", required = false) - protected String nation; - @ApiModelProperty(value = "ip所属省", required = false) - protected String province; - @ApiModelProperty(value = "ip所属市", required = false) - protected String city; - @ApiModelProperty(value = "日志数量", required = true) - protected Long sum; - @ApiModelProperty(value = "业务类型", required = true) - protected Integer service; - - /** - * 公共查询部分 - */ - protected String searchReportStartTime; - protected String searchReportEndTime; - protected String searchService; - - /** - * 当前实体分页对象 - */ - protected Page page; - - /** - * 自定义SQL（SQL标识，SQL内容） - */ - protected Map sqlMap; - - public DfJitLogEntity() { - super(); - } - - public Long getStatId() { - return statId; - } - - public void setStatId(Long statId) { - this.statId = statId; - } - - @JsonSerialize(using = JsonDateSerializer.class) - public Date getReportTime() { - return reportTime; - } - - public void setReportTime(Date reportTime) { - this.reportTime = reportTime; - } - - public String getNation() { - return nation; - } - - public void setNation(String nation) { - this.nation = nation; - } - - public String getProvince() { - return province; - } - - public void setProvince(String province) { - this.province = province; - } - - public String getCity() { - return city; - } - - public void setCity(String city) { - this.city = city; - } - - - public Long getSum() { - return sum; - } - - public void setSum(Long sum) { - this.sum = sum; - } - - public Integer getService() { - return service; - } - - public void setService(Integer service) { - this.service = service; - } - - @JsonIgnore - public String getSearchReportStartTime() { - return searchReportStartTime; - } - - public void setSearchReportStartTime(String searchReportStartTime) { - this.searchReportStartTime = searchReportStartTime; - } - - @JsonIgnore - public String getSearchReportEndTime() { - return searchReportEndTime; - } - - public void setSearchReportEndTime(String searchReportEndTime) { - this.searchReportEndTime = searchReportEndTime; - } - - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - @XmlTransient - public Page getPage() { - if (page == null) { - page = new Page(); - } - return page; - } - - public void setPage(Page page) { - this.page = page; - } - - @JsonIgnore - @XmlTransient - public Map getSqlMap() { - if (sqlMap == null) { - sqlMap = Maps.newHashMap(); - } - return sqlMap; - } - - public void setSqlMap(Map sqlMap) { - this.sqlMap = sqlMap; - } - -} diff --git a/src/main/java/com/nis/domain/DfReportEntity.java b/src/main/java/com/nis/domain/DfReportEntity.java deleted file mode 100644 index 8d85bb904..000000000 --- a/src/main/java/com/nis/domain/DfReportEntity.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.nis.domain; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; - -import javax.xml.bind.annotation.XmlTransient; - -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.common.collect.Maps; -import com.nis.domain.Page; -import com.nis.util.Configurations; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -public class DfReportEntity implements Serializable { - - /** - * - */ - private static final long serialVersionUID = 2990823464993846973L; - @ApiModelProperty(value = "A系统", required = true) - protected Long asum; - @ApiModelProperty(value = "B系统", required = true) - protected Long bsum; - @ApiModelProperty(value = "C系统", required = true) - protected Long csum; - @ApiModelProperty(value = "统计时间", required = true) - protected Date reportTime; - - @ApiModelProperty(value = "全A+单B", required = true) - protected Long absum; - - public Long getAsum() { - return asum; - } - - public void setAsum(Long asum) { - this.asum = asum; - } - - public Long getBsum() { - return bsum; - } - - public void setBsum(Long bsum) { - this.bsum = bsum; - } - - @JsonSerialize(using = JsonDateSerializer.class) - public Date getReportTime() { - return reportTime; - } - - public void setReportTime(Date reportTime) { - this.reportTime = reportTime; - } - - protected String searchReportStartTime; - protected String searchReportEndTime; - - @JsonIgnore - public String getSearchReportStartTime() { - return searchReportStartTime; - } - - public void setSearchReportStartTime(String searchReportStartTime) { - this.searchReportStartTime = searchReportStartTime; - } - - @JsonIgnore - public String getSearchReportEndTime() { - return searchReportEndTime; - } - - public void setSearchReportEndTime(String searchReportEndTime) { - this.searchReportEndTime = searchReportEndTime; - } - - /** - * 当前实体分页对象 - */ - protected Page page; - - /** - * 自定义SQL（SQL标识，SQL内容） - */ - protected Map sqlMap; - - @JsonIgnore - @XmlTransient - public Page getPage() { - if (page == null) { - page = new Page(); - } - return page; - } - - public Page setPage(Page page) { - this.page = page; - return page; - } - - @JsonIgnore - @XmlTransient - public Map getSqlMap() { - if (sqlMap == null) { - sqlMap = Maps.newHashMap(); - } - return sqlMap; - } - - public void setSqlMap(Map sqlMap) { - this.sqlMap = sqlMap; - } - - /** - * 获取数据库名称 - */ - @JsonIgnore - public String getDbName() { - return Configurations.getStringProperty("jdbc.type", "mysql"); - } - - @Override - public String toString() { - return ReflectionToStringBuilder.toString(this); - } - - public Long getAbsum() { - return absum; - } - - public void setAbsum(Long absum) { - this.absum = absum; - } - - public Long getCsum() { - return csum; - } - - public void setCsum(Long csum) { - this.csum = csum; - } - -} diff --git a/src/main/java/com/nis/domain/LogEntity.java b/src/main/java/com/nis/domain/LogEntity.java deleted file mode 100644 index 0f5bab414..000000000 --- a/src/main/java/com/nis/domain/LogEntity.java +++ /dev/null @@ -1,841 +0,0 @@ -/** -* @Title: LogEntity.java -* @Package com.nis.domain -* @Description: TODO(用一句话描述该文件做什么) -* @author （darnell） -* @date 2016年9月1日 上午10:16:54 -* @version V1.0 -*/ -package com.nis.domain; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; - -import javax.xml.bind.annotation.XmlTransient; - -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.common.collect.Maps; -import com.nis.util.Configurations; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: LogEntity -* @Description: TODO(日志公共实体部分) -* @author (darnell) -* @date 2016年9月1日 上午10:16:54 -* @version V1.0 -*/ -public abstract class LogEntity implements Serializable { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = 1L; - - @ApiModelProperty(value="日志编号", required=true) - protected Long id; - - @ApiModelProperty(value="配置ID", required=true) - protected Long cfgId; - @ApiModelProperty(value="发现时间", required=true) - protected Date foundTime; - @ApiModelProperty(value="接收时间", required=true) - protected Date recvTime; - /*@ApiModelProperty(value="外层嵌套关联信息ID", required=true) - protected Long overId;*/ - @ApiModelProperty(value="外层嵌套关联信息ID", required=true) - protected String overId; - @ApiModelProperty(value="协议类型", required=true) - protected String protocol; - @ApiModelProperty(value="服务端ip地址", required=true) - protected String serverIp; - @ApiModelProperty(value="客户端ip地址", required=true) - protected String clientIp; - @ApiModelProperty(value="服务端端口", required=true) - protected Integer serverPort; - @ApiModelProperty(value="客户端端口", required=true) - protected Integer clientPort; - @ApiModelProperty(value="嵌套协议类型", required=true) - protected String nestProtocol; - @ApiModelProperty(value="嵌套服务端ip地址", required=true) - protected String nestServerIp; - @ApiModelProperty(value="嵌套客户端ip地址", required=true) - protected String nestClientIp; - @ApiModelProperty(value="嵌套服务端端口", required=true) - protected Integer nestServerPort; - @ApiModelProperty(value="嵌套客户端端口", required=true) - protected Integer nestClientPort; - @ApiModelProperty(value="业务类型", required=true) - protected Integer serviceType; - @ApiModelProperty(value="出入口编号", required=true) - protected Long entranceId; - @ApiModelProperty(value="处理机IP", required=true) - protected String cljIp; - @ApiModelProperty(value="封堵包记录文件", required=true) - protected String injectedPktFile; - - @ApiModelProperty(value="存放现场日志文件的URL地址", required=true) - protected String sceneFile; - @ApiModelProperty(value="管控动作", required=true) - protected Integer action; - @ApiModelProperty(value="服务端地址定位信息", required=true) - protected String serverLocate; - @ApiModelProperty(value="客户端地址定位信息", required=true) - protected String clientLocate; - - - protected Long foundTimeCluster; - protected Long recvTimeCluster; - - - - - protected String searchFoundStartTime; - protected String searchFoundEndTime; - protected Long searchFoundStartTimeCluster; - protected Long searchFoundEndTimeCluster; - protected String searchCfgId; - protected String searchProtocol; - protected String searchServiceType; - protected String searchServerIp; - protected String searchClientIp; - protected String searchEntranceId; - protected String searchCljIp; - protected String tableName;//神通数据库根据A/B版，动态切换表名 - - @JsonIgnore - public Long getFoundTimeCluster() { - return foundTimeCluster; - } - @JsonIgnore - public Long getRecvTimeCluster() { - return recvTimeCluster; - } - public void setFoundTimeCluster(Long foundTimeCluster) { - this.foundTimeCluster = foundTimeCluster; - } - public void setRecvTimeCluster(Long recvTimeCluster) { - this.recvTimeCluster = recvTimeCluster; - } - - @JsonIgnore - public Long getSearchFoundStartTimeCluster() { - return searchFoundStartTimeCluster; - } - public void setSearchFoundStartTimeCluster(Long searchFoundStartTimeCluster) { - this.searchFoundStartTimeCluster = searchFoundStartTimeCluster; - } - @JsonIgnore - public Long getSearchFoundEndTimeCluster() { - return searchFoundEndTimeCluster; - } - public void setSearchFoundEndTimeCluster(Long searchFoundEndTimeCluster) { - this.searchFoundEndTimeCluster = searchFoundEndTimeCluster; - } - @JsonIgnore - public String getTableName() { - return tableName; - } - public void setTableName(String tableName) { - this.tableName = tableName; - } - public String getOverId() { - return overId; - } - public void setOverId(String overId) { - this.overId = overId; - } - /** - * 当前实体分页对象 - */ - protected Page page; - - /** - * 自定义SQL（SQL标识，SQL内容） - */ - protected Map sqlMap; - - /** - * @Title: - * @Description: TODO - * @param 入参 - */ - public LogEntity() { - super(); - } - - public String getInjectedPktFile() { - return injectedPktFile; - } - - public void setInjectedPktFile(String injectedPktFile) { - this.injectedPktFile = injectedPktFile; - } - - - /** - * @return id - */ - public Long getId() { - return id; - } - - - - - /** - * @param id 要设置的 id - */ - public void setId(Long id) { - this.id = id; - } - - - - - /** - * @return cfgId - */ - public Long getCfgId() { - return cfgId; - } - - - - - /** - * @param cfgId 要设置的 cfgId - */ - public void setCfgId(Long cfgId) { - this.cfgId = cfgId; - } - - - - - /** - * @return foundTime - */ - @JsonSerialize(using=JsonDateSerializer.class) - public Date getFoundTime() { - if(foundTime ==null && this.foundTimeCluster != null){ - foundTime=new Date(this.foundTimeCluster*1000); - } - return foundTime; - } - - - - - /** - * @param foundTime 要设置的 foundTime - */ - public void setFoundTime(Date foundTime) { - this.foundTime = foundTime; - } - - - - - /** - * @return recvTime - */ - @JsonSerialize(using=JsonDateSerializer.class) - public Date getRecvTime() { - if(recvTime ==null && this.recvTimeCluster != null){ - recvTime=new Date(this.recvTimeCluster*1000); - } - return recvTime; - } - - - - - /** - * @param recvTime 要设置的 recvTime - */ - public void setRecvTime(Date recvTime) { - this.recvTime = recvTime; - } - - - - - /** - * @return overId - */ - /*public Long getOverId() { - return overId; - } - - - - - *//** - * @param overId 要设置的 overId - *//* - public void setOverId(Long overId) { - this.overId = overId; - }*/ - - - - - /** - * @return protocol - */ - public String getProtocol() { - return protocol; - } - - - - - /** - * @param protocol 要设置的 protocol - */ - public void setProtocol(String protocol) { - this.protocol = protocol; - } - - - - - /** - * @return serverIp - */ - public String getServerIp() { - return serverIp; - } - - - - - /** - * @param serverIp 要设置的 serverIp - */ - public void setServerIp(String serverIp) { - this.serverIp = serverIp; - } - - - - - /** - * @return clientIp - */ - public String getClientIp() { - return clientIp; - } - - - - - /** - * @param clientIp 要设置的 clientIp - */ - public void setClientIp(String clientIp) { - this.clientIp = clientIp; - } - - - - - /** - * @return serverPort - */ - public Integer getServerPort() { - return serverPort; - } - - - - - /** - * @param serverPort 要设置的 serverPort - */ - public void setServerPort(Integer serverPort) { - this.serverPort = serverPort; - } - - - - - /** - * @return clientPort - */ - public Integer getClientPort() { - return clientPort; - } - - - - - /** - * @param clientPort 要设置的 clientPort - */ - public void setClientPort(Integer clientPort) { - this.clientPort = clientPort; - } - - - - - /** - * @return nestProtocol - */ - public String getNestProtocol() { - return nestProtocol; - } - - - - - /** - * @param nestProtocol 要设置的 nestProtocol - */ - public void setNestProtocol(String nestProtocol) { - this.nestProtocol = nestProtocol; - } - - - - - /** - * @return nestServerIp - */ - public String getNestServerIp() { - return nestServerIp; - } - - - - - /** - * @param nestServerIp 要设置的 nestServerIp - */ - public void setNestServerIp(String nestServerIp) { - this.nestServerIp = nestServerIp; - } - - - - - /** - * @return nestClientIp - */ - public String getNestClientIp() { - return nestClientIp; - } - - - - - /** - * @param nestClientIp 要设置的 nestClientIp - */ - public void setNestClientIp(String nestClientIp) { - this.nestClientIp = nestClientIp; - } - - - - - /** - * @return nestServerPort - */ - public Integer getNestServerPort() { - return nestServerPort; - } - - - - - /** - * @param nestServerPort 要设置的 nestServerPort - */ - public void setNestServerPort(Integer nestServerPort) { - this.nestServerPort = nestServerPort; - } - - - - - /** - * @return nestClientPort - */ - public Integer getNestClientPort() { - return nestClientPort; - } - - - - - /** - * @param nestClientPort 要设置的 nestClientPort - */ - public void setNestClientPort(Integer nestClientPort) { - this.nestClientPort = nestClientPort; - } - - - - - /** - * @return serviceType - */ - public Integer getServiceType() { - return serviceType; - } - - - - - /** - * @param serviceType 要设置的 serviceType - */ - public void setServiceType(Integer serviceType) { - this.serviceType = serviceType; - } - - - - - /** - * @return entranceId - */ - public Long getEntranceId() { - return entranceId; - } - - - - - /** - * @param entranceId 要设置的 entranceId - */ - public void setEntranceId(Long entranceId) { - this.entranceId = entranceId; - } - - - - - /** - * @return cljIp - */ - public String getCljIp() { - return cljIp; - } - - - - - /** - * @param cljIp 要设置的 cljIp - */ - public void setCljIp(String cljIp) { - this.cljIp = cljIp; - } - - - - - public String getServerLocate() { - return serverLocate; - } - - - - - public void setServerLocate(String serverLocate) { - this.serverLocate = serverLocate; - } - - - - - public String getClientLocate() { - return clientLocate; - } - - - - - public void setClientLocate(String clientLocate) { - this.clientLocate = clientLocate; - } - - - - - @JsonIgnore - @XmlTransient - public Page getPage() { - if (page == null){ - page = new Page(); - } - return page; - } - - public Page setPage(Page page) { - this.page = page; - return page; - } - - @JsonIgnore - @XmlTransient - public Map getSqlMap() { - if (sqlMap == null){ - sqlMap = Maps.newHashMap(); - } - return sqlMap; - } - - public void setSqlMap(Map sqlMap) { - this.sqlMap = sqlMap; - } - - /** - * 获取数据库名称 - */ - @JsonIgnore - public String getDbName(){ - return Configurations.getStringProperty("jdbc.type", "mysql"); - } - - @Override - public boolean equals(Object obj) { - if (null == obj) { - return false; - } - if (this == obj) { - return true; - } - if (!getClass().equals(obj.getClass())) { - return false; - } - LogEntity that = (LogEntity) obj; - return null == this.getId() ? false : this.getId().equals(that.getId()); - } - - - - /** - * @return searchFoundStartTime - */ - @JsonIgnore - public String getSearchFoundStartTime() { - return searchFoundStartTime; - } - - - - - /** - * @param searchFoundStartTime 要设置的 searchFoundStartTime - */ - public void setSearchFoundStartTime(String searchFoundStartTime) { - this.searchFoundStartTime = searchFoundStartTime; - } - - - - - /** - * @return searchFoundEndTime - */ - @JsonIgnore - public String getSearchFoundEndTime() { - return searchFoundEndTime; - } - - - - - /** - * @param searchFoundEndTime 要设置的 searchFoundEndTime - */ - public void setSearchFoundEndTime(String searchFoundEndTime) { - this.searchFoundEndTime = searchFoundEndTime; - } - - - - - /** - * @return searchCfgId - */ - @JsonIgnore - public String getSearchCfgId() { - return searchCfgId; - } - - - - - /** - * @param searchCfgId 要设置的 searchCfgId - */ - public void setSearchCfgId(String searchCfgId) { - this.searchCfgId = searchCfgId; - } - - - - - /** - * @return searchProtocol - */ - @JsonIgnore - public String getSearchProtocol() { - return searchProtocol; - } - - - - - /** - * @param searchProtocol 要设置的 searchProtocol - */ - public void setSearchProtocol(String searchProtocol) { - this.searchProtocol = searchProtocol; - } - - - - - /** - * @return searchServerIp - */ - @JsonIgnore - public String getSearchServerIp() { - return searchServerIp; - } - - - - - /** - * @param searchServerIp 要设置的 searchServerIp - */ - public void setSearchServerIp(String searchServerIp) { - this.searchServerIp = searchServerIp; - } - - - - - /** - * @return searchClientIp - */ - @JsonIgnore - public String getSearchClientIp() { - return searchClientIp; - } - - - - - /** - * @param searchClientIp 要设置的 searchClientIp - */ - public void setSearchClientIp(String searchClientIp) { - this.searchClientIp = searchClientIp; - } - - - - - /** - * @return searchEntranceId - */ - @JsonIgnore - public String getSearchEntranceId() { - return searchEntranceId; - } - - - - - /** - * @param searchEntranceId 要设置的 searchEntranceId - */ - public void setSearchEntranceId(String searchEntranceId) { - this.searchEntranceId = searchEntranceId; - } - - - - - /** - * @return searchCljIp - */ - @JsonIgnore - public String getSearchCljIp() { - return searchCljIp; - } - - - - - /** - * @param searchCljIp 要设置的 searchCljIp - */ - - public void setSearchCljIp(String searchCljIp) { - this.searchCljIp = searchCljIp; - } - - - - - /** - * @return searchServiceType - */ - @JsonIgnore - public String getSearchServiceType() { - return searchServiceType; - } - - - - - /** - * @param searchServiceType 要设置的 searchServiceType - */ - public void setSearchServiceType(String searchServiceType) { - this.searchServiceType = searchServiceType; - } - - - - public String getSceneFile() { - return sceneFile; - } - public void setSceneFile(String sceneFile) { - this.sceneFile = sceneFile; - } - - public Integer getAction() { - return action; - } - public void setAction(Integer action) { - this.action = action; - } - - - - @Override - public String toString() { - return ReflectionToStringBuilder.toString(this); - } - -} diff --git a/src/main/java/com/nis/domain/StatLogEntity.java b/src/main/java/com/nis/domain/StatLogEntity.java deleted file mode 100644 index 56da2829b..000000000 --- a/src/main/java/com/nis/domain/StatLogEntity.java +++ /dev/null @@ -1,203 +0,0 @@ -/** -* @Title: StatLogEntity.java -* @Package com.nis.domain -* @Description: TODO(用一句话描述该文件做什么) -* @author （ddm） -* @date 2016年9月13日 上午10:49:01 -* @version V1.0 -*/ -package com.nis.domain; - -import java.io.Serializable; -import java.util.Date; -import java.util.Map; - -import javax.xml.bind.annotation.XmlTransient; - -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.google.common.collect.Maps; -import com.nis.util.Configurations; -import com.nis.util.JsonDateSerializer; -import com.wordnik.swagger.annotations.ApiModelProperty; - -/** -* @ClassName: StatLogEntity -* @Description: TODO(日志报表公共实体部分) -* @author (ddm) -* @date 2016年9月1日 上午10:16:54 -* @version V1.0 -*/ -public abstract class StatLogEntity implements Serializable { - - /** - * @Fields serialVersionUID : TODO(用一句话描述这个变量表示什么) - */ - private static final long serialVersionUID = -5210683756718456730L; - - @ApiModelProperty(value="私有标签", required=true) - protected Integer service; - @ApiModelProperty(value="生效系统", required=true) - protected Integer activeSys; - @ApiModelProperty(value="A版总计", required=true) - protected Long asum; - @ApiModelProperty(value="B版总计", required=true) - protected Long bsum; - @ApiModelProperty(value="全A+单B数量", required=true) - protected Long absum; - @ApiModelProperty(value="统计时间", required=true) - protected Date statTime; - - protected String searchStatStartTime; - protected String searchStatEndTime; - protected String searchService; - protected String searchStatActiveSys; - - - @JsonSerialize(using=JsonDateSerializer.class) - public Date getStatTime() { - return statTime; - } - public void setStatTime(Date statTime) { - this.statTime = statTime; - } - - public Integer getActiveSys() { - return activeSys; - } - public void setActiveSys(Integer activeSys) { - this.activeSys = activeSys; - } - - public Integer getService() { - return service; - } - - - public void setService(Integer service) { - this.service = service; - } - - - public Long getAbsum() { - return absum; - } - public Long getBsum() { - return bsum; - } - public void setAbsum(Long absum) { - this.absum = absum; - } - public void setBsum(Long bsum) { - this.bsum = bsum; - } - public Long getAsum() { - return asum; - } - public void setAsum(Long asum) { - this.asum = asum; - } - - - @JsonIgnore - public String getSearchStatStartTime() { - return searchStatStartTime; - } - - - public void setSearchStatStartTime(String searchStatStartTime) { - this.searchStatStartTime = searchStatStartTime; - } - - @JsonIgnore - public String getSearchStatEndTime() { - return searchStatEndTime; - } - - - public void setSearchStatEndTime(String searchStatEndTime) { - this.searchStatEndTime = searchStatEndTime; - } - - @JsonIgnore - public String getSearchService() { - return searchService; - } - - - public void setSearchService(String searchService) { - this.searchService = searchService; - } - - @JsonIgnore - public String getSearchStatActiveSys() { - return searchStatActiveSys; - } - public void setSearchStatActiveSys(String searchStatActiveSys) { - this.searchStatActiveSys = searchStatActiveSys; - } - - /** - * 当前实体分页对象 - */ - protected Page page; - - /** - * 自定义SQL（SQL标识，SQL内容） - */ - protected Map sqlMap; - - /** - * @Title: - * @Description: TODO - * @param 入参 - */ - public StatLogEntity() { - super(); - } - - - @JsonIgnore - @XmlTransient - public Page getPage() { - if (page == null){ - page = new Page(); - } - return page; - } - - public Page setPage(Page page) { - this.page = page; - return page; - } - - @JsonIgnore - @XmlTransient - public Map getSqlMap() { - if (sqlMap == null){ - sqlMap = Maps.newHashMap(); - } - return sqlMap; - } - - public void setSqlMap(Map sqlMap) { - this.sqlMap = sqlMap; - } - - /** - * 获取数据库名称 - */ - @JsonIgnore - public String getDbName(){ - return Configurations.getStringProperty("jdbc.type", "mysql"); - } - - - @Override - public String toString() { - return ReflectionToStringBuilder.toString(this); - } - -} diff --git a/src/main/java/com/nis/domain/SysRole.java b/src/main/java/com/nis/domain/SysRole.java index bc82ba142..7914c7731 100644 --- a/src/main/java/com/nis/domain/SysRole.java +++ b/src/main/java/com/nis/domain/SysRole.java @@ -45,7 +45,7 @@ public class SysRole extends BaseEntity{ private Date createTime; - // 数据范围（1：所有数据；2：所在公司及以下数据；3：所在公司数据；4：所在部门及以下数据；5：所在部门数据；8：所在单位及以下数据；9：所在单位数据） + // 数据范围（1：所有数据；2：所在国家中心及以下数据；3：所在国家中心数据；4：所在省中心及以下数据；5：所在省中心数据；8：所在部门及以下数据；9：所在部门数据） public static final Integer DATA_SCOPE_ALL = 1; public static final Integer DATA_SCOPE_COMPANY_AND_CHILD = 2; public static final Integer DATA_SCOPE_COMPANY = 3; diff --git a/src/main/java/com/nis/interceptor/DataSourceCInterceptor.java b/src/main/java/com/nis/interceptor/DataSourceCInterceptor.java index e847f1a6d..119547c3c 100644 --- a/src/main/java/com/nis/interceptor/DataSourceCInterceptor.java +++ b/src/main/java/com/nis/interceptor/DataSourceCInterceptor.java @@ -1,58 +1,40 @@ -package com.nis.interceptor; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; - -import com.nis.datasource.CustomerContextHolder; -import com.nis.util.Constants; - -public class DataSourceCInterceptor implements HandlerInterceptor { - Logger logger = Logger.getLogger(DataSourceCInterceptor.class); - String searchActiveSys=""; - - @Override - public boolean preHandle(HttpServletRequest request, - HttpServletResponse response, Object handler) throws Exception { - searchActiveSys=request.getParameter("searchActiveSys"); - if(searchActiveSys == null - || !(Constants.ACTIVESYS_A.equals(searchActiveSys) - || Constants.ACTIVESYS_C.equals(searchActiveSys)) - ) searchActiveSys=Constants.ACTIVESYS_B; - if(Constants.ACTIVESYS_A.equals(searchActiveSys)){ - logger.info("开启数据源日志A操作库---"+System.currentTimeMillis()); - CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_F);//开启数据源F - }else if(Constants.ACTIVESYS_C.equals(searchActiveSys)){ - logger.info("开启数据源日志C操作库---"+System.currentTimeMillis()); - CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_G);//开启数据源F - }else{ - logger.info("开启数据源日志B操作库---"+System.currentTimeMillis()); - CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_C);//开启数据源C - } - logger.info("日志数据源开启成功---"+System.currentTimeMillis()); - return true; - } - - @Override - public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3) - throws Exception { - logger.info("postHandle---"); - - } - - - @Override - public void afterCompletion(HttpServletRequest request, - HttpServletResponse response, Object handler, Exception ex) - throws Exception { - CustomerContextHolder.clearCustomerType(); - logger.info("释放数据源日志操作库---"); - } - - - - -} +package com.nis.interceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import com.nis.datasource.CustomerContextHolder; + +public class DataSourceCInterceptor implements HandlerInterceptor { + Logger logger = Logger.getLogger(DataSourceCInterceptor.class); + @Override + public boolean preHandle(HttpServletRequest request, + HttpServletResponse response, Object handler) throws Exception { + logger.info("开启数据源配置操作库---"); + CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_C);//开启数据源C + + return true; + } + + @Override + public void postHandle(HttpServletRequest request, + HttpServletResponse response, Object handler, + ModelAndView modelAndView) throws Exception { + logger.info("postHandle---"); + } + + @Override + public void afterCompletion(HttpServletRequest request, + HttpServletResponse response, Object handler, Exception ex) + throws Exception { + + CustomerContextHolder.clearCustomerType(); + logger.info("释放数据源配置操作库---"); + } + + +} diff --git a/src/main/java/com/nis/interceptor/DataSourceDInterceptor.java b/src/main/java/com/nis/interceptor/DataSourceDInterceptor.java index 9b5315b4d..3b2300e7b 100644 --- a/src/main/java/com/nis/interceptor/DataSourceDInterceptor.java +++ b/src/main/java/com/nis/interceptor/DataSourceDInterceptor.java @@ -1,43 +1,40 @@ -package com.nis.interceptor; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; - -import com.nis.datasource.CustomerContextHolder; - -public class DataSourceDInterceptor implements HandlerInterceptor { - Logger logger = Logger.getLogger(DataSourceDInterceptor.class); - - - @Override - public boolean preHandle(HttpServletRequest request, - HttpServletResponse response, Object handler) throws Exception { - logger.info("开启测试配置库---"); - CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_D);//开启数据源C - return true; - } - - @Override - public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3) - throws Exception { - logger.info("postHandle---"); - - } - - - @Override - public void afterCompletion(HttpServletRequest request, - HttpServletResponse response, Object handler, Exception ex) - throws Exception { - CustomerContextHolder.clearCustomerType(); - logger.info("释放测试配置库---"); - } - - - - -} +package com.nis.interceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import com.nis.datasource.CustomerContextHolder; + +public class DataSourceDInterceptor implements HandlerInterceptor { + Logger logger = Logger.getLogger(DataSourceDInterceptor.class); + @Override + public boolean preHandle(HttpServletRequest request, + HttpServletResponse response, Object handler) throws Exception { + logger.info("开启数据源配置操作库---"); + CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_D);//开启数据源D + + return true; + } + + @Override + public void postHandle(HttpServletRequest request, + HttpServletResponse response, Object handler, + ModelAndView modelAndView) throws Exception { + logger.info("postHandle---"); + } + + @Override + public void afterCompletion(HttpServletRequest request, + HttpServletResponse response, Object handler, Exception ex) + throws Exception { + + CustomerContextHolder.clearCustomerType(); + logger.info("释放数据源配置操作库---"); + } + + +} diff --git a/src/main/java/com/nis/interceptor/DataSourceEInterceptor.java b/src/main/java/com/nis/interceptor/DataSourceEInterceptor.java index f2db78ded..62bae68be 100644 --- a/src/main/java/com/nis/interceptor/DataSourceEInterceptor.java +++ b/src/main/java/com/nis/interceptor/DataSourceEInterceptor.java @@ -1,38 +1,40 @@ -package com.nis.interceptor; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.log4j.Logger; -import org.springframework.web.servlet.HandlerInterceptor; -import org.springframework.web.servlet.ModelAndView; - -import com.nis.datasource.CustomerContextHolder; - -public class DataSourceEInterceptor implements HandlerInterceptor { - Logger logger = Logger.getLogger(DataSourceEInterceptor.class); - - @Override - public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3) - throws Exception { - CustomerContextHolder.clearCustomerType(); - logger.info("释放数据静控操作库---"); - - } - - @Override - public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3) - throws Exception { - logger.info("postHandle---"); - - } - - @Override - public boolean preHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2) throws Exception { - logger.info("开启数据源静控操作库---"); - CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_E);//开启数据源C - - return true; - } - -} +package com.nis.interceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import com.nis.datasource.CustomerContextHolder; + +public class DataSourceEInterceptor implements HandlerInterceptor { + Logger logger = Logger.getLogger(DataSourceEInterceptor.class); + @Override + public boolean preHandle(HttpServletRequest request, + HttpServletResponse response, Object handler) throws Exception { + logger.info("开启数据源配置操作库---"); + CustomerContextHolder.setCustomerType(CustomerContextHolder.DATA_SOURCE_E);//开启数据源E + + return true; + } + + @Override + public void postHandle(HttpServletRequest request, + HttpServletResponse response, Object handler, + ModelAndView modelAndView) throws Exception { + logger.info("postHandle---"); + } + + @Override + public void afterCompletion(HttpServletRequest request, + HttpServletResponse response, Object handler, Exception ex) + throws Exception { + + CustomerContextHolder.clearCustomerType(); + logger.info("释放数据源配置操作库---"); + } + + +} diff --git a/src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java b/src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java index a4865cfdb..f5faed9fd 100644 --- a/src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java +++ b/src/main/java/com/nis/util/PropertyPlaceholderConfigurerCrypt.java @@ -30,7 +30,7 @@ public class PropertyPlaceholderConfigurerCrypt extends PropertyPlaceholderConfi new String(AESUtil.decrypt(Base64.decodeBase64(devlopPassword), devlopScretKey))); } - String logPassword = props.getProperty("jdbc.log.password"); + /*String logPassword = props.getProperty("jdbc.log.password"); String logScretKey = props.getProperty("jdbc.log.key"); if (null != logPassword) { props.setProperty("jdbc.log.password", @@ -89,7 +89,7 @@ public class PropertyPlaceholderConfigurerCrypt extends PropertyPlaceholderConfi if (null != clusterPassword) { props.setProperty("jdbc.log.cluster.password", new String(AESUtil.decrypt(Base64.decodeBase64(clusterPassword), clusterScretKey))); - } + }*/ } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java b/src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java deleted file mode 100644 index c859789b9..000000000 --- a/src/main/java/com/nis/util/elasticsearch/ElasticsearchSqlDao.java +++ /dev/null @@ -1,278 +0,0 @@ -/** - *@Title: ElasticsearchSqlUtil.java - *@Package com.nis.util - *@Description TODO - *@author dell - *@date 2016年10月17日 下午4:09:17 - *@version 版本号 - */ -package com.nis.util.elasticsearch; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - -import org.apache.http.client.ClientProtocolException; -import org.apache.ibatis.mapping.ResultMap; -import org.apache.ibatis.mapping.ResultMapping; -import org.apache.ibatis.session.SqlSessionFactory; -import org.apache.log4j.Logger; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - -import com.nis.domain.LogEntity; -import com.nis.domain.Page; -import com.nis.util.Constants; -import com.nis.util.JsonMapper; -import com.nis.util.StringUtil; -import com.nis.util.StringUtils; -import com.nis.util.httpclient.HttpClientUtil; -import com.nis.web.service.SpringContextHolder; - -/** - * @ClassName: ElasticsearchSqlUtil.java - * @Description: 在service中替代oracle查询 - * @author (wx) - * @date 2016年10月17日 下午4:09:17 - * @version V1.0 - */ -@SuppressWarnings({"unchecked","rawtypes"}) -public class ElasticsearchSqlDao { - private static final Logger logger=Logger.getLogger(ElasticsearchSqlDao.class); - private static final SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class); - private static final Map> fieldsMapMap=new HashMap<>(); - public void init(Class clazz){ - Map fieldsMap=new HashMap<>(); - ResultMap data=sqlSessionFactory.getConfiguration().getResultMap(clazz.getSimpleName()+"Map"); - List mappingList=data.getResultMappings(); - for(ResultMapping map:mappingList){ - fieldsMap.put(map.getColumn().toUpperCase(), map.getProperty()); - } - fieldsMapMap.put(clazz, fieldsMap); - } - /** - * 获取elasticsearch中的mapping field - * getSearchFields(这里用一句话描述这个方法的作用) - * (这里描述这个方法适用条件 – 可选) - * @param page - * @param clazz - * @return - *List - * @exception - * @since 1.0.0 - */ - private String getSearchFields(Page page,Class clazz){ - String fields=page.getFields(); - - if(StringUtil.isBlank(fields)){ - fields="*"; - }else{ - String[] fieldArray=fields.split(","); - for(String field :fieldArray){ - if(fieldsMapMap.get(clazz).containsKey(field.toUpperCase())){ - fields=fields.replace(field, fieldsMapMap.get(clazz).get(field.toUpperCase())); - } - } - } - return fields; - } - /** - * - * getWhereCondition(where 条件转换) - * (这里描述这个方法适用条件 – 可选) - * @param entity - * @param givenDateFormat - * @return - * @throws ParseException - * @throws IllegalArgumentException - * @throws IllegalAccessException - *String - * @exception - * @since 1.0.0 - */ - private String getWhereCondition(LogEntity entity,SimpleDateFormat givenDateFormat) throws ParseException, IllegalArgumentException, IllegalAccessException{ - StringBuffer where=new StringBuffer(); - //使用反射获取entity的所有字段值 - Class clazz=entity.getClass(); - List fieldList=new ArrayList(); - fieldList.addAll(Arrays.asList(clazz.getDeclaredFields())); - fieldList.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields())); - - for(Field field:fieldList){ - if(Modifier.isFinal(field.getModifiers()))continue; - if(Modifier.isPrivate(field.getModifiers())||Modifier.isProtected(field.getModifiers())){ - field.setAccessible(true); - } - String type=field.getType().getSimpleName(); - Object value=field.get(entity); - if(value==null)continue; - if(field.getName().endsWith("StartTime")){ - String startTime=value.toString(); - if(!StringUtil.isBlank(startTime)){ - String fieldName=field.getName() - .replace("search", "") - .replace("Start", ""); - fieldName=fieldName.replace(fieldName.substring(0, 1),fieldName.substring(0, 1).toLowerCase()); - where.append(" AND "+fieldName +">="); - where.append(givenDateFormat.parse(startTime).getTime()/1000); - - } - }else if(field.getName().endsWith("EndTime")){ - String endTime=value.toString(); - if(!StringUtil.isBlank(endTime)){ - String fieldName=field.getName() - .replace("search", "") - .replace("End", ""); - fieldName=fieldName.replace(fieldName.substring(0, 1),fieldName.substring(0, 1).toLowerCase()); - where.append(" AND "+fieldName +"<"); - where.append(givenDateFormat.parse(endTime).getTime()/1000); - - } - }else{ - String fieldName=field.getName().replace("search", ""); - fieldName=fieldName.replace(fieldName.substring(0, 1),fieldName.substring(0, 1).toLowerCase()); - if(fieldsMapMap.get(clazz).containsValue(fieldName)){ - if("Date".equals(type)){ - Date date=(Date)value; - where.append(" AND "+fieldName+"="); - where.append(date.getTime()/1000); - }else{ - where.append(" AND "+fieldName +"="); - where.append("'"+value.toString()+"'"); - } - } - } - } - where.delete(0, " AND ".length()); - return where.toString().trim(); - } - /** - * - * getOderbys(排序转换) - * (这里描述这个方法适用条件 – 可选) - * @param page - * @param clazz - * @return - *String - * @exception - * @since 1.0.0 - */ - private String getOderbys(Page page,Class clazz){ - String orderBy=page.getOrderBy(); - for(String field :orderBy.split(" ")){ - if(fieldsMapMap.get(clazz).containsKey(field.toUpperCase())){ - orderBy=orderBy.replace(field, fieldsMapMap.get(clazz).get(field.toUpperCase())); - } - } - return orderBy; - - } - - public String geneEs4SQL(Class clazz,Page page,LogEntity entity) throws ParseException, IllegalArgumentException, IllegalAccessException{ - if(!fieldsMapMap.containsKey(clazz)){ - this.init(clazz); - } - SimpleDateFormat givenDateFormat=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT); - String indexName=clazz.getSimpleName().toUpperCase(); - String fields=getSearchFields(page, clazz); - String where=getWhereCondition(entity, givenDateFormat); - where=StringUtils.isBlank(where)?" ":" where "+where; - String groupBy=""; - String orderBy=getOderbys(page,clazz); - orderBy=StringUtils.isBlank(orderBy)?" ":" ORDER BY "+orderBy; - String pageInfo=getPageInfo(page); - String sql="SELECT "+fields+ - " FROM "+indexName+where+groupBy+orderBy+pageInfo; - logger.info("es-sql:"+sql); - return sql.replaceAll(" ", "%20").replaceAll("<", "%3C").replaceAll(">", "%3E"); - } - public String search(LogEntity entity,String acticeSys) throws ParseException, IllegalArgumentException, IllegalAccessException, ClientProtocolException, IOException{ - String sql=geneEs4SQL(entity.getClass(),entity.getPage(),entity); - if(acticeSys.equals(Constants.ACTIVESYS_C)){ - logger.info("查询C版ES"); - return HttpClientUtil.get("http://"+Constants.SEARCH_ES_HOSTANDPORT_C+"/_sql?sql="+sql); - }else if(acticeSys.equals(Constants.ACTIVESYS_A)){ - logger.info("查询A版ES"); - return HttpClientUtil.get("http://"+Constants.SEARCH_ES_HOSTANDPORT_A+"/_sql?sql="+sql); - }else{ - logger.info("查询B版ES"); - return HttpClientUtil.get("http://"+Constants.SEARCH_ES_HOSTANDPORT_B+"/_sql?sql="+sql); - } - } - private String getPageInfo(Page page){ - int pageNo=page.getPageNo(); - int pageSize=page.getPageSize(); - return " limit "+(pageNo-1)*pageSize+", "+page.getPageSize(); - } - /** - * - * findLogs(查询方法) - * (初始化好list 之后传入方法，查询结果会加入到list中) - * @param logList - * @param esHostAndPort - * @param log - * @param givenFormat - * @throws ParseException - * @throws JSONException - * @throws IllegalArgumentException - * @throws IllegalAccessException - *void - * @throws IOException - * @throws ClientProtocolException - * @exception - * @since 1.0.0 - */ - public void findLogs(List logList,LogEntity log,String activeSys) throws ParseException, JSONException, IllegalArgumentException, IllegalAccessException, ClientProtocolException, IOException{ - Class clazz=log.getClass(); - JSONObject obj=new JSONObject(search(log,activeSys)); - long count=obj.getJSONObject("hits").getLong("total"); - long took=obj.getLong("took"); - logger.info("search by es cost: "+took+"ms"); - log.getPage().setCount(count); - if(count>0){ - JSONArray resultJson=obj.getJSONObject("hits").getJSONArray("hits"); - for(int i=0;i - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - COMPILE_ID,SERVICE,ACTION,CONT_TYPE,ATTR_TYPE,CONT_LABEL,Task_id,Guarantee_ID, - AFFAIR_ID,TOPIC_ID,DO_BLACKLIST,DO_LOG,EFFECTIVE_RANGE,ACTIVE_SYS, - CONFIG_PERCENT,CONFIG_OPTION,START_TIME,END_TIME,USER_REGION, - IS_VALID,GROUP_NUM,FATHER_CFG_ID,OP_TIME,LAST_UPDATE,PROC_SEQ - - - - - - - - - - - - - - - - - - - - insert into CONFIG_COMPILE (COMPILE_ID ,SERVICE ,ACTION , - CONT_TYPE, - ATTR_TYPE, - CONT_LABEL, - Task_id, - Guarantee_ID, - AFFAIR_ID, - TOPIC_ID, - DO_BLACKLIST ,DO_LOG ,EFFECTIVE_RANGE , - ACTIVE_SYS, - CONFIG_PERCENT - ,CONFIG_OPTION - ,START_TIME ,END_TIME , - USER_REGION, - IS_VALID,GROUP_NUM,FATHER_CFG_ID - ,OP_TIME,LAST_UPDATE - - ) - - - select - #{item.compileId,jdbcType=BIGINT}, - #{item.service,jdbcType=BIGINT}, - #{item.action,jdbcType=INTEGER}, - #{item.contType,jdbcType=INTEGER}, - #{item.attrType,jdbcType=INTEGER}, - #{item.contLabel,jdbcType=INTEGER}, - #{item.taskId,jdbcType=INTEGER}, - #{item.guaranteeId,jdbcType=INTEGER}, - #{item.affAirId,jdbcType=INTEGER}, - #{item.topIcId,jdbcType=INTEGER}, - #{item.doBlackList,jdbcType=BIGINT}, - #{item.doLog,jdbcType=INTEGER}, - #{item.effectiveRange,jdbcType=VARCHAR}, - #{item.activeSys,jdbcType=INTEGER}, - #{item.configPercent,jdbcType=DOUBLE}, - #{item.configOption,jdbcType=DOUBLE}, - #{item.startTime,jdbcType=TIMESTAMP}, - #{item.endTime,jdbcType=TIMESTAMP}, - #{item.userRegion,jdbcType=VARCHAR}, - #{item.isValid,jdbcType=INTEGER}, - #{item.groupNum,jdbcType=INTEGER }, - #{item.fatherCfgId,jdbcType=BIGINT}, - #{item.opTime,jdbcType=TIMESTAMP}, - sysdate - - from dual - - - - - - - - - - - - - - insert into CONFIG_COMPILE (COMPILE_ID ,SERVICE ,ACTION , - - CONT_TYPE, - - - ATTR_TYPE, - - - CONT_LABEL, - - - Task_id, - - - Guarantee_ID, - - - AFFAIR_ID, - - - TOPIC_ID, - - - LAST_UPDATE, - - DO_BLACKLIST ,DO_LOG ,EFFECTIVE_RANGE ,ACTIVE_SYS, - CONFIG_PERCENT - ,CONFIG_OPTION - ,START_TIME ,END_TIME , - - USER_REGION, - - IS_VALID,GROUP_NUM,FATHER_CFG_ID ,OP_TIME) VALUES( - #{compileId,jdbcType=BIGINT}, - #{service, jdbcType=BIGINT}, - #{action,jdbcType=INTEGER}, - - #{contType,jdbcType=INTEGER }, - - - #{attrType,jdbcType=INTEGER }, - - - #{contLabel,jdbcType=INTEGER}, - - - #{taskId,jdbcType=INTEGER}, - - - #{guaranteeId,jdbcType=INTEGER}, - - - #{affAirId,jdbcType=INTEGER}, - - - #{topIcId,jdbcType=INTEGER}, - - - #{lastUpdate,jdbcType=TIMESTAMP}, - - #{doBlackList,jdbcType=BIGINT}, - #{doLog,jdbcType=INTEGER}, - #{effectiveRange,jdbcType=VARCHAR}, - #{activeSys,jdbcType=INTEGER}, - #{configPercent,jdbcType=DOUBLE}, - #{configOption,jdbcType=DOUBLE}, - #{startTime,jdbcType=TIMESTAMP}, - #{endTime,jdbcType=TIMESTAMP}, - - #{userRegion,jdbcType=VARCHAR}, - - #{isValid,jdbcType=INTEGER}, - #{groupNum,jdbcType=INTEGER }, - #{fatherCfgId,jdbcType=BIGINT}, - #{opTime,jdbcType=TIMESTAMP}) - - - - update CONFIG_COMPILE - - LAST_UPDATE =sysdate, - - CONT_TYPE = #{contType,jdbcType=INTEGER}, - - - ATTR_TYPE = #{attrType,jdbcType=INTEGER}, - - - CONT_LABEL = #{contLabel,jdbcType=VARCHAR}, - - - Task_id = #{taskId,jdbcType=INTEGER}, - - - Guarantee_ID = #{guaranteeId,jdbcType=INTEGER}, - - - AFFAIR_ID = #{affAirId,jdbcType=INTEGER}, - - - TOPIC_ID = #{topIcId,jdbcType=INTEGER}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - - ACTIVE_SYS = #{activeSys,jdbcType=INTEGER}, - - - - - EFFECTIVE_RANGE = #{effectiveRange,jdbcType=VARCHAR}, - - - - where COMPILE_ID = #{compileId ,jdbcType=BIGINT } - - - - - - update CONFIG_COMPILE set is_valid=#{valid,jdbcType=INTEGER } where COMPILE_ID = #{compileId ,jdbcType=BIGINT } - - - - - - - - - - - - TABLE_NAME,OP_TIME - - - - update CONFIG_STATE - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - where TABLE_NAME = #{tableName ,jdbcType=VARCHAR } - - - insert into - CONFIG_STATE(TABLE_NAME,OP_TIME) - values(#{tableName,jdbcType=VARCHAR},#{opTime,jdbcType=TIMESTAMP}) - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/ConfigGroupRelationDao.xml b/src/main/java/com/nis/web/dao/ConfigGroupRelationDao.xml deleted file mode 100644 index 87efae85c..000000000 --- a/src/main/java/com/nis/web/dao/ConfigGroupRelationDao.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - ID,GROUP_ID,COMPILE_ID,IS_VALID,OP_TIME,LAST_UPDATE,PROC_SEQ - - - - - - - - - - - - - insert into CONFIG_GROUP - (ID,GROUP_ID, COMPILE_ID, IS_VALID, - OP_TIME,LAST_UPDATE - - ) - - select - - #{item.id,jdbcType=BIGINT}, - #{item.groupId,jdbcType=BIGINT}, - #{item.compileId,jdbcType=BIGINT}, - #{item.isValid,jdbcType=BIGINT}, - #{item.opTime,jdbcType=TIMESTAMP}, - sysdate - - from dual - - - - - - - - - - - - - - insert into CONFIG_GROUP - (ID,GROUP_ID, COMPILE_ID, IS_VALID, - LAST_UPDATE, - OP_TIME ) - values - ( - - - seq_config_group.nextval, - #{groupId,jdbcType=BIGINT}, - #{compileId,jdbcType=BIGINT}, - #{isValid,jdbcType=BIGINT}, - sysdate, - #{opTime,jdbcType=TIMESTAMP} - ) - - - - - UPDATE - CONFIG_GROUP - - - IS_VALID=#{isValid , jdbcType=BIGINT}, - - - OP_TIME=#{opTime , jdbcType=TIMESTAMP}, - - - LAST_UPDATE=#{lastUpdate , jdbcType=TIMESTAMP}, - - - where GROUP_ID=#{groupId} - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/ConfigPzIdDao.xml b/src/main/java/com/nis/web/dao/ConfigPzIdDao.xml deleted file mode 100644 index 7ee034fc9..000000000 --- a/src/main/java/com/nis/web/dao/ConfigPzIdDao.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/ControlLogDao.java b/src/main/java/com/nis/web/dao/ControlLogDao.java deleted file mode 100644 index 9492391b4..000000000 --- a/src/main/java/com/nis/web/dao/ControlLogDao.java +++ /dev/null @@ -1,31 +0,0 @@ -/** -* @Title: ControlLogDao.java -* @Package com.nis.web.dao -* @Description: TODO(用一句话描述该文件做什么) -* @author （darnell） -* @date 2016年8月15日 下午4:13:49 -* @version V1.0 -*/ -package com.nis.web.dao; - -import java.util.List; - - -import com.nis.domain.ControlLog; - -/** -* @ClassName: ControlLogDao -* @Description: TODO(这里用一句话描述这个类的作用) -* @author (darnell) -* @date 2016年8月15日 下午4:13:49 -* @version V1.0 -*/ -@MyBatisDao -public interface ControlLogDao extends CrudDao { - - List getLogInfo(ControlLog controlLog); - - void saveControlLog(ControlLog controlLog); - - void removeControlLog(long id); -} diff --git a/src/main/java/com/nis/web/dao/DataDictionaryDao.xml b/src/main/java/com/nis/web/dao/DataDictionaryDao.xml deleted file mode 100644 index 9ab198589..000000000 --- a/src/main/java/com/nis/web/dao/DataDictionaryDao.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - n.id dictnameid, - n.datadictname datadictname, - v.id - dictvalueid, - v.datadictvalue datadictvalue - - - - - - - - - - select seq_datadict.nextval from dual - - insert into datadictionaryname (id ,datadictname,isValid) values( - #{dictNameId,jdbcType=BIGINT}, - #{dataDictName, jdbcType=VARCHAR},1) - - - - - - - - select seq_datadict.nextval from dual - - insert into datadictionaryvalue (id ,datadictid,datadictvalue,isValid) - values( - #{dictValueId,jdbcType=BIGINT},#{dictNameId, jdbcType=BIGINT}, - #{dataDictValue,jdbcType=VARCHAR},1) - - - - update datadictionaryname - - - isValid = #{isValid,jdbcType=BIGINT}, - - - dataDictName = #{dataDictName,jdbcType=VARCHAR}, - - - where id = #{dictNameId ,jdbcType=BIGINT } - - - update datadictionaryvalue - - - dataDictValue = #{dataDictValue,jdbcType=VARCHAR}, - - - isValid = #{isValid,jdbcType=BIGINT}, - - - where id = #{dictValueId ,jdbcType=BIGINT } - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfDjLogStatDao.xml b/src/main/java/com/nis/web/dao/DfDjLogStatDao.xml deleted file mode 100644 index c10f53319..000000000 --- a/src/main/java/com/nis/web/dao/DfDjLogStatDao.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - SUM - - - - - - - - - - - - CONFIG_ID, SERVICE, STAT_TIME, SUM - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfDjNestLogDao.xml b/src/main/java/com/nis/web/dao/DfDjNestLogDao.xml deleted file mode 100644 index 4414e7b9e..000000000 --- a/src/main/java/com/nis/web/dao/DfDjNestLogDao.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - LAYER_ID,FOUND_TIME,RECV_TIME,LAYER_CNT,NEST_PROTOCOL,NEST_SERVER_IP, - NEST_CLIENT_IP,NEST_SERVER_PORT,NEST_CLIENT_PORT,OVER_ID - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfIpPortUdpDao.xml b/src/main/java/com/nis/web/dao/DfIpPortUdpDao.xml deleted file mode 100644 index 2db55c768..000000000 --- a/src/main/java/com/nis/web/dao/DfIpPortUdpDao.xml +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - CFG_ID, ADDR_TYPE, SRC_IP, MASK_SRC_IP, SRC_PORT, MASK_SRC_PORT, DST_IP, MASK_DST_IP, - DST_PORT, MASK_DST_PORT, PROTOCOL, DIRECTION, IS_VALID, OP_TIME,lastUpdate,effectiveRange,activeSys - - - - delete from DF_IP_PORT_UDP - where CFG_ID = #{cfgId,jdbcType=BIGINT} - - - - - insert into DF_IP_PORT_UDP - - CFG_ID, - - ADDR_TYPE, - - - SRC_IP, - - - MASK_SRC_IP, - - - SRC_PORT, - - - MASK_SRC_PORT, - - - DST_IP, - - - MASK_DST_IP, - - - DST_PORT, - - - MASK_DST_PORT, - - - PROTOCOL, - - - DIRECTION, - - - IS_VALID, - - - OP_TIME, - - - LAST_UPDATE, - - - EFFECTIVE_RANGE, - - - ACTIVE_SYS, - - - - #{cfgId,jdbcType=BIGINT}, - - #{addrType,jdbcType=INTEGER}, - - - #{srcIp,jdbcType=VARCHAR}, - - - #{maskSrcIp,jdbcType=VARCHAR}, - - - #{srcPort,jdbcType=VARCHAR}, - - - #{maskSrcPort,jdbcType=VARCHAR}, - - - #{dstIp,jdbcType=VARCHAR}, - - - #{maskDstIp,jdbcType=VARCHAR}, - - - #{dstPort,jdbcType=VARCHAR}, - - - #{maskDstPort,jdbcType=VARCHAR}, - - - #{protocol,jdbcType=INTEGER}, - - - #{direction,jdbcType=INTEGER}, - - - #{isValid,jdbcType=INTEGER}, - - - #{opTime,jdbcType=TIMESTAMP}, - - - #{lastUpdate,jdbcType=TIMESTAMP}, - - - #{effectiveRange,jdbcType=VARCHAR}, - - - #{activeSys,jdbcType=INTEGER}, - - - - - - update DF_IP_PORT_UDP - - - ADDR_TYPE = #{addrType,jdbcType=INTEGER}, - - - SRC_IP = #{srcIp,jdbcType=VARCHAR}, - - - MASK_SRC_IP = #{maskSrcIp,jdbcType=VARCHAR}, - - - SRC_PORT = #{srcPort,jdbcType=VARCHAR}, - - - MASK_SRC_PORT = #{maskSrcPort,jdbcType=VARCHAR}, - - - DST_IP = #{dstIp,jdbcType=VARCHAR}, - - - MASK_DST_IP = #{maskDstIp,jdbcType=VARCHAR}, - - - DST_PORT = #{dstPort,jdbcType=VARCHAR}, - - - MASK_DST_PORT = #{maskDstPort,jdbcType=VARCHAR}, - - - PROTOCOL = #{protocol,jdbcType=INTEGER}, - - - DIRECTION = #{direction,jdbcType=INTEGER}, - - - IS_VALID = #{isValid,jdbcType=INTEGER}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - EFFECTIVE_RANGE=#{effectiveRange,jdbcType=VARCHAR}, - - - ACTIVE_SYS=#{activeSys,jdbcType=INTEGER}, - - - where CFG_ID = #{cfgId,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfJitLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfJitLogSearchDao.xml deleted file mode 100644 index 1bfd9f997..000000000 --- a/src/main/java/com/nis/web/dao/DfJitLogSearchDao.xml +++ /dev/null @@ -1,692 +0,0 @@ - - - - - - - - - - - - - - - - STAT_ID, FL, XZ, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, FL, XZ, REPORT_TIME, DEST_COUNTRY, DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - STAT_ID, Affair,topic, REPORT_TIME, SRC_COUNTRY, - SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, Affair,topic, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - STAT_ID, mission, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, mission, REPORT_TIME, DEST_COUNTRY, DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, guarantee, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, guarantee, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, tag, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, tag, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, id, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, id, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfKeyConvertUrlDao.xml b/src/main/java/com/nis/web/dao/DfKeyConvertUrlDao.xml deleted file mode 100644 index 5f42fe1a0..000000000 --- a/src/main/java/com/nis/web/dao/DfKeyConvertUrlDao.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - ID,KEY_ID,URL,OP_TIME - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfKeyMailAddDao.xml b/src/main/java/com/nis/web/dao/DfKeyMailAddDao.xml deleted file mode 100644 index e6112703e..000000000 --- a/src/main/java/com/nis/web/dao/DfKeyMailAddDao.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - ID,KEY_ID,MAIL_ADDR,OP_TIME - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml b/src/main/java/com/nis/web/dao/DfLogSearchDao.xml deleted file mode 100644 index 947004e03..000000000 --- a/src/main/java/com/nis/web/dao/DfLogSearchDao.xml +++ /dev/null @@ -1,1190 +0,0 @@ - - - - - - ID,CFG_ID,FOUND_TIME,RECV_TIME, - OVER_ID,PROTOCOL,SERVER_IP,CLIENT_IP, - SERVER_PORT,CLIENT_PORT,NEST_PROTOCOL, - NEST_SERVER_IP,NEST_CLIENT_IP,NEST_SERVER_PORT, - NEST_CLIENT_PORT,SERVICE_TYPE,ENTRANCE_ID,CLJ_IP, - SCENE_FILE,ACTION,SERVER_LOCATE,CLIENT_LOCATE,INJECTED_PKT_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,REQ_BODY_FILE,COOKIE,REFERER,UA,USER_DEFINE_KEY,USER_DEFINE_VALUE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE, - REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE,SET_COOKIE, - CONTENT_LEN,CONTENT_TYPE,USER_DEFINE_KEY,USER_DEFINE_VALUE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE, - REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,MAIL_PROTO,MAIL_FROM,MAIL_TO,SUBJECT,EML_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,RD,QTYPE,QCLASS,OPCODE,QNAME,CHEAT_TYPE - ,CHEAT_RCODE,CHEAT_STRATEGY,CHEAT_Rr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,FTP_URL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,TUNNEL_TYPE,ENCRYPT_MODE,CONTENT_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,TUNNEL_TYPE,ENCRYPT_MODE,CHAP_NAME,CONTENT_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,EX_PROTOCOL,ISAKMP_MODE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,ENCRYPT_MODE,HMAC,TUNNEL_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,HOST_KEY,HOST_COOKIE,ENCRYPT_MODE,MAC,TUNNEL_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,SNI,INDIVIDUAL_CERT_FILE,MIDDLE_CERT_FILE,ROOT_CERT_FILE,CHAIN_CERT_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,TUNNEL_NAME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.xml b/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.xml deleted file mode 100644 index b19c6b045..000000000 --- a/src/main/java/com/nis/web/dao/DfLogSearchDaoCluster.xml +++ /dev/null @@ -1,1120 +0,0 @@ - - - - - - CFG_ID,FOUND_TIME,RECV_TIME, - OVER_ID,PROTOCOL,SERVER_IP,CLIENT_IP, - SERVER_PORT,CLIENT_PORT,NEST_PROTOCOL, - NEST_SERVER_IP,NEST_CLIENT_IP,NEST_SERVER_PORT, - NEST_CLIENT_PORT,SERVICE_TYPE,ENTRANCE_ID,CLJ_IP, - SCENE_FILE,ACTION,SERVER_LOCATE,CLIENT_LOCATE,INJECTED_PKT_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,REQ_BODY_FILE,COOKIE,REFERER,UA,USER_DEFINE_KEY,USER_DEFINE_VALUE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE, - REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE,SET_COOKIE, - CONTENT_LEN,CONTENT_TYPE,USER_DEFINE_KEY,USER_DEFINE_VALUE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE, - REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,MAIL_PROTO,MAIL_FROM,MAIL_TO,SUBJECT,EML_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,RD,QTYPE,QCLASS,OPCODE,QNAME,CHEAT_TYPE - ,CHEAT_RCODE,CHEAT_STRATEGY,CHEAT_Rr - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,FTP_URL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,TUNNEL_TYPE,ENCRYPT_MODE,CONTENT_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,TUNNEL_TYPE,ENCRYPT_MODE,CHAP_NAME,CONTENT_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,EX_PROTOCOL,ISAKMP_MODE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,ENCRYPT_MODE,HMAC,TUNNEL_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,HOST_KEY,HOST_COOKIE,ENCRYPT_MODE,MAC,TUNNEL_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,SNI,INDIVIDUAL_CERT_FILE,MIDDLE_CERT_FILE,ROOT_CERT_FILE,CHAIN_CERT_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,TUNNEL_NAME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.xml b/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.xml deleted file mode 100644 index 44cab96c2..000000000 --- a/src/main/java/com/nis/web/dao/DfMultiDimensionalReportDao.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - ASUM,BSUM,REPORT_TIME,SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.xml b/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.xml deleted file mode 100644 index 48e4f760b..000000000 --- a/src/main/java/com/nis/web/dao/DfMultiDimensionalStatLogDao.xml +++ /dev/null @@ -1,475 +0,0 @@ - - - - - - ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfReportDao.xml b/src/main/java/com/nis/web/dao/DfReportDao.xml deleted file mode 100644 index ded34fa91..000000000 --- a/src/main/java/com/nis/web/dao/DfReportDao.xml +++ /dev/null @@ -1,824 +0,0 @@ - - - - - - ASUM,BSUM,REPORT_TIME - - - ASUM,BSUM,ABSUM,REPORT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,CFG_ID,SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,service - - - - - - - - - - - - - ,tag - - - - - - - - - - - - - - - - - - - - - - - - - ,SRC_PROVINCE,SRC_CITY - - - - - - - - - - - - - - ,DEST_COUNTRY - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DfStatLogDao.xml b/src/main/java/com/nis/web/dao/DfStatLogDao.xml deleted file mode 100644 index 852a1e637..000000000 --- a/src/main/java/com/nis/web/dao/DfStatLogDao.xml +++ /dev/null @@ -1,857 +0,0 @@ - - - - - - CONFIG_ID,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - TAG,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - attr_type,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - ENTRANCE_ID,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - lwhh,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - SRC_PROVINCE,SRC_CITY,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEST_COUNTRY,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjJitLogSearchDao.xml b/src/main/java/com/nis/web/dao/DjJitLogSearchDao.xml deleted file mode 100644 index a17b95068..000000000 --- a/src/main/java/com/nis/web/dao/DjJitLogSearchDao.xml +++ /dev/null @@ -1,776 +0,0 @@ - - - - - - - - - - - - - - - - STAT_ID, FL, XZ, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, FL, XZ, REPORT_TIME, DEST_COUNTRY, DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - STAT_ID, Affair,topic, REPORT_TIME, SRC_COUNTRY, - SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, Affair,topic, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - STAT_ID, mission, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, mission, REPORT_TIME, DEST_COUNTRY, DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - STAT_ID, guarantee, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, guarantee, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, tag, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, tag, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, id, REPORT_TIME, SRC_COUNTRY, SRC_PROVINCE, - SRC_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - STAT_ID, id, REPORT_TIME, DEST_COUNTRY, - DEST_PROVINCE, - DEST_CITY, SUM, - SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STAT_ID, CONFIG_ID, SERVICE, GJ_CK_ID,SUM,CAP_TIME,active_sys - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjLogSearchDao.xml b/src/main/java/com/nis/web/dao/DjLogSearchDao.xml deleted file mode 100644 index 7bea5db07..000000000 --- a/src/main/java/com/nis/web/dao/DjLogSearchDao.xml +++ /dev/null @@ -1,1105 +0,0 @@ - - - - - - ID,CFG_ID,FOUND_TIME,RECV_TIME, - OVER_ID,PROTOCOL,SERVER_IP,CLIENT_IP, - SERVER_PORT,CLIENT_PORT,NEST_PROTOCOL,NEST_SERVER_IP,NEST_CLIENT_IP, - NEST_SERVER_PORT,NEST_CLIENT_PORT,SERVICE_TYPE,ENTRANCE_ID, - CLJ_IP,SCENE_FILE,ACTION,SERVER_LOCATE,CLIENT_LOCATE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE,REQ_BODY_FILE,COOKIE,REFERER,UA,USER_DEFINE_KEY,USER_DEFINE_VALUE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE, - REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE,SET_COOKIE, - CONTENT_LEN,CONTENT_TYPE,USER_DEFINE_KEY,USER_DEFINE_VALUE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,C2S_ISN,HTTP_PROXY_FLAG,HTTP_SEQ,URL,REQ_LINE,REQ_HDR_FILE, - REQ_BODY_FILE,RES_LINE,RES_HDR_FILE,RES_BODY_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,MAIL_PROTO,MAIL_FROM,MAIL_TO,SUBJECT,EML_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,QR,RD,RA,RR,QTYPE,QCLASS,OPCODE,QNAME,DNS_SUB - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,FTP_URL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,TUNNEL_TYPE,ENCRYPT_MODE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,TUNNEL_TYPE,ENCRYPT_MODE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,EX_PROTOCOL,ISAKMP_MODE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,ENCRYPT_MODE,HMAC,TUNNEL_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,HOST_KEY,HOST_COOKIE,ENCRYPT_MODE,MAC,TUNNEL_TYPE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,VERSION,SNI,INDIVIDUAL_CERT_FILE,MIDDLE_CERT_FILE,ROOT_CERT_FILE,CHAIN_CERT_FILE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.xml b/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.xml deleted file mode 100644 index 6924c3c93..000000000 --- a/src/main/java/com/nis/web/dao/DjMultiDimensionalReportDao.xml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - ASUM,BSUM,REPORT_TIME,SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.xml b/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.xml deleted file mode 100644 index d99b30d7c..000000000 --- a/src/main/java/com/nis/web/dao/DjMultiDimensionalStatLogDao.xml +++ /dev/null @@ -1,475 +0,0 @@ - - - - - - ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjReportDao.xml b/src/main/java/com/nis/web/dao/DjReportDao.xml deleted file mode 100644 index 760188c17..000000000 --- a/src/main/java/com/nis/web/dao/DjReportDao.xml +++ /dev/null @@ -1,617 +0,0 @@ - - - - - - ASUM,BSUM,CSUM,REPORT_TIME - - - - - - - - - - - - - - - - - - - - ,CFG_ID,SERVICE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ,tag - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DjStatLogDao.xml b/src/main/java/com/nis/web/dao/DjStatLogDao.xml deleted file mode 100644 index 6ec93aa4d..000000000 --- a/src/main/java/com/nis/web/dao/DjStatLogDao.xml +++ /dev/null @@ -1,858 +0,0 @@ - - - - - - CONFIG_ID,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - TAG,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - attr_type,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - ENTRANCE_ID,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - lwhh,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - SRC_PROVINCE,SRC_CITY,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DEST_COUNTRY,ACTIVE_SYS,SERVICE,ASUM,BSUM,ABSUM,STAT_TIME - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DmbCkDao.xml b/src/main/java/com/nis/web/dao/DmbCkDao.xml deleted file mode 100644 index 0dfd7320b..000000000 --- a/src/main/java/com/nis/web/dao/DmbCkDao.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - ID, NAME, POSITION, COM_OPTION, CZYID, OP_TIME,LAST_UPDATE - - - - delete from DMB_CK - where ID = #{id,jdbcType=BIGINT} - - - - insert into DMB_CK (ID, NAME, POSITION, - COM_OPTION, CZYID, OP_TIME,LAST_UPDATE - ) - values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, - #{comOption,jdbcType=VARCHAR}, #{czyid,jdbcType=BIGINT}, #{opTime,jdbcType=TIMESTAMP}, - #{lastUpdate,jdbcType=TIMESTAMP} - ) - - - - update DMB_CK - - - NAME = #{name,jdbcType=VARCHAR}, - - - POSITION = #{position,jdbcType=VARCHAR}, - - - COM_OPTION = #{comOption,jdbcType=VARCHAR}, - - - CZYID = #{czyid,jdbcType=BIGINT}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - where ID = #{id,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DmbPortDao.xml b/src/main/java/com/nis/web/dao/DmbPortDao.xml deleted file mode 100644 index 0d621a0e5..000000000 --- a/src/main/java/com/nis/web/dao/DmbPortDao.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID, ENTRANCE_ID, PORT_NAME, IS_USED, IP_DZ, PORT_EQUIPMENT, ODF_PORT, ADDR, CK_PORT, - CZYID, OP_TIME,LAST_UPDATE - - - - delete from DMB_PORT - where ID = #{id,jdbcType=BIGINT} - - - - insert into DMB_PORT (ID, ENTRANCE_ID, PORT_NAME, - IS_USED, IP_DZ, PORT_EQUIPMENT, - ODF_PORT, ADDR, CK_PORT, - CZYID, OP_TIME,LAST_UPDATE) - values (#{id,jdbcType=BIGINT}, #{entranceId,jdbcType=BIGINT}, #{portName,jdbcType=VARCHAR}, - #{isUsed,jdbcType=INTEGER}, #{ipDz,jdbcType=VARCHAR}, #{portEquipment,jdbcType=VARCHAR}, - #{odfPort,jdbcType=VARCHAR}, #{addr,jdbcType=VARCHAR}, #{ckPort,jdbcType=VARCHAR}, - #{czyid,jdbcType=BIGINT}, #{opTime,jdbcType=TIMESTAMP}, #{lastUpdate,jdbcType=TIMESTAMP}) - - - - update DMB_PORT - - - ENTRANCE_ID = #{entranceId,jdbcType=BIGINT}, - - - PORT_NAME = #{portName,jdbcType=VARCHAR}, - - - IS_USED = #{isUsed,jdbcType=INTEGER}, - - - IP_DZ = #{ipDz,jdbcType=VARCHAR}, - - - PORT_EQUIPMENT = #{portEquipment,jdbcType=VARCHAR}, - - - ODF_PORT = #{odfPort,jdbcType=VARCHAR}, - - - ADDR = #{addr,jdbcType=VARCHAR}, - - - CK_PORT = #{ckPort,jdbcType=VARCHAR}, - - - CZYID = #{czyid,jdbcType=BIGINT}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - where ID = #{id,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DnsFakeInfoDao.xml b/src/main/java/com/nis/web/dao/DnsFakeInfoDao.xml deleted file mode 100644 index c8c89e0df..000000000 --- a/src/main/java/com/nis/web/dao/DnsFakeInfoDao.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - - - - - - - - - - - - - ID, GROUP_ID, INFO, IS_VALID, OP_TIME, YL1, YL2, YL3, YL4, YL5,LAST_UPDATE - - - - delete from DNS_FAKE_INFO - where ID = #{id,jdbcType=BIGINT} - - - - insert into DNS_FAKE_INFO (ID, GROUP_ID, INFO, - IS_VALID, OP_TIME, YL1, - YL2, YL3, YL4, YL5,LAST_UPDATE - ) - values (#{id,jdbcType=BIGINT}, #{groupId,jdbcType=INTEGER}, #{info,jdbcType=VARCHAR}, - #{isValid,jdbcType=INTEGER}, #{opTime,jdbcType=TIMESTAMP}, #{yl1,jdbcType=INTEGER}, - #{yl2,jdbcType=INTEGER}, #{yl3,jdbcType=VARCHAR}, #{yl4,jdbcType=VARCHAR}, #{yl5,jdbcType=VARCHAR} - , #{lastUpdate,jdbcType=TIMESTAMP} - ) - - - insert into DNS_FAKE_INFO - - - ID, - - - GROUP_ID, - - - INFO, - - - IS_VALID, - - - OP_TIME, - - - YL1, - - - YL2, - - - YL3, - - - YL4, - - - YL5, - - - LAST_UPDATE, - - - - - #{id,jdbcType=BIGINT}, - - - #{groupId,jdbcType=INTEGER}, - - - #{info,jdbcType=VARCHAR}, - - - #{isValid,jdbcType=INTEGER}, - - - #{opTime,jdbcType=TIMESTAMP}, - - - #{yl1,jdbcType=INTEGER}, - - - #{yl2,jdbcType=INTEGER}, - - - #{yl3,jdbcType=VARCHAR}, - - - #{yl4,jdbcType=VARCHAR}, - - - #{yl5,jdbcType=VARCHAR}, - - - #{lastUpdate,jdbcType=TIMESTAMP}, - - - - - update DNS_FAKE_INFO - - - GROUP_ID = #{groupId,jdbcType=INTEGER}, - - - INFO = #{info,jdbcType=VARCHAR}, - - - IS_VALID = #{isValid,jdbcType=INTEGER}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - YL1 = #{yl1,jdbcType=INTEGER}, - - - YL2 = #{yl2,jdbcType=INTEGER}, - - - YL3 = #{yl3,jdbcType=VARCHAR}, - - - YL4 = #{yl4,jdbcType=VARCHAR}, - - - YL5 = #{yl5,jdbcType=VARCHAR}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - where ID = #{id,jdbcType=BIGINT} - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DnsFakeIpDao.xml b/src/main/java/com/nis/web/dao/DnsFakeIpDao.xml deleted file mode 100644 index de506c895..000000000 --- a/src/main/java/com/nis/web/dao/DnsFakeIpDao.xml +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, - groupId, - addrType, - srcIp, - maskSrcIp, - srcPort, - maskSrcPort, - dstIp, - maskDstIp, - dstPort, - maskDstPort, - protocol, - direction, - opTime, - isValid, - yl1, - yl2, - yl3, - yl4, - yl5, - lastUpdate - - - - - insert into DNS_FAKE_IP - - ID, - - GROUP_ID, - - - ADDR_TYPE, - - - SRC_IP, - - - MASK_SRC_IP, - - - SRC_PORT, - - - MASK_SRC_PORT, - - - DST_IP, - - - MASK_DST_IP, - - - DST_PORT, - - - MASK_DST_PORT, - - - PROTOCOL, - - - DIRECTION, - - - IS_VALID, - - - OP_TIME, - - - YL1, - - - YL2, - - - YL3, - - - YL4, - - - YL5, - - - LAST_UPDATE, - - - - #{id,jdbcType=BIGINT}, - - #{groupId,jdbcType=INTEGER}, - - - #{addrType,jdbcType=INTEGER}, - - - #{srcIp,jdbcType=VARCHAR}, - - - #{maskSrcIp,jdbcType=VARCHAR}, - - - #{srcPort,jdbcType=VARCHAR}, - - - #{maskSrcPort,jdbcType=VARCHAR}, - - - #{dstIp,jdbcType=VARCHAR}, - - - #{maskDstIp,jdbcType=VARCHAR}, - - - #{dstPort,jdbcType=VARCHAR}, - - - #{maskDstPort,jdbcType=VARCHAR}, - - - #{protocol,jdbcType=INTEGER}, - - - #{direction,jdbcType=INTEGER}, - - - #{isValid,jdbcType=INTEGER}, - - - #{opTime,jdbcType=TIMESTAMP}, - - - #{yl1,jdbcType=INTEGER}, - - - #{yl2,jdbcType=INTEGER}, - - - #{yl3,jdbcType=VARCHAR}, - - - #{yl4,jdbcType=VARCHAR}, - - - #{yl5,jdbcType=VARCHAR}, - - - #{lastUpdate,jdbcType=TIMESTAMP}, - - - - - UPDATE DNS_FAKE_IP - - - GROUP_ID=#{groupId,jdbcType=INTEGER}, - - - ADDR_TYPE=#{addrType,jdbcType=INTEGER}, - - - SRC_IP=#{srcIp,jdbcType=VARCHAR}, - - - MASK_SRC_IP=#{maskSrcIp,jdbcType=VARCHAR}, - - - SRC_PORT=#{srcPort,jdbcType=VARCHAR}, - - - MASK_SRC_PORT=#{maskSrcPort,jdbcType=VARCHAR}, - - - DST_IP=#{dstIp,jdbcType=VARCHAR}, - - - MASK_DST_IP=#{maskDstIp,jdbcType=VARCHAR}, - - - DST_PORT=#{dstPort,jdbcType=VARCHAR}, - - - MASK_DST_PORT=#{maskDstPort,jdbcType=VARCHAR}, - - - PROTOCOL=#{protocol,jdbcType=INTEGER}, - - - DIRECTION=#{direction,jdbcType=INTEGER}, - - - OP_TIME=#{opTime,jdbcType=TIMESTAMP}, - - - IS_VALID=#{isValid,jdbcType=INTEGER}, - - - YL1=#{yl1,jdbcType=INTEGER}, - - - YL2=#{yl2,jdbcType=INTEGER}, - - - YL3=#{yl3,jdbcType=VARCHAR}, - - - YL4=#{yl4,jdbcType=VARCHAR}, - - - YL5=#{yl5,jdbcType=VARCHAR}, - - - LAST_UPDATE=#{lastUpdate,jdbcType=TIMESTAMP}, - - - where ID = #{id ,jdbcType=BIGINT } - - - DELETE FROM DNS_FAKE_IP - WHERE ID = #{id,jdbcType=BIGINT} - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DnsGroupTypeDao.xml b/src/main/java/com/nis/web/dao/DnsGroupTypeDao.xml deleted file mode 100644 index b2bd8b8fb..000000000 --- a/src/main/java/com/nis/web/dao/DnsGroupTypeDao.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id, - groupId, - groupName, - resTypeId, - opTime, - isValid, - yl1, - yl2, - yl3, - yl4, - yl5, - lastUpdate - - - - - insert into DNS_GROUP_TYPE(ID,GROUP_ID,GROUP_NAME,RES_TYPE_ID,OP_TIME,IS_VALID,YL1,YL2,YL3,YL4,YL5,LAST_UPDATE) - values (#{id},#{groupId},#{groupName},#{resTypeId},#{opTime},#{isValid},#{yl1},#{yl2},#{yl3},#{yl4},#{yl5},#{lastUpdate}) - - - UPDATE DNS_GROUP_TYPE - - - GROUP_ID=#{groupId,jdbcType=INTEGER}, - - - GROUP_NAME=#{groupName,jdbcType=VARCHAR}, - - - RES_TYPE_ID=#{resTypeId,jdbcType=INTEGER}, - - - OP_TIME=#{opTime,jdbcType=TIMESTAMP}, - - - IS_VALID=#{isValid,jdbcType=INTEGER}, - - - YL1=#{yl1,jdbcType=INTEGER}, - - - YL2=#{yl2,jdbcType=INTEGER}, - - - YL3=#{yl3,jdbcType=VARCHAR}, - - - YL4=#{yl4,jdbcType=VARCHAR}, - - - YL5=#{yl5,jdbcType=VARCHAR}, - - - LAST_UPDATE=#{lastUpdate,jdbcType=TIMESTAMP}, - - - where ID = #{id ,jdbcType=BIGINT } - - - DELETE FROM DNS_GROUP_TYPE - WHERE ID = #{id,jdbcType=BIGINT} - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/DnsResponseStrategyDao.xml b/src/main/java/com/nis/web/dao/DnsResponseStrategyDao.xml deleted file mode 100644 index 254aa82a8..000000000 --- a/src/main/java/com/nis/web/dao/DnsResponseStrategyDao.xml +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id, - reqStrateId, - strateName, - resGroupOneId, - resGroupOneNum, - resGroupTwoId, - resGroupTwoNum, - resGroupThreeId, - resGroupThreeNum, - resGroupFourId, - resGroupFourNum, - resGroupFiveId, - resGroupFiveNum, - authGroup, - addGroup, - opTime, - isValid, - yl1, - yl2, - yl3, - yl4, - yl5, - lastUpdate, - minTtl, - maxTtl - - - - - - insert into DNS_RESPONSE_STRATEGY - - ID, - - REQ_STRATE_ID, - - - STRATE_NAME, - - - RES_GROUP_1_ID, - - - RES_GROUP_1_NUM, - - - RES_GROUP_2_ID, - - - RES_GROUP_2_NUM, - - - RES_GROUP_3_ID, - - - RES_GROUP_3_NUM, - - - RES_GROUP_4_ID, - - - RES_GROUP_4_NUM, - - - RES_GROUP_5_ID, - - - RES_GROUP_5_NUM, - - - AUTH_GROUP, - - - ADD_GROUP, - - - OP_TIME, - - - IS_VALID, - - - YL1, - - - YL2, - - - YL3, - - - YL4, - - - YL5, - - - LAST_UPDATE, - - - MIN_TTL, - - - MAX_TTL, - - - - #{id,jdbcType=BIGINT}, - - #{reqStrateId,jdbcType=INTEGER}, - - - #{strateName,jdbcType=VARCHAR}, - - - #{resGroupOneId,jdbcType=INTEGER}, - - - #{resGroupOneNum,jdbcType=INTEGER}, - - - #{resGroupTwoId,jdbcType=INTEGER}, - - - #{resGroupTwoNum,jdbcType=INTEGER}, - - - #{resGroupThreeId,jdbcType=INTEGER}, - - - #{resGroupThreeNum,jdbcType=INTEGER}, - - - #{resGroupFourId,jdbcType=INTEGER}, - - - #{resGroupFourNum,jdbcType=INTEGER}, - - - #{resGroupFiveId,jdbcType=INTEGER}, - - - #{resGroupFiveNum,jdbcType=INTEGER}, - - - #{authGroup,jdbcType=INTEGER}, - - - #{addGroup,jdbcType=INTEGER}, - - - #{opTime,jdbcType=TIMESTAMP}, - - - #{isValid,jdbcType=INTEGER}, - - - #{yl1,jdbcType=INTEGER}, - - - #{yl2,jdbcType=INTEGER}, - - - #{yl3,jdbcType=VARCHAR}, - - - #{yl4,jdbcType=VARCHAR}, - - - #{yl5,jdbcType=VARCHAR}, - - - #{lastUpdate,jdbcType=TIMESTAMP}, - - - #{minTtl,jdbcType=INTEGER}, - - - #{maxTtl,jdbcType=INTEGER}, - - - - - - UPDATE DNS_RESPONSE_STRATEGY - - - REQ_STRATE_ID=#{reqStrateId,jdbcType=INTEGER}, - - - STRATE_NAME=#{strateName,jdbcType=VARCHAR}, - - - RES_GROUP_1_ID=#{resGroupOneId,jdbcType=INTEGER}, - - - RES_GROUP_1_NUM=#{resGroupOneNum,jdbcType=INTEGER}, - - - RES_GROUP_2_ID=#{resGroupTwoId,jdbcType=INTEGER}, - - - RES_GROUP_2_NUM=#{resGroupTwoNum,jdbcType=INTEGER}, - - - RES_GROUP_3_ID=#{resGroupThreeId,jdbcType=INTEGER}, - - - RES_GROUP_3_NUM=#{resGroupThreeNum,jdbcType=INTEGER}, - - - RES_GROUP_4_ID=#{resGroupFourId,jdbcType=INTEGER}, - - - RES_GROUP_4_NUM=#{resGroupFourNum,jdbcType=INTEGER}, - - - RES_GROUP_5_ID=#{resGroupFiveId,jdbcType=INTEGER}, - - - RES_GROUP_5_NUM=#{resGroupFiveNum,jdbcType=INTEGER}, - - - AUTH_GROUP=#{authGroup,jdbcType=INTEGER}, - - - ADD_GROUP=#{addGroup,jdbcType=INTEGER}, - - - OP_TIME=#{opTime,jdbcType=TIMESTAMP}, - - - IS_VALID=#{isValid,jdbcType=INTEGER}, - - - YL1=#{yl1,jdbcType=INTEGER}, - - - YL2=#{yl2,jdbcType=INTEGER}, - - - YL3=#{yl3,jdbcType=VARCHAR}, - - - YL4=#{yl4,jdbcType=VARCHAR}, - - - YL5=#{yl5,jdbcType=VARCHAR}, - - - LAST_UPDATE=#{lastUpdate,jdbcType=TIMESTAMP}, - - - MIN_TTL=#{minTtl,jdbcType=INTEGER}, - - - MAX_TTL=#{maxTtl,jdbcType=INTEGER}, - - - where ID = #{id ,jdbcType=BIGINT } - - - DELETE FROM DNS_RESPONSE_STRATEGY - WHERE ID = #{id,jdbcType=BIGINT} - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/EncryptProtoRandomDao.xml b/src/main/java/com/nis/web/dao/EncryptProtoRandomDao.xml deleted file mode 100644 index c753d2783..000000000 --- a/src/main/java/com/nis/web/dao/EncryptProtoRandomDao.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - ID, RANDOM_VALUE, PROTO, OP_TIME, IS_VALID, PROC_SEQ, LAST_UPDATE - - - - delete from ENCRYPT_PROTO_RANDOM - where ID = #{id,jdbcType=BIGINT} - - - - - insert into ENCRYPT_PROTO_RANDOM - - ID, - - RANDOM_VALUE, - - - PROTO, - - - OP_TIME, - - - IS_VALID, - - - LAST_UPDATE, - - - - #{id,jdbcType=BIGINT}, - - #{randomValue,jdbcType=INTEGER}, - - - #{proto,jdbcType=INTEGER}, - - - #{opTime,jdbcType=TIMESTAMP}, - - - #{isValid,jdbcType=INTEGER}, - - - #{lastUpdate,jdbcType=TIMESTAMP}, - - - - - update ENCRYPT_PROTO_RANDOM - - - RANDOM_VALUE = #{randomValue,jdbcType=INTEGER}, - - - PROTO = #{proto,jdbcType=INTEGER}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - IS_VALID = #{isValid,jdbcType=INTEGER}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - where ID = #{id,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/FakeIpConfigCompileDao.xml b/src/main/java/com/nis/web/dao/FakeIpConfigCompileDao.xml deleted file mode 100644 index c597eb51a..000000000 --- a/src/main/java/com/nis/web/dao/FakeIpConfigCompileDao.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - COMPILE_ID, SERVICE, ACTION, DO_BLACKLIST, DO_LOG, EFFECTIVE_RANGE, USER_REGION, - IS_VALID, OP_TIME, GROUP_NUM,LAST_UPDATE,ACTIVE_SYS - - - - delete from FAKE_IP_CONFIG_COMPILE - where COMPILE_ID = #{compileId,jdbcType=BIGINT} - - - - insert into FAKE_IP_CONFIG_COMPILE (COMPILE_ID, SERVICE, ACTION, - DO_BLACKLIST, DO_LOG, EFFECTIVE_RANGE, - USER_REGION, IS_VALID, OP_TIME, - GROUP_NUM,LAST_UPDATE,ACTIVE_SYS) - values (#{compileId,jdbcType=BIGINT}, #{service,jdbcType=INTEGER}, #{action,jdbcType=INTEGER}, - #{doBlacklist,jdbcType=INTEGER}, #{doLog,jdbcType=INTEGER}, #{effectiveRange,jdbcType=VARCHAR}, - #{userRegion,jdbcType=VARCHAR}, #{isValid,jdbcType=INTEGER}, #{opTime,jdbcType=TIMESTAMP}, - #{groupNum,jdbcType=INTEGER}, #{lastUpdate,jdbcType=TIMESTAMP},#{activeSys,jdbcType=INTEGER}) - - - - update FAKE_IP_CONFIG_COMPILE - - - SERVICE = #{service,jdbcType=INTEGER}, - - - ACTION = #{action,jdbcType=INTEGER}, - - - DO_BLACKLIST = #{doBlacklist,jdbcType=INTEGER}, - - - DO_LOG = #{doLog,jdbcType=INTEGER}, - - - EFFECTIVE_RANGE = #{effectiveRange,jdbcType=VARCHAR}, - - - USER_REGION = #{userRegion,jdbcType=VARCHAR}, - - - IS_VALID = #{isValid,jdbcType=INTEGER}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - GROUP_NUM = #{groupNum,jdbcType=INTEGER}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - ACTIVE_SYS = #{activeSys,jdbcType=INTEGER}, - - - where COMPILE_ID = #{compileId,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/FakeIpConfigGroupDao.xml b/src/main/java/com/nis/web/dao/FakeIpConfigGroupDao.xml deleted file mode 100644 index 658a324b6..000000000 --- a/src/main/java/com/nis/web/dao/FakeIpConfigGroupDao.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - insert into FAKE_IP_CONFIG_GROUP (GROUP_ID, COMPILE_ID, IS_VALID, - OP_TIME,LAST_UPDATE,ID) - values (#{groupId,jdbcType=BIGINT}, #{compileId,jdbcType=BIGINT}, #{isValid,jdbcType=INTEGER}, - #{opTime,jdbcType=TIMESTAMP},#{lastUpdate,jdbcType=TIMESTAMP},SEQ_CONFIG_GROUP.Nextval) - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/FwqInfoDao.xml b/src/main/java/com/nis/web/dao/FwqInfoDao.xml deleted file mode 100644 index b25886aef..000000000 --- a/src/main/java/com/nis/web/dao/FwqInfoDao.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - ID, NAME, ENTRANCE_ID, CZYID, OP_TIME,LAST_UPDATE - - - - delete from FWQ_INFO - where ID = #{id,jdbcType=BIGINT} - - - - insert into FWQ_INFO (ID, NAME, ENTRANCE_ID, - CZYID, OP_TIME,LAST_UPDATE) - values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{entranceId,jdbcType=BIGINT}, - #{czyid,jdbcType=BIGINT}, #{opTime,jdbcType=TIMESTAMP},#{lastUpdate,jdbcType=TIMESTAMP}) - - - - update FWQ_INFO - - - NAME = #{name,jdbcType=VARCHAR}, - - - ENTRANCE_ID = #{entranceId,jdbcType=BIGINT}, - - - CZYID = #{czyid,jdbcType=BIGINT}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - where ID = #{id,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/IntervalTimeSearchDao.xml b/src/main/java/com/nis/web/dao/IntervalTimeSearchDao.xml deleted file mode 100644 index 65fb6f24c..000000000 --- a/src/main/java/com/nis/web/dao/IntervalTimeSearchDao.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - CFG_ID,SERVICE,ACTION,OP_TIME - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/IpLocationPublicMapper.xml b/src/main/java/com/nis/web/dao/IpLocationPublicMapper.xml deleted file mode 100644 index b816d2585..000000000 --- a/src/main/java/com/nis/web/dao/IpLocationPublicMapper.xml +++ /dev/null @@ -1,238 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - ID, IP_START, IP_END, IP_START_NUM, IP_END_NUM, CONTINENT, COUNTRY, PROVINCE, CITY, - DISTRICT, DESCRIPTION, ISP, AREA_CODE, COUNTRY_ENGLISH, COUNTRY_CODE, LONGITUDE, - LATITUDE - - - - delete from IP_LOCATION_PUBLIC - where ID = #{id,jdbcType=BIGINT} - - - - SELECT SEQ_IP_LOCATION_PUBLIC.Nextval as ID from DUAL - - insert into IP_LOCATION_PUBLIC (ID, IP_START, IP_END, - IP_START_NUM, IP_END_NUM, CONTINENT, - COUNTRY, PROVINCE, CITY, - DISTRICT, DESCRIPTION, ISP, - AREA_CODE, COUNTRY_ENGLISH, COUNTRY_CODE, - LONGITUDE, LATITUDE) - values (#{id,jdbcType=BIGINT}, #{ipStart,jdbcType=VARCHAR}, #{ipEnd,jdbcType=VARCHAR}, - #{ipStartNum,jdbcType=BIGINT}, #{ipEndNum,jdbcType=BIGINT}, #{continent,jdbcType=VARCHAR}, - #{country,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, - #{district,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{isp,jdbcType=VARCHAR}, - #{areaCode,jdbcType=VARCHAR}, #{countryEnglish,jdbcType=VARCHAR}, #{countryCode,jdbcType=VARCHAR}, - #{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}) - - - insert into IP_LOCATION_PUBLIC - - - ID, - - - IP_START, - - - IP_END, - - - IP_START_NUM, - - - IP_END_NUM, - - - CONTINENT, - - - COUNTRY, - - - PROVINCE, - - - CITY, - - - DISTRICT, - - - DESCRIPTION, - - - ISP, - - - AREA_CODE, - - - COUNTRY_ENGLISH, - - - COUNTRY_CODE, - - - LONGITUDE, - - - LATITUDE, - - - - - #{id,jdbcType=BIGINT}, - - - #{ipStart,jdbcType=VARCHAR}, - - - #{ipEnd,jdbcType=VARCHAR}, - - - #{ipStartNum,jdbcType=BIGINT}, - - - #{ipEndNum,jdbcType=BIGINT}, - - - #{continent,jdbcType=VARCHAR}, - - - #{country,jdbcType=VARCHAR}, - - - #{province,jdbcType=VARCHAR}, - - - #{city,jdbcType=VARCHAR}, - - - #{district,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{isp,jdbcType=VARCHAR}, - - - #{areaCode,jdbcType=VARCHAR}, - - - #{countryEnglish,jdbcType=VARCHAR}, - - - #{countryCode,jdbcType=VARCHAR}, - - - #{longitude,jdbcType=VARCHAR}, - - - #{latitude,jdbcType=VARCHAR}, - - - - - update IP_LOCATION_PUBLIC - - - IP_START = #{ipStart,jdbcType=VARCHAR}, - - - IP_END = #{ipEnd,jdbcType=VARCHAR}, - - - IP_START_NUM = #{ipStartNum,jdbcType=BIGINT}, - - - IP_END_NUM = #{ipEndNum,jdbcType=BIGINT}, - - - CONTINENT = #{continent,jdbcType=VARCHAR}, - - - COUNTRY = #{country,jdbcType=VARCHAR}, - - - PROVINCE = #{province,jdbcType=VARCHAR}, - - - CITY = #{city,jdbcType=VARCHAR}, - - - DISTRICT = #{district,jdbcType=VARCHAR}, - - - DESCRIPTION = #{description,jdbcType=VARCHAR}, - - - ISP = #{isp,jdbcType=VARCHAR}, - - - AREA_CODE = #{areaCode,jdbcType=VARCHAR}, - - - COUNTRY_ENGLISH = #{countryEnglish,jdbcType=VARCHAR}, - - - COUNTRY_CODE = #{countryCode,jdbcType=VARCHAR}, - - - LONGITUDE = #{longitude,jdbcType=VARCHAR}, - - - LATITUDE = #{latitude,jdbcType=VARCHAR}, - - - where ID = #{id,jdbcType=BIGINT} - - - update IP_LOCATION_PUBLIC - set IP_START = #{ipStart,jdbcType=VARCHAR}, - IP_END = #{ipEnd,jdbcType=VARCHAR}, - IP_START_NUM = #{ipStartNum,jdbcType=BIGINT}, - IP_END_NUM = #{ipEndNum,jdbcType=BIGINT}, - CONTINENT = #{continent,jdbcType=VARCHAR}, - COUNTRY = #{country,jdbcType=VARCHAR}, - PROVINCE = #{province,jdbcType=VARCHAR}, - CITY = #{city,jdbcType=VARCHAR}, - DISTRICT = #{district,jdbcType=VARCHAR}, - DESCRIPTION = #{description,jdbcType=VARCHAR}, - ISP = #{isp,jdbcType=VARCHAR}, - AREA_CODE = #{areaCode,jdbcType=VARCHAR}, - COUNTRY_ENGLISH = #{countryEnglish,jdbcType=VARCHAR}, - COUNTRY_CODE = #{countryCode,jdbcType=VARCHAR}, - LONGITUDE = #{longitude,jdbcType=VARCHAR}, - LATITUDE = #{latitude,jdbcType=VARCHAR} - where ID = #{id,jdbcType=BIGINT} - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/IpRegionDao.xml b/src/main/java/com/nis/web/dao/IpRegionDao.xml deleted file mode 100644 index 5a46d22cc..000000000 --- a/src/main/java/com/nis/web/dao/IpRegionDao.xml +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - REGION_ID,GROUP_ID, - ADDR_TYPE,SRC_IP,MASK_SRC_IP,SRC_PORT,MASK_SRC_PORT,DST_IP, - MASK_DST_IP,DST_PORT,MASK_DST_PORT,PROTOCOL,DIRECTION,IS_VALID,OP_TIME,LAST_UPDATE,PROC_SEQ - - - - - - - - - - - insert into ${tableName} - (REGION_ID, - GROUP_ID, - ADDR_TYPE, - SRC_IP, - MASK_SRC_IP, - SRC_PORT, - MASK_SRC_PORT, - DST_IP, - MASK_DST_IP, - DST_PORT, - MASK_DST_PORT, - PROTOCOL, - DIRECTION, - IS_VALID, - OP_TIME,LAST_UPDATE - - ) - - select - #{item.regionId,jdbcType=BIGINT}, - #{item.groupId,jdbcType=BIGINT}, - #{item.addrType,jdbcType=INTEGER}, - #{item.srcIp,jdbcType=VARCHAR}, - #{item.maskSrcIp,jdbcType=VARCHAR}, - #{item.srcPort,jdbcType=VARCHAR}, - #{item.maskSrcPort,jdbcType=VARCHAR}, - #{item.dstIp,jdbcType=VARCHAR}, - #{item.maskDstIp,jdbcType=VARCHAR}, - #{item.dstPort,jdbcType=VARCHAR}, - #{item.maskDstPort,jdbcType=VARCHAR}, - #{item.protocol,jdbcType=INTEGER}, - #{item.direction,jdbcType=INTEGER}, - #{item.isValid,jdbcType=INTEGER}, - #{item.opTime,jdbcType=TIMESTAMP}, - sysdate - - from dual - - - - - - - - - - - - - - - - - - - - - - insert into ${tableName} - (REGION_ID, - GROUP_ID, - ADDR_TYPE, - SRC_IP, - MASK_SRC_IP, - SRC_PORT, - MASK_SRC_PORT, - DST_IP, - MASK_DST_IP, - DST_PORT, - MASK_DST_PORT, - PROTOCOL, - DIRECTION, - IS_VALID, - - LAST_UPDATE, - - OP_TIME - ) - values - (#{regionId,jdbcType=BIGINT}, - #{groupId,jdbcType=BIGINT}, - #{addrType,jdbcType=INTEGER}, - #{srcIp,jdbcType=VARCHAR}, - #{maskSrcIp,jdbcType=VARCHAR}, - #{srcPort,jdbcType=VARCHAR}, - #{maskSrcPort,jdbcType=VARCHAR}, - #{dstIp,jdbcType=VARCHAR}, - #{maskDstIp,jdbcType=VARCHAR}, - #{dstPort,jdbcType=VARCHAR}, - #{maskDstPort,jdbcType=VARCHAR}, - #{protocol,jdbcType=INTEGER}, - #{direction,jdbcType=INTEGER}, - #{isValid,jdbcType=INTEGER}, - - #{lastUpdate,jdbcType=TIMESTAMP}, - - #{opTime,jdbcType=TIMESTAMP} - ) - - - - UPDATE ${tableName} - - - IS_VALID=#{isValid,jdbcType=INTEGER}, - - - OP_TIME=#{opTime,jdbcType=TIMESTAMP}, - - - LAST_UPDATE=#{lastUpdate,jdbcType=TIMESTAMP}, - - - where REGION_ID=#{regionId} - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/JdjInfoDao.xml b/src/main/java/com/nis/web/dao/JdjInfoDao.xml deleted file mode 100644 index 04a6a0951..000000000 --- a/src/main/java/com/nis/web/dao/JdjInfoDao.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - - - - ID, NAME, FWQ_ID, JC_IP, FD_IP, CZYID, OP_TIME,LAST_UPDATE - - - - delete from JDJ_INFO - where ID = #{id,jdbcType=BIGINT} - - - - - insert into JDJ_INFO - - ID, - - NAME, - - - FWQ_ID, - - - JC_IP, - - - FD_IP, - - - CZYID, - - - OP_TIME, - - - LAST_UPDATE, - - - - #{id,jdbcType=BIGINT}, - - #{name,jdbcType=VARCHAR}, - - - #{fwqId,jdbcType=BIGINT}, - - - #{jcIp,jdbcType=VARCHAR}, - - - #{fdIp,jdbcType=VARCHAR}, - - - #{czyid,jdbcType=BIGINT}, - - - #{opTime,jdbcType=TIMESTAMP}, - - - #{lastUpdate,jdbcType=TIMESTAMP}, - - - - - - update JDJ_INFO - - - NAME = #{name,jdbcType=VARCHAR}, - - - FWQ_ID = #{fwqId,jdbcType=BIGINT}, - - - JC_IP = #{jcIp,jdbcType=VARCHAR}, - - - FD_IP = #{fdIp,jdbcType=VARCHAR}, - - - CZYID = #{czyid,jdbcType=BIGINT}, - - - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - - LAST_UPDATE = #{lastUpdate,jdbcType=TIMESTAMP}, - - - where ID = #{id,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/NumRegionDao.xml b/src/main/java/com/nis/web/dao/NumRegionDao.xml deleted file mode 100644 index bcf2d06ef..000000000 --- a/src/main/java/com/nis/web/dao/NumRegionDao.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - REGION_ID,GROUP_ID,LOW_BOUNDARY,UP_BOUNDARY,IS_VALID,OP_TIME,LAST_UPDATE,PROC_SEQ - - - - - - - - - - insert into ${tableName} - (REGION_ID , - GROUP_ID , - LOW_BOUNDARY , - UP_BOUNDARY , - IS_VALID , - OP_TIME,LAST_UPDATE - - ) - - select - #{item.regionId,jdbcType=BIGINT}, - #{item.groupId,jdbcType=BIGINT}, - #{item.lowBoundary,jdbcType=BIGINT}, - #{item.upBoundary,jdbcType=BIGINT}, - #{item.isValid,jdbcType=INTEGER}, - #{item.opTime,jdbcType=TIMESTAMP}, - sysdate - - from dual - - - - - - - - insert into ${tableName} - (REGION_ID , - GROUP_ID , - LOW_BOUNDARY , - UP_BOUNDARY , - IS_VALID , - - LAST_UPDATE, - - OP_TIME - ) - values - (#{regionId,jdbcType=BIGINT}, - #{groupId,jdbcType=BIGINT}, - #{lowBoundary,jdbcType=BIGINT}, - #{upBoundary,jdbcType=BIGINT}, - #{isValid,jdbcType=INTEGER}, - - #{lastUpdate,jdbcType=TIMESTAMP}, - - #{opTime,jdbcType=TIMESTAMP} - ) - - - - - UPDATE ${tableName} - - - IS_VALID=#{isValid , jdbcType=INTEGER }, - - - OP_TIME= #{ opTime , jdbcType=TIMESTAMP }, - - - LAST_UPDATE=#{lastUpdate,jdbcType=TIMESTAMP}, - - - where REGION_ID=#{regionId} - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml index b95909ee0..6f19c57f6 100644 --- a/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml +++ b/src/main/java/com/nis/web/dao/ServicesRequestLogDao.xml @@ -20,58 +20,7 @@ REQUEST_TIME,REQUEST_IP, CONSUMER_TIME,BUSINESS_CODE,EXCEPTION_INFO,SERVER_IP - + diff --git a/src/main/java/com/nis/web/dao/StrRegionDao.xml b/src/main/java/com/nis/web/dao/StrRegionDao.xml deleted file mode 100644 index c8b5f55c7..000000000 --- a/src/main/java/com/nis/web/dao/StrRegionDao.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - REGION_ID, - GROUP_ID, - KEYWORDS, - EXPR_TYPE, - MATCH_METHOD, - IS_HEXBIN, - IS_VALID, - OP_TIME,LAST_UPDATE,PROC_SEQ - - - REGION_ID, - GROUP_ID, - DISTRICT, - KEYWORDS, - EXPR_TYPE, - MATCH_METHOD, - IS_HEXBIN, - IS_VALID, - OP_TIME,LAST_UPDATE,PROC_SEQ - - - - - - - - - insert into ${tableName} - (REGION_ID, - GROUP_ID, - KEYWORDS, - EXPR_TYPE, - MATCH_METHOD , - IS_HEXBIN, - IS_VALID, - OP_TIME,LAST_UPDATE - - ) - - select - #{item.regionId,jdbcType=BIGINT}, - #{item.groupId,jdbcType=BIGINT}, - #{item.keywords,jdbcType=VARCHAR}, - #{item.exprType,jdbcType=INTEGER}, - #{item.matchMethod,jdbcType=INTEGER}, - #{item.isHexbin,jdbcType=INTEGER}, - #{item.isValid,jdbcType=INTEGER}, - #{item.opTime,jdbcType=TIMESTAMP}, - sysdate - - from dual - - - - - - insert into ${tableName} - (REGION_ID, - GROUP_ID, - DISTRICT, - KEYWORDS, - EXPR_TYPE, - MATCH_METHOD , - IS_HEXBIN, - IS_VALID, - OP_TIME,LAST_UPDATE - ) - - select - #{item.regionId,jdbcType=BIGINT}, - #{item.groupId,jdbcType=BIGINT}, - #{item.district,jdbcType=VARCHAR}, - #{item.keywords,jdbcType=VARCHAR}, - #{item.exprType,jdbcType=INTEGER}, - #{item.matchMethod,jdbcType=INTEGER}, - #{item.isHexbin,jdbcType=INTEGER}, - #{item.isValid,jdbcType=INTEGER}, - #{item.opTime,jdbcType=TIMESTAMP}, - - sysdate - from dual - - - - - - - - UPDATE ${tableName} - - - IS_VALID=#{isValid , jdbcType=INTEGER }, - - - OP_TIME= #{ opTime , jdbcType=TIMESTAMP }, - - - LAST_UPDATE=#{lastUpdate,jdbcType=TIMESTAMP}, - - - where REGION_ID=#{regionId} - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/SystemFunStatusDao.xml b/src/main/java/com/nis/web/dao/SystemFunStatusDao.xml deleted file mode 100644 index c3f180e4f..000000000 --- a/src/main/java/com/nis/web/dao/SystemFunStatusDao.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - insert into SYSTEM_FUN_STATUS - - ID, - FUNCTION, - BACK_DATA, - EFFECTIVE_RANGE, - ACTIVE_SYS, - IS_VALID, - OP_TIME, - - - #{id,jdbcType=BIGINT}, - #{function,jdbcType=BIGINT}, - #{backData,jdbcType=BIGINT}, - #{effectiveRange,jdbcType=VARCHAR}, - #{activeSys,jdbcType=INTEGER}, - #{isValid,jdbcType=INTEGER}, - #{opTime,jdbcType=TIMESTAMP}, - - - - - - update SYSTEM_FUN_STATUS - - FUNCTION = #{function,jdbcType=BIGINT}, - BACK_DATA = #{backData,jdbcType=BIGINT}, - EFFECTIVE_RANGE = #{effectiveRange,jdbcType=VARCHAR}, - ACTIVE_SYS = #{activeSys,jdbcType=INTEGER}, - IS_VALID = #{isValid,jdbcType=INTEGER}, - OP_TIME = #{opTime,jdbcType=TIMESTAMP}, - - where ID = #{id,jdbcType=BIGINT} - - - \ No newline at end of file diff --git a/src/main/resources/applicationContext-mybatis.xml b/src/main/resources/applicationContext-mybatis.xml index 9ad8c8a6d..3dfc4c187 100644 --- a/src/main/resources/applicationContext-mybatis.xml +++ b/src/main/resources/applicationContext-mybatis.xml @@ -78,165 +78,165 @@ - - + 检查数据库连接池中空闲连接的间隔时间，单位是分，默认值：240，如果要取消则设置为0 - + 连接池中未使用的链接最大存活时间，单位是分，默认值：60，如果要永远存活设置为0 - + 每个分区最大的连接数 - + 每个分区最小的连接数 - + 分区数 ，默认值2，最小1，推荐3-4，视应用而定 - + 每次去拿数据库连接的时候一次性要拿几个,默认值：2 - + 缓存prepared statements的大小，默认值：0 - + 数据源定义，采用BoneCP连接池 ,业务配置服务数据库 - + 检查数据库连接池中空闲连接的间隔时间，单位是分，默认值：240，如果要取消则设置为0 - + 连接池中未使用的链接最大存活时间，单位是分，默认值：60，如果要永远存活设置为0 - + 每个分区最大的连接数 - + 每个分区最小的连接数 - + 分区数 ，默认值2，最小1，推荐3-4，视应用而定 - + 每次去拿数据库连接的时候一次性要拿几个,默认值：2 - + 缓存prepared statements的大小，默认值：0 - + 数据源定义，采用BoneCP连接池 ,业务配置服务数据库 - + 检查数据库连接池中空闲连接的间隔时间，单位是分，默认值：240，如果要取消则设置为0 - + 连接池中未使用的链接最大存活时间，单位是分，默认值：60，如果要永远存活设置为0 - + 每个分区最大的连接数 - + 每个分区最小的连接数 - + 分区数 ，默认值2，最小1，推荐3-4，视应用而定 - + 每次去拿数据库连接的时候一次性要拿几个,默认值：2 - + 缓存prepared statements的大小，默认值：0 - + 数据源定义，采用BoneCP连接池 ,业务配置服务数据库 - + 检查数据库连接池中空闲连接的间隔时间，单位是分，默认值：240，如果要取消则设置为0 - + 连接池中未使用的链接最大存活时间，单位是分，默认值：60，如果要永远存活设置为0 - + 每个分区最大的连接数 - + 每个分区最小的连接数 - + 分区数 ，默认值2，最小1，推荐3-4，视应用而定 - + 每次去拿数据库连接的时候一次性要拿几个,默认值：2 - + 缓存prepared statements的大小，默认值：0 - + A版hive数据源定义，采用BoneCP连接池 ,业务配置服务数据库 - + 检查数据库连接池中空闲连接的间隔时间，单位是分，默认值：240，如果要取消则设置为0 - + 连接池中未使用的链接最大存活时间，单位是分，默认值：60，如果要永远存活设置为0 - + 每个分区最大的连接数 - + 每个分区最小的连接数 - + 分区数 ，默认值2，最小1，推荐3-4，视应用而定 - + 每次去拿数据库连接的时候一次性要拿几个,默认值：2 - + 缓存prepared statements的大小，默认值：0 - + B版hive数据源定义，采用BoneCP连接池 ,业务配置服务数据库 - + 检查数据库连接池中空闲连接的间隔时间，单位是分，默认值：240，如果要取消则设置为0 - + 连接池中未使用的链接最大存活时间，单位是分，默认值：60，如果要永远存活设置为0 - + 每个分区最大的连接数 - + 每个分区最小的连接数 - + 分区数 ，默认值2，最小1，推荐3-4，视应用而定 - + 每次去拿数据库连接的时候一次性要拿几个,默认值：2 - + 缓存prepared statements的大小，默认值：0 - + 数据源定义，采用BoneCP连接池 ,神通数据库 - + 检查数据库连接池中空闲连接的间隔时间，单位是分，默认值：240，如果要取消则设置为0 - + 连接池中未使用的链接最大存活时间，单位是分，默认值：60，如果要永远存活设置为0 - + 每个分区最大的连接数 - + 每个分区最小的连接数 - + 分区数 ，默认值2，最小1，推荐3-4，视应用而定 - + 每次去拿数据库连接的时候一次性要拿几个,默认值：2 - + 缓存prepared statements的大小，默认值：0 @@ -246,28 +246,28 @@ - + 测试数据源,后期会删除 - + 检查数据库连接池中空闲连接的间隔时间，单位是分，默认值：240，如果要取消则设置为0 - + 连接池中未使用的链接最大存活时间，单位是分，默认值：60，如果要永远存活设置为0 - + 每个分区最大的连接数 - + 每个分区最小的连接数 - + 分区数 ，默认值2，最小1，推荐3-4，视应用而定 - + 每次去拿数据库连接的时候一次性要拿几个,默认值：2 - + 缓存prepared statements的大小，默认值：0 - + --> @@ -277,15 +277,15 @@ - - + diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties index df116c85f..17006d37a 100644 --- a/src/main/resources/jdbc.properties +++ b/src/main/resources/jdbc.properties @@ -1,7 +1,7 @@ #jdbc for oracle #jdbc.driver=oracle.jdbc.driver.OracleDriver jdbc.devlop.driver=com.mysql.jdbc.Driver -jdbc.devlop.url=jdbc:mysql://10.0.6.100:3306/web_frame?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull +jdbc.devlop.url=jdbc:mysql://10.0.6.100:3306/gwall?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull jdbc.devlop.username=dfh jdbc.devlop.key=xLtQB+Bp6joOYrVIfBdrRA== jdbc.devlop.password=/+7+DgxK++ZaD1nIcRRmDg== diff --git a/src/main/resources/spring-mvc.xml b/src/main/resources/spring-mvc.xml index d21d78eb2..2e961f65c 100644 --- a/src/main/resources/spring-mvc.xml +++ b/src/main/resources/spring-mvc.xml @@ -50,7 +50,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index feaa89b0a..b24f2979e 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -15,8 +15,7 @@ ${fns:getStringProperty('productName','NIS')} @@ -30,7 +29,8 @@