From 007e35746998eff5922d4641729e0d4c6ac77ed8 Mon Sep 17 00:00:00 2001 From: "zhczyx@163.com" Date: Wed, 17 Dec 2025 16:29:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++++- pom.xml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d216e7..e8a55f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,8 @@ -FROM registry.ap-northeast-1.aliyuncs.com/southwave/jdk17-template:latest +# FROM registry.ap-northeast-1.aliyuncs.com/southwave/jdk17-template:latest +FROM amazoncorretto:17-alpine +# 安装 fontconfig 和 DejaVu 字体 (这是一个通用且免费的字体包) +RUN apk --no-cache add fontconfig ttf-dejavu + WORKDIR /app COPY target/data-center-sender.jar app.jar EXPOSE 8201 diff --git a/pom.xml b/pom.xml index c64717c..424c7cf 100644 --- a/pom.xml +++ b/pom.xml @@ -502,7 +502,28 @@ - ${aws.ecr.registry}/aeon-prod/${aws.ecr.repositoryProd}:latest + ${aws.ecr.registry}/${aws.ecr.repository}:latest + ${aws.ecr.registry} + + ${project.basedir}/Dockerfile + + + + + + + + io.fabric8 + docker-maven-plugin + 0.38.1 + + + AKIAQNYBBSGDVT3VF4ON + DEhPMTHAIsKK7L2klURQrmMe3r2Tqgbaa6z2FYQu + + + + ${aws.ecr.registryTest}/aeon/${aws.ecr.repository}:latest ${aws.ecr.registry} ${project.basedir}/Dockerfile @@ -511,27 +532,6 @@ - - - - - - - - - - - - - - - - - - - - - From 12d52aee6f30974033555d2766b138e876d56ae8 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Wed, 17 Dec 2025 16:49:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 109 +++++++++++++++++--------------------------------------- 1 file changed, 32 insertions(+), 77 deletions(-) diff --git a/pom.xml b/pom.xml index c64717c..9fcc734 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.12 + 3.5.7 com.techsor @@ -40,35 +40,12 @@ 3.1.0 - io.netty - netty-common - 4.2.2.Final - - - io.netty - netty-buffer - 4.2.2.Final - - - io.netty - netty-resolver - 4.2.2.Final - - - io.netty - netty-transport - 4.2.2.Final - - - io.netty - netty-transport-native-unix-common - 4.2.2.Final - - - io.netty - netty-codec-base - 4.2.2.Final - + io.netty + netty-bom + 4.2.9.Final + pom + import + @@ -87,11 +64,11 @@ - - org.apache.tomcat.embed - tomcat-embed-core - 10.1.42 - + + org.apache.tomcat.embed + tomcat-embed-core + 10.1.49 + org.springframework.boot @@ -125,7 +102,7 @@ com.mysql mysql-connector-j - 9.3.0 + 9.5.0 org.projectlombok @@ -136,7 +113,7 @@ com.google.code.gson gson - 2.13.1 + 2.13.2 org.springframework.boot @@ -147,7 +124,7 @@ org.apache.commons commons-text - 1.13.1 + 1.15.0 @@ -191,18 +168,18 @@ 1.7.7 - - ch.qos.logback - logback-classic - 1.5.18 - compile - - - ch.qos.logback - logback-core - 1.5.18 - compile - + + ch.qos.logback + logback-classic + 1.5.21 + compile + + + ch.qos.logback + logback-core + 1.5.21 + compile + org.java-websocket Java-WebSocket @@ -213,13 +190,12 @@ com.squareup.okhttp3 okhttp - 4.12.0 + 4.12.0 org.apache.commons commons-pool2 - 2.11.1 org.mockito @@ -230,13 +206,13 @@ cn.hutool hutool-all - 5.8.38 + 5.8.42 com.jayway.jsonpath json-path - 2.9.0 + 2.10.0 @@ -408,7 +384,7 @@ org.apache.commons commons-compress - 1.27.1 + 1.28.0 @@ -433,27 +409,6 @@ 1.12.0 - - - io.netty - netty-handler - 4.2.2.Final - - - - - org.springframework - spring-context - 6.1.21 - - - - - org.springframework - spring-context-support - 6.1.21 - - com.github.seratch From acdc273cd0ecdc507d36fac356edfb6bc2b84774 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Wed, 17 Dec 2025 19:14:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pom.xml b/pom.xml index 35d012e..3735ec2 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,18 @@ commons-text 1.15.0 + + + org.apache.commons + commons-lang3 + 3.20.0 + + + + org.jetbrains.kotlin + kotlin-stdlib + 2.2.21 + + + at.yawk.lz4 + lz4-java + 1.10.2 + software.amazon.awssdk kinesis