Merge branch 'master' of http://223.93.170.82:10080/louhr/push into his/shaoyifu

# Conflicts:
#	common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java
#	graph/src/main/resources/bolt.properties
#	graphdb/src/main/resources/application.yml

algorithm/src/main/resources/algorithm.properties

@@ -1,8 +1,8 @@
 ################################ model basic url ###################################
 
 #basicPath=E:/git/push/algorithm/src/main/models/model_version_replacement/model
-basicPath=/home/lantone/models/model_version_replacement/model
-#basicPath=E:/models/model_version_replacement/model
+#basicPath=/home/lantone/models/model_version_replacement/model
+basicPath=D:/work/project/models/model_version_replacement/model
 
 ############################### current model version ################################
 diagnosisPredict.version=outpatient_556_IOE_1

bigdata-web/pom.xml

@@ -20,7 +20,7 @@
 		<java.version>1.8</java.version>
 		<druid.version>1.0.23</druid.version>
 		<mybatis.version>1.1.1</mybatis.version>
-		<mysql.version>5.1.38</mysql.version>
+		<mysql.version>8.0.12</mysql.version>
 		<swagger2.version>2.7.0</swagger2.version>
 	</properties>
 

graph-web/pom.xml

@@ -20,7 +20,7 @@
 		<java.version>1.8</java.version>
 		<druid.version>1.0.23</druid.version>
 		<mybatis.version>1.1.1</mybatis.version>
-		<mysql.version>5.1.38</mysql.version>
+		<mysql.version>8.0.12</mysql.version>
 		<swagger2.version>2.7.0</swagger2.version>
 	</properties>
 

nlp-web/pom.xml

@@ -20,7 +20,7 @@
 		<java.version>1.8</java.version>
 		<druid.version>1.0.23</druid.version>
 		<mybatis.version>1.1.1</mybatis.version>
-		<mysql.version>5.1.38</mysql.version>
+		<mysql.version>8.0.12</mysql.version>
 		<swagger2.version>2.7.0</swagger2.version>
 	</properties>
 

nlp/src/main/resources/nlp.properties

@@ -1,3 +1,3 @@
 #Êý¾ÝÎļþ´æ·Å·¾¶
-cache.file.dir=/opt/diagbot-push/cache_file/
-#cache.file.dir=d:\\cache_file\\
+#cache.file.dir=/opt/diagbot-push/cache_file/
+cache.file.dir=D:/work/bigdata/diagbot-push/cache_file/

pom.xml

@@ -32,7 +32,7 @@
         <commons-lang3.version>3.1</commons-lang3.version>
         <commons-io.version>2.4</commons-io.version>
         <slf4j.version>1.7.2</slf4j.version>
-        <mysql.version>5.1.38</mysql.version>
+        <mysql.version>8.0.12</mysql.version>
         <logback.version>1.1.2</logback.version>
         <jackson.version>2.6.5</jackson.version>
         <servlet.version>3.0.1</servlet.version>

push-web/pom.xml

@@ -20,7 +20,7 @@
 		<java.version>1.8</java.version>
 		<druid.version>1.0.23</druid.version>
 		<mybatis.version>1.1.1</mybatis.version>
-		<mysql.version>5.1.38</mysql.version>
+		<mysql.version>8.0.12</mysql.version>
 		<swagger2.version>2.7.0</swagger2.version>
 	</properties>