Merge remote-tracking branch 'origin/his/chongqingshizhu_dev' into his/chongqingshizhu_dev

# Conflicts:
#	graphdb/src/main/resources/application.yml

graphdb/src/main/resources/application.yml

@@ -6,16 +6,16 @@ spring:
     active: local
   data:
     neo4j:
-      uri: bolt://10.58.4.152:7687
+      uri: bolt://192.168.0.183:7687
       username: neo4j
-      password: lantone
+      password: lt@great
 
 # 驱动配置信息
   datasource:
     driver-class-name: org.neo4j.jdbc.Driver
-    url: jdbc:neo4j:http://10.58.4.152:7474
+    url: jdbc:neo4j:http://192.168.0.183:7474
     username: neo4j
-    password: lantone
+    password: lt@great
     #定义初始连接数
     initialSize: 0
     #定义最大连接数