From 2aea141e23f6d7a2c813d914aa298640df8c8df6 Mon Sep 17 00:00:00 2001
From: timyuer <524860213@qq.com>
Date: Mon, 3 Jun 2024 17:20:45 +0800
Subject: [PATCH 1/4] BIGTOP-4119: Add banner
---
bigtop-manager-agent/src/main/resources/application.yml | 4 ++++
bigtop-manager-agent/src/main/resources/banner.txt | 8 ++++++++
bigtop-manager-server/src/main/resources/application.yml | 4 ++++
bigtop-manager-server/src/main/resources/banner.txt | 8 ++++++++
pom.xml | 1 +
5 files changed, 25 insertions(+)
create mode 100644 bigtop-manager-agent/src/main/resources/banner.txt
create mode 100644 bigtop-manager-server/src/main/resources/banner.txt
diff --git a/bigtop-manager-agent/src/main/resources/application.yml b/bigtop-manager-agent/src/main/resources/application.yml
index 5c5cf75eb..d2de797c4 100644
--- a/bigtop-manager-agent/src/main/resources/application.yml
+++ b/bigtop-manager-agent/src/main/resources/application.yml
@@ -24,8 +24,12 @@ bigtop:
port: 8080
spring:
+ banner:
+ charset: utf-8
application:
name: bigtop-manager-agent
+ main:
+ banner-mode: log
server:
port: 8081
diff --git a/bigtop-manager-agent/src/main/resources/banner.txt b/bigtop-manager-agent/src/main/resources/banner.txt
new file mode 100644
index 000000000..3aed718be
--- /dev/null
+++ b/bigtop-manager-agent/src/main/resources/banner.txt
@@ -0,0 +1,8 @@
+
+ ____ ___ ____ _____ ___ ____ __ __ _ _ _ _ ____ _____ ____
+ | __ )_ _/ ___|_ _/ _ \| _ \ | \/ | / \ | \ | | / \ / ___| ____| _ \
+ | _ \| | | _ | || | | | |_) | | |\/| | / _ \ | \| | / _ \| | _| _| | |_) |
+ | |_) | | |_| | | || |_| | __/ | | | |/ ___ \| |\ |/ ___ \ |_| | |___| _ <
+ |____/___\____| |_| \___/|_| |_| |_/_/ \_\_| \_/_/ \_\____|_____|_| \_\
+
+:: Bigtop Manager Agent :: ${application.formatted-version}
\ No newline at end of file
diff --git a/bigtop-manager-server/src/main/resources/application.yml b/bigtop-manager-server/src/main/resources/application.yml
index fcdb9f101..06c1babab 100644
--- a/bigtop-manager-server/src/main/resources/application.yml
+++ b/bigtop-manager-server/src/main/resources/application.yml
@@ -24,8 +24,12 @@ bigtop:
type: eclipselink
spring:
+ banner:
+ charset: utf-8
application:
name: bigtop-manager-server
+ main:
+ banner-mode: log
datasource:
driver-class-name: org.postgresql.Driver
url: jdbc:postgresql://localhost:5432/bigtop_manager
diff --git a/bigtop-manager-server/src/main/resources/banner.txt b/bigtop-manager-server/src/main/resources/banner.txt
new file mode 100644
index 000000000..40556af4f
--- /dev/null
+++ b/bigtop-manager-server/src/main/resources/banner.txt
@@ -0,0 +1,8 @@
+
+ ____ ___ ____ _____ ___ ____ __ __ _ _ _ _ ____ _____ ____
+ | __ )_ _/ ___|_ _/ _ \| _ \ | \/ | / \ | \ | | / \ / ___| ____| _ \
+ | _ \| | | _ | || | | | |_) | | |\/| | / _ \ | \| | / _ \| | _| _| | |_) |
+ | |_) | | |_| | | || |_| | __/ | | | |/ ___ \| |\ |/ ___ \ |_| | |___| _ <
+ |____/___\____| |_| \___/|_| |_| |_/_/ \_\_| \_/_/ \_\____|_____|_| \_\
+
+:: Bigtop Manager Server :: ${application.formatted-version}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c7e827262..6d6d4989d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,7 @@
**/*.ftl
**/*.log
pnpm-lock.yaml
+ **/banner.txt
From ff871f21ebb4a33375bc1f842bd67c544fa95365 Mon Sep 17 00:00:00 2001
From: timyuer <524860213@qq.com>
Date: Thu, 13 Jun 2024 10:02:44 +0800
Subject: [PATCH 2/4] resolve conflict
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2c8b69d20..909392604 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,6 @@
**/*.log
pnpm-lock.yaml
**/target/**
- **/banner.txt
From efcd40023562309b05319a85ffa9393a9abac2da Mon Sep 17 00:00:00 2001
From: timyuer <524860213@qq.com>
Date: Thu, 13 Jun 2024 10:09:24 +0800
Subject: [PATCH 3/4] resolve conflict
---
.licenserc.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index 1faa1c7d7..a0626a02b 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -37,5 +37,6 @@ header:
- 'LICENSE'
- 'pnpm-lock.yaml'
- '**/*.proto'
+ - '**/banner.txt'
comment: on-failure
From 558bac86bf784a5b57187a9a22df1491b479e151 Mon Sep 17 00:00:00 2001
From: timyuer <524860213@qq.com>
Date: Thu, 13 Jun 2024 11:35:50 +0800
Subject: [PATCH 4/4] update as comment
---
.licenserc.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.licenserc.yaml b/.licenserc.yaml
index a0626a02b..0aeb0fbcd 100644
--- a/.licenserc.yaml
+++ b/.licenserc.yaml
@@ -37,6 +37,6 @@ header:
- 'LICENSE'
- 'pnpm-lock.yaml'
- '**/*.proto'
- - '**/banner.txt'
+ - '**/*.txt'
comment: on-failure