Selaa lähdekoodia

更新图谱配置

MarkHuang 5 vuotta sitten
vanhempi
commit
7a82a5e1f5

+ 32 - 1
src/main/java/com/diagbot/CdssCoreApplication.java

@@ -1,6 +1,10 @@
 package com.diagbot;
 
+import org.neo4j.ogm.config.ClasspathConfigurationSource;
+import org.neo4j.ogm.config.ConfigurationSource;
+import org.neo4j.ogm.session.SessionFactory;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
@@ -11,6 +15,11 @@ import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.neo4j.repository.config.EnableNeo4jRepositories;
+import org.springframework.data.neo4j.transaction.Neo4jTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 
 /**
@@ -18,8 +27,12 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author: zhoutg
  * @time: 2018/8/7 9:26
  */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
         JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
+@Configuration
+@EnableAutoConfiguration
+@EnableNeo4jRepositories(basePackages = "com.diagbot.repository")
+@EnableTransactionManagement
 @EnableFeignClients({ "com.diagbot.client" })
 @EnableHystrix
 @EnableHystrixDashboard
@@ -27,6 +40,24 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @ConfigurationPropertiesScan
 public class CdssCoreApplication {
 
+    @Bean
+    public SessionFactory sessionFactory() {
+        return new SessionFactory(configuration(), "com.diagbot.entity");
+    }
+
+    @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();
+//        System.out.println(configuration.getURI());
+        return configuration;
+    }
+
+    @Bean
+    public Neo4jTransactionManager transactionManager() throws Exception {
+        return new Neo4jTransactionManager(sessionFactory());
+    }
+
     public static void main(String[] args) {
         SpringApplication.run(CdssCoreApplication.class, args);
     }

+ 57 - 26
src/main/resources/application-local.yml

@@ -34,34 +34,65 @@ feign:
     max-connections: 1000 # 默认值
     max-connections-per-route: 250 # 默认值
 
-# 驱动配置信息
+
+
 spring:
+  # 驱动配置信息
   datasource:
-    dynamic:
-      primary: neo4j
-      # 数据库配置
-      datasource:
-        neo4j:
-          driver-class-name: org.neo4j.jdbc.Driver
-          url: jdbc:neo4j:http://192.168.3.150:7478
-          username: neo4j
-          password: root
-          #定义初始连接数
-          initialSize: 0
-          #定义最大连接数
-          maxActive: 20
-          #定义最大空闲
-          maxIdle: 20
-          #定义最小空闲
-          minIdle: 1
-          #定义最长等待时间
-          maxWait: 60000
-        mysql:
-          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
+    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
+
+  #      uri: bolt://192.168.3.150:7690
+  #    driver-class-name: org.neo4j.jdbc.Driver
+  #    url: jdbc:neo4j:http://192.168.3.150:7478
+  #    username: neo4j
+  #    password: root
+#spring:
+#  datasource:
+#    dynamic:
+#      primary: neo4j
+#      # 数据库配置
+#      datasource:
+#        neo4j:
+#          driver: org.neo4j.ogm.drivers.http.driver.HttpDriver
+#          uri: http://192.168.3.150:7478
+##          driver-class-name: org.neo4j.jdbc.Driver
+##          url: jdbc:neo4j:http://192.168.3.150:7478
+#          username: neo4j
+#          password: root
+#          # 连接池的配置信息
+#          #定义初始连接数
+#          initialSize: 5
+#          #定义最大连接数
+#          maxActive: 20
+#          #定义最大空闲
+#          maxIdle: 20
+#          #定义最小空闲
+#          minIdle: 1
+#          #定义最长等待时间
+#          maxWait: 60000
+#        mysql:
+#          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
+#
 
   #redis
   redis:

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

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