K3S-Cluster/ec-config-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19 from 3dwardch3ng/develop

Browse Source 
release
This commit is contained in:
Edward Cheng
2024-09-11 21:42:31 +10:00
committed by GitHub
parent 927519d8f2 cd5ef6bf02
commit 31a3e786cd
4 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build-and-publish-develop.yml vendored
View File

@@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17
@@ -77,7 +77,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17
@@ -162,7 +162,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17

6
.github/workflows/build-and-publish-release.yml vendored
View File

@@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
fetch-depth: 0 fetch-depth: 0
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17
@@ -95,7 +95,7 @@ jobs:
with: with:
ref: main ref: main
fetch-depth: 1 fetch-depth: 1
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17
@@ -181,7 +181,7 @@ jobs:
with: with:
ref: main ref: main
fetch-depth: 1 fetch-depth: 1
- uses: actions/setup-java@v4.2.2 - uses: actions/setup-java@v4.3.0
if: ${{ hashFiles('**/pom.xml') }} if: ${{ hashFiles('**/pom.xml') }}
with: with:
java-version: 17 java-version: 17

9
pom.xml
View File

@@ -7,11 +7,11 @@
<parent> <parent>
<groupId>sydney.cheng</groupId> <groupId>sydney.cheng</groupId>
<artifactId>ec-super-pom</artifactId> <artifactId>ec-super-pom</artifactId>
<version>1.0.4</version> <version>1.0.5</version>
</parent> </parent>
<artifactId>ec-config-server</artifactId> <artifactId>ec-config-server</artifactId>
<version>1.0.7</version> <version>1.0.8-SNAPSHOT</version>
<licenses> <licenses>
<license> <license>
@@ -53,6 +53,11 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>sydney.cheng</groupId>
<artifactId>ec-microservice-commons-swagger</artifactId>
<version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>

16
src/main/resources/application.yml
View File

@@ -37,6 +37,12 @@ spring:
name: ${application.name} name: ${application.name}
profiles: profiles:
active: native active: native
security:
basic:
enabled: true
user:
name: ${CONFIG_SERVER_USERNAME:configuser}
password: ${CONFIG_SERVER_PASSWORD:configPass$1234}
cloud: cloud:
config: config:
server: server:
@@ -47,4 +53,12 @@ spring:
eureka: eureka:
client: client:
enabled: false enabled: false
springdoc:
swagger-ui:
path: /swagger-ui.html
displayRequestDuration: true
api-docs:
path: /api-docs
show-actuator: true