Compare commits
31 Commits
20f2a6dc96
...
update-dep
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a5dada781 | |||
| c2e75ef94d | |||
| 35b45e3da4 | |||
| 78dc349290 | |||
| 4ad93a4b7e | |||
| 31a3e786cd | |||
| cd5ef6bf02 | |||
| 917db3eafb | |||
| 4a89510fc8 | |||
| 97b272d5c8 | |||
| 6ec906f156 | |||
|
|
2ee6a3ffec | ||
| 37f8d6a250 | |||
| e27ca00044 | |||
| c746c8fb8a | |||
| b68460e499 | |||
| 7ff7534d05 | |||
| dce3bbd1fb | |||
| 927519d8f2 | |||
| 382cc197e5 | |||
| e2a293036f | |||
| b890d81825 | |||
| 6cbd571a5d | |||
| 12bb51845b | |||
| 47554d159f | |||
| 99c06a23bf | |||
| 445a864408 | |||
| 49621eded2 | |||
| 4e8ba58cf7 | |||
| c436fb0e3b | |||
|
|
ed60a656da |
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM bitnami/java:17.0.12-10-debian-12-r4 AS builder
|
FROM bitnami/java:17.0.12-10-debian-12-r6 AS builder
|
||||||
|
|
||||||
WORKDIR /opt
|
WORKDIR /opt
|
||||||
|
|
||||||
|
|||||||
18
pom.xml
18
pom.xml
@@ -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.7</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>ec-config-server</artifactId>
|
<artifactId>ec-config-server</artifactId>
|
||||||
<version>1.0.6-SNAPSHOT</version>
|
<version>1.0.9-SNAPSHOT</version>
|
||||||
|
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
@@ -42,6 +42,7 @@
|
|||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<start-class>sydney.cheng.microservice.Application</start-class>
|
<start-class>sydney.cheng.microservice.Application</start-class>
|
||||||
|
<ec-microservice-commons.version>1.0.1</ec-microservice-commons.version>
|
||||||
<!-- Sonar Properties -->
|
<!-- Sonar Properties -->
|
||||||
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
|
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
|
||||||
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
|
<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
|
||||||
@@ -54,8 +55,13 @@
|
|||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.cloud</groupId>
|
<groupId>sydney.cheng</groupId>
|
||||||
<artifactId>spring-cloud-config-server</artifactId>
|
<artifactId>ec-microservice-commons-swagger</artifactId>
|
||||||
|
<version>${ec-microservice-commons.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
@@ -65,6 +71,10 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
<artifactId>spring-boot-starter-web</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.cloud</groupId>
|
||||||
|
<artifactId>spring-cloud-config-server</artifactId>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@@ -20,6 +20,13 @@ management:
|
|||||||
include: '*'
|
include: '*'
|
||||||
health:
|
health:
|
||||||
show-details: always
|
show-details: always
|
||||||
|
probes:
|
||||||
|
enabled: true
|
||||||
|
health:
|
||||||
|
livenessstate:
|
||||||
|
enabled: true
|
||||||
|
readinessstate:
|
||||||
|
enabled: true
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
file:
|
file:
|
||||||
@@ -30,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:
|
||||||
@@ -41,3 +54,11 @@ 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
|
||||||
Reference in New Issue
Block a user