You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@paimon.apache.org by ni...@apache.org on 2023/12/06 11:25:59 UTC
(incubator-paimon-webui) branch main updated: [Feature] Support Swagger for Spring document (#109)
This is an automated email from the ASF dual-hosted git repository.
nicholasjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-paimon-webui.git
The following commit(s) were added to refs/heads/main by this push:
new 0f62973 [Feature] Support Swagger for Spring document (#109)
0f62973 is described below
commit 0f6297370e9a4ec90f28c0f9333f0d6de3f70a83
Author: yangyang zhong <35...@users.noreply.github.com>
AuthorDate: Wed Dec 6 19:25:53 2023 +0800
[Feature] Support Swagger for Spring document (#109)
---
paimon-web-server/pom.xml | 8 ++++++++
.../src/main/resources/application-dev-h2.yml | 6 ------
.../src/main/resources/application-dev-mysql.yml | 2 +-
paimon-web-server/src/main/resources/application-prod.yml | 2 +-
paimon-web-server/src/main/resources/application.yml | 14 +++++++++++++-
.../src/test/resources/application-dev-h2.yml | 6 ------
paimon-web-server/src/test/resources/application.yml | 2 +-
pom.xml | 6 ++++++
8 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/paimon-web-server/pom.xml b/paimon-web-server/pom.xml
index f9be605..3656806 100644
--- a/paimon-web-server/pom.xml
+++ b/paimon-web-server/pom.xml
@@ -178,6 +178,14 @@ under the License.
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/paimon-web-server/src/main/resources/application-dev-h2.yml b/paimon-web-server/src/main/resources/application-dev-h2.yml
index cad8f92..12a5608 100644
--- a/paimon-web-server/src/main/resources/application-dev-h2.yml
+++ b/paimon-web-server/src/main/resources/application-dev-h2.yml
@@ -29,9 +29,3 @@ spring:
username: root
password: root
mode: always
-
- ldap:
- urls: ldap://${LDAP_HOST:127.0.0.1}:${LDAP_PORT:389}
- base: dc=test,dc=com
- username: ${LDAP_USER:cn=admin,dc=test,dc=com}
- password: ${LDAP_PASSWORD:admin}
diff --git a/paimon-web-server/src/main/resources/application-dev-mysql.yml b/paimon-web-server/src/main/resources/application-dev-mysql.yml
index 67b2fb6..85b0ea3 100644
--- a/paimon-web-server/src/main/resources/application-dev-mysql.yml
+++ b/paimon-web-server/src/main/resources/application-dev-mysql.yml
@@ -18,4 +18,4 @@ spring:
url: jdbc:mysql://${MYSQL_ADDR:127.0.0.1:3306}/${MYSQL_DATABASE:paimon}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: ${MYSQL_USERNAME:username}
password: ${MYSQL_PASSWORD:password}
- driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file
+ driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/paimon-web-server/src/main/resources/application-prod.yml b/paimon-web-server/src/main/resources/application-prod.yml
index 67b2fb6..85b0ea3 100644
--- a/paimon-web-server/src/main/resources/application-prod.yml
+++ b/paimon-web-server/src/main/resources/application-prod.yml
@@ -18,4 +18,4 @@ spring:
url: jdbc:mysql://${MYSQL_ADDR:127.0.0.1:3306}/${MYSQL_DATABASE:paimon}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: ${MYSQL_USERNAME:username}
password: ${MYSQL_PASSWORD:password}
- driver-class-name: com.mysql.cj.jdbc.Driver
\ No newline at end of file
+ driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/paimon-web-server/src/main/resources/application.yml b/paimon-web-server/src/main/resources/application.yml
index db7c962..ae8ae92 100644
--- a/paimon-web-server/src/main/resources/application.yml
+++ b/paimon-web-server/src/main/resources/application.yml
@@ -64,4 +64,16 @@ sa-token:
is-read-cookie: true
is-write-header: true
is-read-header: true
- is-read-body: true
\ No newline at end of file
+ is-read-body: true
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: "*"
+ endpoint:
+ health:
+ show-details: always
+ health:
+ ldap:
+ enabled: false
diff --git a/paimon-web-server/src/test/resources/application-dev-h2.yml b/paimon-web-server/src/test/resources/application-dev-h2.yml
index cad8f92..12a5608 100644
--- a/paimon-web-server/src/test/resources/application-dev-h2.yml
+++ b/paimon-web-server/src/test/resources/application-dev-h2.yml
@@ -29,9 +29,3 @@ spring:
username: root
password: root
mode: always
-
- ldap:
- urls: ldap://${LDAP_HOST:127.0.0.1}:${LDAP_PORT:389}
- base: dc=test,dc=com
- username: ${LDAP_USER:cn=admin,dc=test,dc=com}
- password: ${LDAP_PASSWORD:admin}
diff --git a/paimon-web-server/src/test/resources/application.yml b/paimon-web-server/src/test/resources/application.yml
index 337c0fb..ae44ae1 100644
--- a/paimon-web-server/src/test/resources/application.yml
+++ b/paimon-web-server/src/test/resources/application.yml
@@ -64,4 +64,4 @@ sa-token:
is-read-cookie: true
is-write-header: true
is-read-header: true
- is-read-body: true
\ No newline at end of file
+ is-read-body: true
diff --git a/pom.xml b/pom.xml
index 27aeefd..33e1708 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,6 +88,7 @@ under the License.
<guava.version>31.1-jre</guava.version>
<maven.checkstyle.version>3.1.2</maven.checkstyle.version>
<maven.compiler.version>3.10.1</maven.compiler.version>
+ <springdoc-openapi-ui.version>1.6.9</springdoc-openapi-ui.version>
<spotless.version>2.13.0</spotless.version>
<spotless.delimiter>package</spotless.delimiter>
<spotless.license.header>
@@ -217,6 +218,11 @@ under the License.
<version>${gson.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>${springdoc-openapi-ui.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>