From 503383b82027b4eaa70afbf7333b974067e97831 Mon Sep 17 00:00:00 2001
From: lvkaihua <215957054@qq.com>
Date: Mon, 11 Mar 2024 08:34:32 +0000
Subject: [PATCH 1/7] update bigtop-manager-server/pom.xml.
Signed-off-by: lvkaihua <215957054@qq.com>
---
bigtop-manager-server/pom.xml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/bigtop-manager-server/pom.xml b/bigtop-manager-server/pom.xml
index a2276a0d..a5341853 100644
--- a/bigtop-manager-server/pom.xml
+++ b/bigtop-manager-server/pom.xml
@@ -93,6 +93,12 @@
runtime
+
+ org.postgresql
+ postgresql
+ provided
+
+
org.springframework.boot
spring-boot-configuration-processor
--
Gitee
From 392a7160725ebafd8030671e8a7bdc0a2d44ac8a Mon Sep 17 00:00:00 2001
From: lvkaihua <215957054@qq.com>
Date: Mon, 11 Mar 2024 08:35:33 +0000
Subject: [PATCH 2/7] =?UTF-8?q?update=20bigtop-manager-server/src/main/jav?=
=?UTF-8?q?a/org/apache/bigtop/manager/server/ServerApplication.java.=20?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86@EnableJpaRepositories("org.apache.b?=
=?UTF-8?q?igtop.manager.dao")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: lvkaihua <215957054@qq.com>
---
.../java/org/apache/bigtop/manager/server/ServerApplication.java | 1 +
1 file changed, 1 insertion(+)
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 8d78ff4a..9d01dd8f 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
@@ -11,6 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@EnableAsync
@EnableJpaAuditing
@EntityScan("org.apache.bigtop.manager.dao")
+@EnableJpaRepositories("org.apache.bigtop.manager.dao")
@SpringBootApplication(scanBasePackages = {"org.apache.bigtop.manager.server", "org.apache.bigtop.manager.common"})
public class ServerApplication {
--
Gitee
From f8796d731f8afbd9f10212065ff1f58632552fba Mon Sep 17 00:00:00 2001
From: lvkaihua <215957054@qq.com>
Date: Mon, 11 Mar 2024 08:36:47 +0000
Subject: [PATCH 3/7] =?UTF-8?q?update=20bigtop-manager-server/src/main/res?=
=?UTF-8?q?ources/application.yml.=20=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4postgres?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: lvkaihua <215957054@qq.com>
---
.../src/main/resources/application.yml | 37 +++++++++++--------
1 file changed, 21 insertions(+), 16 deletions(-)
diff --git a/bigtop-manager-server/src/main/resources/application.yml b/bigtop-manager-server/src/main/resources/application.yml
index ec6b02df..17b31ec3 100644
--- a/bigtop-manager-server/src/main/resources/application.yml
+++ b/bigtop-manager-server/src/main/resources/application.yml
@@ -8,22 +8,27 @@ spring:
application:
name: bigtop-manager-server
datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- password: root
- type: com.zaxxer.hikari.HikariDataSource
- url: jdbc:mysql://localhost:3306/bigtop_manager
- username: root
- hikari:
- auto-commit: true
- connection-test-query: select 1
- connection-timeout: 30000
- idle-timeout: 600000
- initialization-fail-timeout: 1
- leak-detection-threshold: 0
- maximum-pool-size: 50
- minimum-idle: 5
- pool-name: BigtopManagerHikariCP
- validation-timeout: 3000
+ # driver-class-name: com.mysql.cj.jdbc.Driver
+ # password: root
+ # type: com.zaxxer.hikari.HikariDataSource
+ # url: jdbc:mysql://localhost:3306/bigtop_manager
+ # username: root
+ # hikari:
+ # auto-commit: true
+ # connection-test-query: select 1
+ # connection-timeout: 30000
+ # idle-timeout: 600000
+ # initialization-fail-timeout: 1
+ # leak-detection-threshold: 0
+ # maximum-pool-size: 50
+ # minimum-idle: 5
+ # pool-name: BigtopManagerHikariCP
+ # validation-timeout: 3000
+ driver-class-name: org.postgresql.Driver
+ url: jdbc:postgresql://localhost:5432/bigtop_manager
+ username: postgres
+ password: postgres
+
jackson:
default-property-inclusion: non-null
--
Gitee
From 6d0639b25a162fe81323612a49d47d4423e8c186 Mon Sep 17 00:00:00 2001
From: lvkaihua <215957054@qq.com>
Date: Mon, 11 Mar 2024 08:54:36 +0000
Subject: [PATCH 4/7] update
bigtop-manager-server/src/main/resources/application.yml.
Signed-off-by: lvkaihua <215957054@qq.com>
---
.../src/main/resources/application.yml | 29 ++++++++-----------
1 file changed, 12 insertions(+), 17 deletions(-)
diff --git a/bigtop-manager-server/src/main/resources/application.yml b/bigtop-manager-server/src/main/resources/application.yml
index 17b31ec3..eb8d75cd 100644
--- a/bigtop-manager-server/src/main/resources/application.yml
+++ b/bigtop-manager-server/src/main/resources/application.yml
@@ -8,26 +8,21 @@ spring:
application:
name: bigtop-manager-server
datasource:
- # driver-class-name: com.mysql.cj.jdbc.Driver
- # password: root
- # type: com.zaxxer.hikari.HikariDataSource
- # url: jdbc:mysql://localhost:3306/bigtop_manager
- # username: root
- # hikari:
- # auto-commit: true
- # connection-test-query: select 1
- # connection-timeout: 30000
- # idle-timeout: 600000
- # initialization-fail-timeout: 1
- # leak-detection-threshold: 0
- # maximum-pool-size: 50
- # minimum-idle: 5
- # pool-name: BigtopManagerHikariCP
- # validation-timeout: 3000
driver-class-name: org.postgresql.Driver
- url: jdbc:postgresql://localhost:5432/bigtop_manager
+ url: jdbc:postgresql://172.16.22.86:5432/bigtop_manager
username: postgres
password: postgres
+ hikari:
+ auto-commit: true
+ connection-test-query: select 1
+ connection-timeout: 30000
+ idle-timeout: 600000
+ initialization-fail-timeout: 1
+ leak-detection-threshold: 0
+ maximum-pool-size: 50
+ minimum-idle: 5
+ pool-name: BigtopManagerHikariCP
+ validation-timeout: 3000
jackson:
--
Gitee
From fbef04a2461091cd88bc28fe090167692ed4f706 Mon Sep 17 00:00:00 2001
From: lvkaihua <215957054@qq.com>
Date: Mon, 11 Mar 2024 08:55:37 +0000
Subject: [PATCH 5/7] update bigtop-manager-server/pom.xml.
Signed-off-by: lvkaihua <215957054@qq.com>
---
bigtop-manager-server/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/bigtop-manager-server/pom.xml b/bigtop-manager-server/pom.xml
index a5341853..2df0b6a1 100644
--- a/bigtop-manager-server/pom.xml
+++ b/bigtop-manager-server/pom.xml
@@ -90,13 +90,13 @@
com.mysql
mysql-connector-j
- runtime
+ provided
org.postgresql
postgresql
- provided
+ runtime
--
Gitee
From ef9f132c95d1bd141a0b1a8a42f7ada0efe6770d Mon Sep 17 00:00:00 2001
From: lvkaihua <215957054@qq.com>
Date: Mon, 11 Mar 2024 09:10:44 +0000
Subject: [PATCH 6/7] update
bigtop-manager-server/src/main/resources/application.yml.
Signed-off-by: lvkaihua <215957054@qq.com>
---
bigtop-manager-server/src/main/resources/application.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/bigtop-manager-server/src/main/resources/application.yml b/bigtop-manager-server/src/main/resources/application.yml
index eb8d75cd..bfcf0502 100644
--- a/bigtop-manager-server/src/main/resources/application.yml
+++ b/bigtop-manager-server/src/main/resources/application.yml
@@ -12,6 +12,7 @@ spring:
url: jdbc:postgresql://172.16.22.86:5432/bigtop_manager
username: postgres
password: postgres
+ type: com.zaxxer.hikari.HikariDataSource
hikari:
auto-commit: true
connection-test-query: select 1
--
Gitee
From 2f5d5ee7c7c618f67e69d712ad04b9847afc8b1a Mon Sep 17 00:00:00 2001
From: lvkaihua <215957054@qq.com>
Date: Mon, 11 Mar 2024 09:13:05 +0000
Subject: [PATCH 7/7] update bigtop-manager-server/pom.xml.
Signed-off-by: lvkaihua <215957054@qq.com>
---
bigtop-manager-server/pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/bigtop-manager-server/pom.xml b/bigtop-manager-server/pom.xml
index 2df0b6a1..a74b0343 100644
--- a/bigtop-manager-server/pom.xml
+++ b/bigtop-manager-server/pom.xml
@@ -96,7 +96,6 @@
org.postgresql
postgresql
- runtime
--
Gitee