From 7fb767bc4798fd577d85493c928da2ccab7ff6a9 Mon Sep 17 00:00:00 2001
From: Yu Hou <524860213@qq.com>
Date: Sat, 9 Mar 2024 13:34:30 +0800
Subject: [PATCH] =?UTF-8?q?[Bug]=20(server)=20=E4=BF=AE=E5=A4=8D=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=88=B0hibernate=E5=90=8E=E4=B8=8D=E4=BC=9A=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BA=E8=A1=A8=E7=BB=93=E6=9E=84=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manager/server/ServerApplication.java     |  2 +
 .../server/config/DataSourceConfig.java       | 39 -------------------
 2 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/config/DataSourceConfig.java

diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
index 48b6a7be..8d78ff4a 100644
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
+++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/ServerApplication.java
@@ -2,6 +2,7 @@ package org.apache.bigtop.manager.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -9,6 +10,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableScheduling
 @EnableAsync
 @EnableJpaAuditing
+@EntityScan("org.apache.bigtop.manager.dao")
 @SpringBootApplication(scanBasePackages = {"org.apache.bigtop.manager.server", "org.apache.bigtop.manager.common"})
 public class ServerApplication {
 
diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/config/DataSourceConfig.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/config/DataSourceConfig.java
deleted file mode 100644
index 88353118..00000000
--- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/config/DataSourceConfig.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.apache.bigtop.manager.server.config;
-
-import jakarta.annotation.Resource;
-import jakarta.persistence.EntityManagerFactory;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties;
-import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-import javax.sql.DataSource;
-
-@Configuration
-@EnableTransactionManagement
-@EnableJpaRepositories("org.apache.bigtop.manager.dao")
-public class DataSourceConfig {
-
-    @Resource
-    private JpaProperties properties;
-
-    @Bean
-    public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, @Qualifier("dataSource") DataSource dataSource) {
-        return builder.dataSource(dataSource)
-                .packages("org.apache.bigtop.manager.dao")
-                .persistenceUnit("bigtop-manager")
-                .properties(properties.getProperties())
-                .build();
-    }
-
-    @Bean
-    public PlatformTransactionManager transactionManager(@Qualifier("entityManagerFactory") EntityManagerFactory entityManagerFactory) {
-        return new JpaTransactionManager(entityManagerFactory);
-    }
-}
-- 
Gitee