浏览代码

更新neo4j启动配置

MarkHuang 4 年之前
父节点
当前提交
a8a2dd68fd

+ 12 - 6
src/main/java/com/diagbot/config/OgmConfigure.java

@@ -3,9 +3,8 @@ package com.diagbot.config;
 import org.neo4j.ogm.config.ClasspathConfigurationSource;
 import org.neo4j.ogm.config.ConfigurationSource;
 import org.neo4j.ogm.session.SessionFactory;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
@@ -24,8 +23,12 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableTransactionManagement
 public class OgmConfigure {
 
-    @Autowired
-    private ApplicationContext applicationContext;
+    @Value("${spring.data.neo4j.URI}")
+    private String uri;
+    @Value("${spring.data.neo4j.username")
+    private String uname;
+    @Value("${spring.data.neoj.password")
+    private String passwd;
 
 
     @Bean
@@ -35,8 +38,9 @@ public class OgmConfigure {
 
     @Bean
     public org.neo4j.ogm.config.Configuration configuration() {
-        ConfigurationSource properties = new ClasspathConfigurationSource("ogm.properties");
-        org.neo4j.ogm.config.Configuration configuration = new org.neo4j.ogm.config.Configuration.Builder(properties).build();
+        org.neo4j.ogm.config.Configuration configuration =
+                new org.neo4j.ogm.config.Configuration.Builder().
+                        uri(uri).credentials(uname, passwd).build();
         return configuration;
     }
 
@@ -44,4 +48,6 @@ public class OgmConfigure {
     public Neo4jTransactionManager transactionManager() throws Exception {
         return new Neo4jTransactionManager(sessionFactory());
     }
+
+
 }

+ 5 - 0
src/main/resources/application-dev.yml

@@ -62,6 +62,11 @@ spring:
           url: jdbc:mysql://192.168.2.236:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
           password: lantone
+  data:
+    neo4j:
+      URI: http://192.168.3.150:7478
+      username: neo4j
+      password: root
 
   #redis
   redis:

+ 22 - 17
src/main/resources/application-local.yml

@@ -39,23 +39,28 @@ feign:
 spring:
   # 驱动配置信息
   datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
-      # 连接池的配置信息
-      #定义初始连接数
-      initialSize: 5
-      #定义最大连接数
-      maxActive: 20
-      #定义最大空闲
-      maxIdle: 20
-      #定义最小空闲
-      minIdle: 1
-      #定义最长等待时间
-      maxWait: 60000
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    platform: mysql
+    url: jdbc:mysql://192.168.2.236:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+    username: root
+    password: lantone
+    # 连接池的配置信息
+    #定义初始连接数
+    initialSize: 5
+    #定义最大连接数
+    maxActive: 20
+    #定义最大空闲
+    maxIdle: 20
+    #定义最小空闲
+    minIdle: 1
+    #定义最长等待时间
+    maxWait: 60000
+  data:
+    neo4j:
+      URI: http://192.168.3.150:7478
+      username: neo4j
+      password: root
+
 
   #      uri: bolt://192.168.3.150:7690
   #    driver-class-name: org.neo4j.jdbc.Driver

+ 5 - 0
src/main/resources/application-pre.yml

@@ -62,6 +62,11 @@ spring:
           url: jdbc:mysql://192.168.2.121:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: teamback
           password: goTulmLeon
+  data:
+    neo4j:
+      URI: http://192.168.3.150:7478
+      username: neo4j
+      password: root
 
   #redis
   redis:

+ 6 - 0
src/main/resources/application-pro.yml

@@ -62,6 +62,12 @@ spring:
           url: jdbc:mysql://192.168.2.122:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
           password: lantone
+  data:
+    neo4j:
+      URI: http://192.168.3.150:7478
+      username: neo4j
+      password: root
+
 
   #redis
   redis:

+ 6 - 0
src/main/resources/application-test.yml

@@ -62,6 +62,12 @@ spring:
           url: jdbc:mysql://192.168.2.241:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
           password: lantone
+  data:
+    neo4j:
+      URI: http://192.168.3.150:7478
+      username: neo4j
+      password: root
+
 
   #redis
   redis:

+ 0 - 3
src/main/resources/ogm.properties

@@ -1,3 +0,0 @@
-URI=http://192.168.3.150:7478
-username=neo4j
-password=root