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

Merge remote-tracking branch 'origin/Release-1.3' into Release-1.3

Browse Source
This commit is contained in:
doufenghu
2018-11-07 10:12:17 +08:00
parent 673fb33ba5 74a8cd2879
commit 9c8dd6853c
15 changed files with 144 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_3.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.3/jackson-annotations-2.9.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.3/jackson-annotations-2.9.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.9.3/jackson-annotations-2.9.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.3/jackson-core-2.9.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.3/jackson-core-2.9.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-core/2.9.3/jackson-core-2.9.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.3/jackson-databind-2.9.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.3/jackson-databind-2.9.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-databind/2.9.3/jackson-databind-2.9.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.9.3">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.9.3/jackson-module-jaxb-annotations-2.9.3.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.9.3/jackson-module-jaxb-annotations-2.9.3-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.9.3/jackson-module-jaxb-annotations-2.9.3-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_2.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.maxmind.db:maxmind-db:1.2.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/db/maxmind-db/1.2.2/maxmind-db-1.2.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/db/maxmind-db/1.2.2/maxmind-db-1.2.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/db/maxmind-db/1.2.2/maxmind-db-1.2.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_12_0.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.maxmind.geoip2:geoip2:2.12.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip2/geoip2/2.12.0/geoip2-2.12.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip2/geoip2/2.12.0/geoip2-2.12.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip2/geoip2/2.12.0/geoip2-2.12.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_maxmind_geoip_geoip_api_1_3_1.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.maxmind.geoip:geoip-api:1.3.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip/geoip-api/1.3.1/geoip-api-1.3.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip/geoip-api/1.3.1/geoip-api-1.3.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/maxmind/geoip/geoip-api/1.3.1/geoip-api-1.3.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_zdjizhi_galaxy_1_0.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.zdjizhi:galaxy:1.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/zdjizhi/galaxy/1.0/galaxy-1.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/zdjizhi/galaxy/1.0/galaxy-1.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/zdjizhi/galaxy/1.0/galaxy-1.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__commons_io_commons_io_2_2.xml generated Normal file
View File

@@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: commons-io:commons-io:2.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/commons-io/commons-io/2.2/commons-io-2.2-sources.jar!/" />
</SOURCES>
</library>
</component>

8
.idea/sqldialects.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SqlDialectMappings">
<file url="file://$PROJECT_DIR$/db/galaxy_user_mysql.sql" dialect="MySQL" />
<file url="file://$PROJECT_DIR$/db/init/galaxy_stru_mysql.sql" dialect="MySQL" />
<file url="file://$PROJECT_DIR$/db/test/galaxy_test_mysql.sql" dialect="MySQL" />
</component>
</project>

36
pom.xml
View File

@@ -33,42 +33,6 @@
<build> <build>
<resources>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.xsd</include>
<include>**/*.yml</include>
</includes>
<filtering>true</filtering>
</resource>
<resource>
<directory>src/main/resources</directory>
<filtering>false</filtering>
<includes>
<include>**/*.mmdb</include>
<include>**/*.dat</include>
<include>**/*.sh</include>
<include>**/*.bat</include>
<include>**/*.sql</include>
</includes>
</resource>
<resource>
<directory>src/main/java</directory>
<includes>
<include>**/*.properties</include>
<include>**/*.xml</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
<plugins> <plugins>
<!-- <plugin> --> <!-- <plugin> -->
<!-- <groupId>org.mybatis.generator</groupId> --> <!-- <groupId>org.mybatis.generator</groupId> -->

2
src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java
View File

@@ -433,7 +433,7 @@ public class SingleDimensionReport extends BaseRestController {
String groupType ="hour"; String groupType ="hour";
if (!(StringUtil.isEmpty(ntcRadiusReport.getSearchReportStartTime())&&StringUtil.isEmpty(ntcRadiusReport.getSearchReportEndTime()))) { if (!(StringUtil.isEmpty(ntcRadiusReport.getSearchReportStartTime())&&StringUtil.isEmpty(ntcRadiusReport.getSearchReportEndTime()))) {
Long times = DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportEndTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS)-DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportStartTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS); Long times = DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportEndTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS)-DateUtil.convertStringToTimestamp(ntcRadiusReport.getSearchReportStartTime(), DateUtil.YYYY_MM_DD_HH24_MM_SS);
if (times>0&&times<=30*24*60*60L) { if (times>24*60*60L&&times<=30*24*60*60L) {
groupType ="day"; groupType ="day";
}else if(times>30*24*60*60L){ }else if(times>30*24*60*60L){
groupType ="month"; groupType ="month";

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

@@ -645,12 +645,8 @@
<select id="findNtcRadiusReport" parameterType="com.nis.domain.restful.NtcRadiusReport" <select id="findNtcRadiusReport" parameterType="com.nis.domain.restful.NtcRadiusReport"
resultMap="NtcRadiusReportMap"> resultMap="NtcRadiusReportMap">
SELECT SELECT
<if test="searchAccount != null and searchAccount !=''">
nas_ip, nas_ip,
</if>
<if test="searchNasIp != null and searchNasIp !=''">
account, account,
</if>
<choose> <choose>
<when test="groupType!= null and groupType!='' and groupType == 'day'"> <when test="groupType!= null and groupType!='' and groupType == 'day'">
DATE_FORMAT(REPORT_TIME, '%Y-%m-%d') DATE_FORMAT(REPORT_TIME, '%Y-%m-%d')
@@ -665,10 +661,10 @@
REPORT_TIME,sum(num) num REPORT_TIME,sum(num) num
FROM ntc_radius_report FROM ntc_radius_report
<where> <where>
<if test="searchAccount != null and searchAccount !=''"> <if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 2 and searchAccount != null and searchAccount !=''">
<![CDATA[AND account =#{searchAccount}]]> <![CDATA[AND account =#{searchAccount}]]>
</if> </if>
<if test="searchNasIp != null and searchNasIp !=''"> <if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 3 and searchNasIp != null and searchNasIp !=''">
<![CDATA[AND nas_ip =#{searchNasIp}]]> <![CDATA[AND nas_ip =#{searchNasIp}]]>
</if> </if>
<choose> <choose>
@@ -682,11 +678,11 @@
</where> </where>
GROUP BY GROUP BY
<if test="searchAccount != null and searchAccount !=''"> <if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 2">
<![CDATA[nas_ip]]> <![CDATA[account,nas_ip]]>
</if> </if>
<if test="searchNasIp != null and searchNasIp !=''"> <if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 3 ">
<![CDATA[account]]> <![CDATA[nas_ip,account]]>
</if> </if>
, ,
<choose> <choose>

12
src/main/resources/applicationContext-redis.xml
View File

@@ -61,16 +61,16 @@
<constructor-arg index="1" value="${redis.cluster.port3}"></constructor-arg> <constructor-arg index="1" value="${redis.cluster.port3}"></constructor-arg>
</bean> </bean>
<bean class="redis.clients.jedis.HostAndPort"> <bean class="redis.clients.jedis.HostAndPort">
<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg> <constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>
<constructor-arg index="1" value="${redis.cluster.port4}"></constructor-arg> <constructor-arg index="1" value="${redis.cluster.port1}"></constructor-arg>
</bean> </bean>
<bean class="redis.clients.jedis.HostAndPort"> <bean class="redis.clients.jedis.HostAndPort">
<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg> <constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>
<constructor-arg index="1" value="${redis.cluster.port5}"></constructor-arg> <constructor-arg index="1" value="${redis.cluster.port2}"></constructor-arg>
</bean> </bean>
<bean class="redis.clients.jedis.HostAndPort"> <bean class="redis.clients.jedis.HostAndPort">
<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg> <constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>
<constructor-arg index="1" value="${redis.cluster.port6}"></constructor-arg> <constructor-arg index="1" value="${redis.cluster.port3}"></constructor-arg>
</bean> </bean>
</set> </set>
</constructor-arg> </constructor-arg>

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

@@ -168,11 +168,9 @@ redis.timeout=100000
#一般当此值设置过大时，容易报：Too many Cluster redirections #一般当此值设置过大时，容易报：Too many Cluster redirections
redis.maxRedirects=3 redis.maxRedirects=3
#3A-redis集群配置 #3A-redis集群配置,如果需要执行数据同步需要在集群中执行LPUSH SyncRedisToCluster "1"
redis.cluster.host1=192.168.10.205 redis.cluster.host1=192.168.10.192
redis.cluster.port1:7031 redis.cluster.host2=192.168.10.193
redis.cluster.port2:7032 redis.cluster.port1=7001
redis.cluster.port3:7033 redis.cluster.port2=7002
redis.cluster.port4:7034 redis.cluster.port3=7003
redis.cluster.port5:7035
redis.cluster.port6:7036