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

15 files changed, 144 insertions, 61 deletions

diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_3.xml
new file mode 100644
index 0000000..17e2ada
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_9_3.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml
new file mode 100644
index 0000000..4110fd4
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_9_3.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml
new file mode 100644
index 0000000..0bc8068
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_9_3.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml
new file mode 100644
index 0000000..096aa2c
--- /dev/null
+++ b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_9_3.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_2.xml b/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_2.xml
new file mode 100644
index 0000000..1342872
--- /dev/null
+++ b/.idea/libraries/Maven__com_maxmind_db_maxmind_db_1_2_2.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_12_0.xml b/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_12_0.xml
new file mode 100644
index 0000000..1471229
--- /dev/null
+++ b/.idea/libraries/Maven__com_maxmind_geoip2_geoip2_2_12_0.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_maxmind_geoip_geoip_api_1_3_1.xml b/.idea/libraries/Maven__com_maxmind_geoip_geoip_api_1_3_1.xml
new file mode 100644
index 0000000..bd438ab
--- /dev/null
+++ b/.idea/libraries/Maven__com_maxmind_geoip_geoip_api_1_3_1.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__com_zdjizhi_galaxy_1_0.xml b/.idea/libraries/Maven__com_zdjizhi_galaxy_1_0.xml
new file mode 100644
index 0000000..19fe021
--- /dev/null
+++ b/.idea/libraries/Maven__com_zdjizhi_galaxy_1_0.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_2.xml b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml
new file mode 100644
index 0000000..f8084ec
--- /dev/null
+++ b/.idea/libraries/Maven__commons_io_commons_io_2_2.xml
@@ -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>
\ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
new file mode 100644
index 0000000..d576a09
--- /dev/null
+++ b/.idea/sqldialects.xml
@@ -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>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3dd3e60..53354e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,42 +33,6 @@
 

 

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

             <!-- <plugin> -->

             <!-- <groupId>org.mybatis.generator</groupId> -->

diff --git a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java b/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java
index b3fcb89..0408102 100644
--- a/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java
+++ b/src/main/java/com/nis/web/controller/restful/SingleDimensionReport.java
@@ -433,7 +433,7 @@ public class SingleDimensionReport extends BaseRestController {
 		String groupType ="hour";

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

-			if (times>0&&times<=30*24*60*60L) {

+			if (times>24*60*60L&&times<=30*24*60*60L) {

 				groupType ="day";

 			}else if(times>30*24*60*60L){

 				groupType ="month";

diff --git a/src/main/java/com/nis/web/dao/NtcReportDao.xml b/src/main/java/com/nis/web/dao/NtcReportDao.xml
index 65b0ca3..de38634 100644
--- a/src/main/java/com/nis/web/dao/NtcReportDao.xml
+++ b/src/main/java/com/nis/web/dao/NtcReportDao.xml
@@ -645,12 +645,8 @@
 	<select id="findNtcRadiusReport" parameterType="com.nis.domain.restful.NtcRadiusReport"

 		resultMap="NtcRadiusReportMap">

 		SELECT

-			<if test="searchAccount != null and searchAccount !=''">

 				nas_ip,

-			</if>

-			<if test="searchNasIp != null and searchNasIp !=''">

 				account,

-			</if>

 			<choose>

 				<when test="groupType!= null and groupType!='' and groupType == 'day'">

 					DATE_FORMAT(REPORT_TIME, '%Y-%m-%d')

@@ -665,10 +661,10 @@
 			REPORT_TIME,sum(num) num

 		FROM ntc_radius_report

 		<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}]]>

 			</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}]]>

 			</if>

 			<choose>

@@ -682,11 +678,11 @@
 		</where>

 			

 		GROUP BY

-			<if test="searchAccount != null and searchAccount !=''">

-				<![CDATA[nas_ip]]>

+			<if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 2">

+				<![CDATA[account,nas_ip]]>

 			</if>

-			<if test="searchNasIp != null and searchNasIp !=''">

-				<![CDATA[account]]>

+			<if test="searchBusinessType !=null and searchBusinessType != '' and searchBusinessType == 3 ">

+				<![CDATA[nas_ip,account]]>

 			</if>

 			,

 			<choose>

diff --git a/src/main/resources/applicationContext-redis.xml b/src/main/resources/applicationContext-redis.xml
index 7b58b76..0644880 100644
--- a/src/main/resources/applicationContext-redis.xml
+++ b/src/main/resources/applicationContext-redis.xml
@@ -61,16 +61,16 @@
 					<constructor-arg index="1" value="${redis.cluster.port3}"></constructor-arg>

 				</bean>

 				<bean class="redis.clients.jedis.HostAndPort">

-					<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg>

-					<constructor-arg index="1" value="${redis.cluster.port4}"></constructor-arg>

+					<constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>

+					<constructor-arg index="1" value="${redis.cluster.port1}"></constructor-arg>

 				</bean>

 				<bean class="redis.clients.jedis.HostAndPort">

-					<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg>

-					<constructor-arg index="1" value="${redis.cluster.port5}"></constructor-arg>

+					<constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>

+					<constructor-arg index="1" value="${redis.cluster.port2}"></constructor-arg>

 				</bean>

 				<bean class="redis.clients.jedis.HostAndPort">

-					<constructor-arg index="0" value="${redis.cluster.host1}"></constructor-arg>

-					<constructor-arg index="1" value="${redis.cluster.port6}"></constructor-arg>

+					<constructor-arg index="0" value="${redis.cluster.host2}"></constructor-arg>

+					<constructor-arg index="1" value="${redis.cluster.port3}"></constructor-arg>

 				</bean>

 			</set>

 		</constructor-arg>

diff --git a/src/main/resources/jdbc.properties b/src/main/resources/jdbc.properties
index d96834a..80b5bf4 100644
--- a/src/main/resources/jdbc.properties
+++ b/src/main/resources/jdbc.properties
@@ -168,11 +168,9 @@ redis.timeout=100000
 #一般当此值设置过大时，容易报：Too many Cluster redirections
 redis.maxRedirects=3
 
-#3A-redis集群配置
-redis.cluster.host1=192.168.10.205
-redis.cluster.port1:7031
-redis.cluster.port2:7032
-redis.cluster.port3:7033
-redis.cluster.port4:7034
-redis.cluster.port5:7035
-redis.cluster.port6:7036
\ No newline at end of file
+#3A-redis集群配置,如果需要执行数据同步需要在集群中执行LPUSH SyncRedisToCluster "1"
+redis.cluster.host1=192.168.10.192
+redis.cluster.host2=192.168.10.193
+redis.cluster.port1=7001
+redis.cluster.port2=7002
+redis.cluster.port3=7003