Spring Boot 2.x基础教程：Spring Data JPA的多数据源配置

dyc87112 · dyc87112 · commit 5615863d87df · 2020-06-22T15:48:45.000+08:00
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/Chapter38Application.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/Chapter38Application.java
@@ -12,14 +12,4 @@ public static void main(String[] args) {
 		SpringApplication.run(Chapter38Application.class, args);
 	}
 
-	@RestController
-	static class TextController {
-
-		@GetMapping("/hello")
-		public String hello() {
-			return "hello world";
-		}
-
-	}
-
 }
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/DataSourceConfiguration.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/DataSourceConfiguration.java
@@ -1,4 +1,4 @@
-package com.didispace.chapter37;
+package com.didispace.chapter38;
 
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/PrimaryConfig.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/PrimaryConfig.java
@@ -2,6 +2,8 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
@@ -16,6 +18,7 @@
 
 import javax.persistence.EntityManager;
 import javax.sql.DataSource;
+import java.util.Map;
 
 @Configuration
 @EnableTransactionManagement
@@ -29,6 +32,15 @@ public class PrimaryConfig {
     @Qualifier("primaryDataSource")
     private DataSource primaryDataSource;
 
+    @Autowired
+    private JpaProperties jpaProperties;
+    @Autowired
+    private HibernateProperties hibernateProperties;
+
+    private Map<String, Object> getVendorProperties() {
+        return hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(), new HibernateSettings());
+    }
+
     @Primary
     @Bean(name = "entityManagerPrimary")
     public EntityManager entityManager(EntityManagerFactoryBuilder builder) {
@@ -38,12 +50,13 @@ public EntityManager entityManager(EntityManagerFactoryBuilder builder) {
     @Primary
     @Bean(name = "entityManagerFactoryPrimary")
     public LocalContainerEntityManagerFactoryBean entityManagerFactoryPrimary (EntityManagerFactoryBuilder builder) {
-        HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter();
-        jpaVendorAdapter.setGenerateDdl(true);
+//        HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter();
+//        jpaVendorAdapter.setGenerateDdl(true);
         return builder
                 .dataSource(primaryDataSource)
-                .packages("com.didispace.domain.p") //设置实体类所在位置
+                .packages("com.didispace.chapter38.p") //设置实体类所在位置
                 .persistenceUnit("primaryPersistenceUnit")
+                .properties(getVendorProperties())
                 .build();
     }
 
@@ -53,4 +66,5 @@ public PlatformTransactionManager transactionManagerPrimary(EntityManagerFactory
         return new JpaTransactionManager(entityManagerFactoryPrimary(builder).getObject());
     }
 
+
 }
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/SecondaryConfig.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/SecondaryConfig.java
@@ -2,6 +2,8 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateProperties;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateSettings;
 import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
@@ -28,6 +30,15 @@ public class SecondaryConfig {
     @Qualifier("secondaryDataSource")
     private DataSource secondaryDataSource;
 
+    @Autowired
+    private JpaProperties jpaProperties;
+    @Autowired
+    private HibernateProperties hibernateProperties;
+
+    private Map<String, Object> getVendorProperties() {
+        return hibernateProperties.determineHibernateProperties(jpaProperties.getProperties(), new HibernateSettings());
+    }
+
     @Bean(name = "entityManagerSecondary")
     public EntityManager entityManager(EntityManagerFactoryBuilder builder) {
         return entityManagerFactorySecondary(builder).getObject().createEntityManager();
@@ -39,6 +50,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactorySecondary (Ent
                 .dataSource(secondaryDataSource)
                 .packages("com.didispace.chapter38.s") //设置实体类所在位置
                 .persistenceUnit("secondaryPersistenceUnit")
+                .properties(getVendorProperties())
                 .build();
     }
 
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/p/User.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/p/User.java
@@ -5,6 +5,7 @@
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/p/UserRepository.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/p/UserRepository.java
@@ -5,18 +5,11 @@
 import org.springframework.data.repository.query.Param;
 
 /**
- * Created by 程序猿DD/翟永超 on 2020/2/15.
+ * Created by 程序猿DD/翟永超 on  2020/6/22.
  * <p>
  * Blog: http://blog.didispace.com/
  * Github: https://github.com/dyc87112/
  */
 public interface UserRepository extends JpaRepository<User, Long> {
 
-    User findByName(String name);
-
-    User findByNameAndAge(String name, Integer age);
-
-    @Query("from User u where u.name=:name")
-    User findUser(@Param("name") String name);
-
 }
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/s/Message.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/s/Message.java
@@ -1,26 +1,29 @@
 package com.didispace.chapter38.s;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
 import javax.persistence.Id;
 
 @Entity
 @Data
 @NoArgsConstructor
-public class User {
+public class Message {
 
     @Id
     @GeneratedValue
     private Long id;
 
-    private String name;
-    private Integer age;
+    private String title;
+    private String message;
 
-    public User(String name, Integer age) {
-        this.name = name;
-        this.age = age;
+    public Message(String title, String message) {
+        this.title = title;
+        this.message = message;
     }
+
 }
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/s/MessageRepository.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/s/MessageRepository.java
@@ -0,0 +1,14 @@
+package com.didispace.chapter38.s;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * Created by 程序猿DD/翟永超 on 2020/6/22.
+ * <p>
+ * Blog: http://blog.didispace.com/
+ * Github: https://github.com/dyc87112/
+ */
+public interface MessageRepository extends JpaRepository<Message, Long> {
+
+
+}
diff --git a/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/s/UserRepository.java b/2.1.x/chapter3-8/src/main/java/com/didispace/chapter38/s/UserRepository.java
diff --git a/2.1.x/chapter3-8/src/main/resources/application.properties b/2.1.x/chapter3-8/src/main/resources/application.properties
@@ -1,15 +1,16 @@
 # pring boot 1.x的配置：spring.datasource.primary.url=jdbc:mysql://localhost:3306/test1
 spring.datasource.primary.jdbc-url=jdbc:mysql://localhost:3306/test1
 spring.datasource.primary.username=root
-spring.datasource.primary.password=123456
+spring.datasource.primary.password=12345678
 spring.datasource.primary.driver-class-name=com.mysql.cj.jdbc.Driver
 
 # spring boot 1.x的配置：spring.datasource.secondary.url=jdbc:mysql://localhost:3306/test2
 spring.datasource.secondary.jdbc-url=jdbc:mysql://localhost:3306/test2
 spring.datasource.secondary.username=root
-spring.datasource.secondary.password=123456
+spring.datasource.secondary.password=12345678
 spring.datasource.secondary.driver-class-name=com.mysql.cj.jdbc.Driver
 
-spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
+# 日志打印执行的SQL
 spring.jpa.show-sql=true
-spring.jpa.hibernate.ddl-auto=create-drop
+# Hibernate的DDL策略
+spring.jpa.hibernate.ddl-auto=create-drop
diff --git a/2.1.x/chapter3-8/src/test/java/com/didispace/chapter38/Chapter38ApplicationTests.java b/2.1.x/chapter3-8/src/test/java/com/didispace/chapter38/Chapter38ApplicationTests.java
@@ -2,6 +2,8 @@
 
 import com.didispace.chapter38.p.User;
 import com.didispace.chapter38.p.UserRepository;
+import com.didispace.chapter38.s.Message;
+import com.didispace.chapter38.s.MessageRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Assert;
 import org.junit.Test;
@@ -17,39 +19,24 @@ public class Chapter38ApplicationTests {
 
     @Autowired
     private UserRepository userRepository;
+    @Autowired
+    private MessageRepository messageRepository;
 
     @Test
     public void test() throws Exception {
-        // 创建10条记录
-        userRepository.save(new User("AAA", 10));
-        userRepository.save(new User("BBB", 20));
-        userRepository.save(new User("CCC", 30));
-        userRepository.save(new User("DDD", 40));
-        userRepository.save(new User("EEE", 50));
-        userRepository.save(new User("FFF", 60));
-        userRepository.save(new User("GGG", 70));
-        userRepository.save(new User("HHH", 80));
-        userRepository.save(new User("III", 90));
-        userRepository.save(new User("JJJ", 100));
-
-        // 测试findAll, 查询所有记录
-        Assert.assertEquals(10, userRepository.findAll().size());
-
-        // 测试findByName, 查询姓名为FFF的User
-        Assert.assertEquals(60, userRepository.findByName("FFF").getAge().longValue());
-
-        // 测试findUser, 查询姓名为FFF的User
-        Assert.assertEquals(60, userRepository.findUser("FFF").getAge().longValue());
-
-        // 测试findByNameAndAge, 查询姓名为FFF并且年龄为60的User
-        Assert.assertEquals("FFF", userRepository.findByNameAndAge("FFF", 60).getName());
+        userRepository.save(new User("aaa", 10));
+        userRepository.save(new User("bbb", 20));
+        userRepository.save(new User("ccc", 30));
+        userRepository.save(new User("ddd", 40));
+        userRepository.save(new User("eee", 50));
 
-        // 测试删除姓名为AAA的User
-        userRepository.delete(userRepository.findByName("AAA"));
+        Assert.assertEquals(5, userRepository.findAll().size());
 
-        // 测试findAll, 查询所有记录, 验证上面的删除是否成功
-        Assert.assertEquals(9, userRepository.findAll().size());
+        messageRepository.save(new Message("o1", "aaaaaaaaaa"));
+        messageRepository.save(new Message("o2", "bbbbbbbbbb"));
+        messageRepository.save(new Message("o3", "cccccccccc"));
 
+        Assert.assertEquals(3, messageRepository.findAll().size());
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -12,14 +12,4 @@ public static void main(String[] args) {`
`12`	`12`	`SpringApplication.run(Chapter38Application.class, args);`
`13`	`13`	`}`
`14`	`14`
`15`		`- @RestController`
`16`		`- static class TextController {`
`17`		`-`
`18`		`- @GetMapping("/hello")`
`19`		`- public String hello() {`
`20`		`- return "hello world";`
`21`		`- }`
`22`		`-`
`23`		`- }`
`24`		`-`
`25`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.didispace.chapter37;`
	`1`	`+package com.didispace.chapter38;`
`2`	`2`
`3`	`3`	`import org.springframework.beans.factory.annotation.Qualifier;`
`4`	`4`	`import org.springframework.boot.context.properties.ConfigurationProperties;`