Compare commits
10 Commits
fe76e786e9
...
fe854136ae
| Author | SHA1 | Date | |
|---|---|---|---|
fe854136ae
|
|||
|
329b82232f | ||
|
|
040e14153d | ||
|
|
d1da8a0cb1 | ||
|
|
867e36b913 | ||
|
|
e81ed33d74 | ||
|
1a9f9999af
|
|||
|
358b06b323
|
|||
|
b523a2fd61
|
|||
|
c30129cd97
|
@@ -14,6 +14,8 @@ COPY --chown=app ./gradle/ ./gradle
|
|||||||
COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./app.json ./
|
COPY --chown=app ./gradlew ./build.gradle ./settings.gradle ./app.json ./
|
||||||
COPY --chown=app ./src ./src
|
COPY --chown=app ./src ./src
|
||||||
|
|
||||||
|
RUN curl -OL https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/latest/download/opentelemetry-javaagent.jar
|
||||||
|
|
||||||
# Build the production package
|
# Build the production package
|
||||||
RUN ./gradlew clean build -x test
|
RUN ./gradlew clean build -x test
|
||||||
|
|
||||||
@@ -24,6 +26,11 @@ RUN useradd -m app
|
|||||||
USER app
|
USER app
|
||||||
|
|
||||||
COPY --chown=app --from=build /usr/src/app/build/libs/*-SNAPSHOT.jar /usr/app/edge.jar
|
COPY --chown=app --from=build /usr/src/app/build/libs/*-SNAPSHOT.jar /usr/app/edge.jar
|
||||||
|
COPY --chown=app --from=build /usr/src/app/opentelemetry-javaagent.jar /usr/app/opentelemetry-javaagent.jar
|
||||||
|
|
||||||
|
ENV JAVA_TOOL_OPTIONS="-javaagent:/usr/app/opentelemetry-javaagent.jar"
|
||||||
|
ENV OTEL_SERVICE_NAME="edge-service"
|
||||||
|
ENV OTEL_EXPORTER_OTLP_ENDPOINT="http://opentelemetry-collector.web:4318"
|
||||||
|
|
||||||
HEALTHCHECK CMD curl --fail http://localhost:5000/actuator/health/liveness || exit 1
|
HEALTHCHECK CMD curl --fail http://localhost:5000/actuator/health/liveness || exit 1
|
||||||
|
|
||||||
|
|||||||
13
build.gradle
13
build.gradle
@@ -1,9 +1,8 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'java'
|
id 'java'
|
||||||
id 'org.springframework.boot' version '3.3.4'
|
id 'org.springframework.boot' version '3.4.0'
|
||||||
id 'io.spring.dependency-management' version '1.1.6'
|
id 'io.spring.dependency-management' version '1.1.6'
|
||||||
id 'idea'
|
id 'idea'
|
||||||
id "io.sentry.jvm.gradle" version "4.11.0"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
group = 'dev.mars3142.fhq'
|
group = 'dev.mars3142.fhq'
|
||||||
@@ -26,9 +25,9 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
set('springCloudVersion', "2023.0.3")
|
set('springCloudVersion', "2024.0.0")
|
||||||
set('springModulithVersion', "1.2.1")
|
set('springModulithVersion', "1.2.1")
|
||||||
set('springCloudGCPVersion', "5.4.1")
|
set('springCloudGCPVersion', "5.9.0")
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -41,11 +40,11 @@ dependencies {
|
|||||||
implementation 'io.grpc:grpc-netty'
|
implementation 'io.grpc:grpc-netty'
|
||||||
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
|
implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
|
||||||
implementation 'io.netty:netty-all'
|
implementation 'io.netty:netty-all'
|
||||||
implementation 'com.nimbusds:nimbus-jose-jwt:9.41.2'
|
implementation 'com.nimbusds:nimbus-jose-jwt:9.47'
|
||||||
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
|
implementation 'org.springframework.cloud:spring-cloud-starter-netflix-eureka-client'
|
||||||
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
|
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8'
|
||||||
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
|
implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.7.0'
|
||||||
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:2.6.0'
|
implementation 'org.springdoc:springdoc-openapi-starter-webflux-api:2.7.0'
|
||||||
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
|
implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
|
||||||
implementation 'org.springframework.cloud:spring-cloud-starter-config'
|
implementation 'org.springframework.cloud:spring-cloud-starter-config'
|
||||||
testImplementation 'io.projectreactor:reactor-test'
|
testImplementation 'io.projectreactor:reactor-test'
|
||||||
|
|||||||
19
src/main/resources/css/404.css
Normal file
19
src/main/resources/css/404.css
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
body {
|
||||||
|
height: 100vh;
|
||||||
|
display: grid;
|
||||||
|
justify-content: center;
|
||||||
|
transition: background-color 1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
canvas {
|
||||||
|
margin-top: -5em;
|
||||||
|
margin-bottom: -3em;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rive-canvas {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
margin: auto;
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
|
||||||
<title>Rive Hello World</title>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div style="text-align: center">
|
|
||||||
<canvas id="canvas" width="400" height="400"></canvas>
|
|
||||||
</div>
|
|
||||||
<script src="https://unpkg.com/@rive-app/canvas@2.20.0"></script>
|
|
||||||
<script>
|
|
||||||
const r = new rive.Rive({
|
|
||||||
src: "https://cdn.rive.app/animations/vehicles.riv",
|
|
||||||
canvas: document.getElementById("canvas"),
|
|
||||||
autoplay: true,
|
|
||||||
// artboard: "Arboard", // Optional. If not supplied the default is selected
|
|
||||||
stateMachines: "bumpy",
|
|
||||||
onLoad: () => {
|
|
||||||
// Ensure the drawing surface matches the canvas size and device pixel ratio
|
|
||||||
r.resizeDrawingSurfaceToCanvas();
|
|
||||||
},
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
BIN
src/main/resources/static/404.riv
Normal file
BIN
src/main/resources/static/404.riv
Normal file
Binary file not shown.
30
src/main/resources/static/error/404.html
Normal file
30
src/main/resources/static/error/404.html
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8"/>
|
||||||
|
<meta content="IE=edge" http-equiv="X-UA-Compatible"/>
|
||||||
|
<meta content="width=device-width, initial-scale=1.0" name="viewport"/>
|
||||||
|
<title>404</title>
|
||||||
|
<link href="/css/404.css" rel="stylesheet"/>
|
||||||
|
</head>
|
||||||
|
<body style="background-color: #EB3A60;">
|
||||||
|
<div style="text-align: center">
|
||||||
|
<canvas id="rive-canvas" style="width: 100%; height: 100%; margin: auto; display: block;"></canvas>
|
||||||
|
</div>
|
||||||
|
<script src="https://unpkg.com/@rive-app/canvas@2.20.0"></script>
|
||||||
|
<script>
|
||||||
|
const r = new rive.Rive({
|
||||||
|
src: "https://cdn.rive.app/animations/vehicles.riv",
|
||||||
|
// OR the path to a discoverable and public Rive asset
|
||||||
|
// src: '/public/example.riv',
|
||||||
|
canvas: document.getElementById("rive-canvas"),
|
||||||
|
autoplay: true,
|
||||||
|
// artboard: "Arboard", // Optional. If not supplied the default is selected
|
||||||
|
stateMachines: "bumpy",
|
||||||
|
onLoad: () => {
|
||||||
|
r.resizeDrawingSurfaceToCanvas();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
Reference in New Issue
Block a user