diff options
| author | lijinyang <[email protected]> | 2023-11-02 10:07:30 +0800 |
|---|---|---|
| committer | lijinyang <[email protected]> | 2023-11-02 10:07:30 +0800 |
| commit | 64bae22a57cf2bf92d6c8fae676feafa0a9f2936 (patch) | |
| tree | e39f785261922dd90f20ed74ce188aeff5337a3d | |
| parent | c26aaf51aab7bb46dd270f4b0d70eebbfb6c2054 (diff) | |
chore:更换jDK11
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | pom.xml | 8 | ||||
| -rw-r--r-- | src/main/java/com/mesa/reportservice/util/StringUtil.java | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 905fc47..bcb1c16 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,7 +8,7 @@ COPY xjar.go /build/ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o xjar . -#FROM 192.168.40.153:9080/common/jdk:1.8.0_73-jre +#FROM 192.168.40.153:9080/common/amazon-corretto:11.0.21.9.1 FROM ${JDK_IMAGE} MAINTAINER Galaxy VOLUME /tmp @@ -24,4 +24,4 @@ ENV JAVA_OPTS=" -Xms1024m -Xmx2048m " ENV LANG=C.UTF-8 #ENV TZ=Asia/Almaty #RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -ENTRYPOINT [ "sh", "-c", "./xjar java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar galaxy-report-service.xjar" ]
\ No newline at end of file +ENTRYPOINT [ "sh", "-c", "./xjar java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens jdk.zipfs/jdk.nio.zipfs=ALL-UNNAMED -jar galaxy-report-service.xjar" ]
\ No newline at end of file @@ -5,7 +5,7 @@ <parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> - <version>2.2.6.RELEASE</version> + <version>2.3.12.RELEASE</version> <relativePath/> <!-- lookup parent from repository --> </parent> <groupId>com.mesa</groupId> @@ -126,12 +126,10 @@ <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-core</artifactId> - <version>1.3.6</version> </dependency> <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-registry-prometheus</artifactId> - <version>1.3.6</version> </dependency> <dependency> <groupId>org.springframework.boot</groupId> @@ -256,7 +254,7 @@ <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <version>2.2.6.RELEASE</version> + <version>2.3.12.RELEASE</version> </plugin> <plugin> <groupId>io.github.zlika</groupId> @@ -315,7 +313,7 @@ <dockerHost>http://192.168.40.153:2375</dockerHost> <dockerDirectory>docker</dockerDirectory> <buildArgs> - <JDK_IMAGE>192.168.40.153:9080/common/jdk:1.8.0_202</JDK_IMAGE> + <JDK_IMAGE>192.168.40.153:9080/common/amazon-corretto:11.0.21.9.1</JDK_IMAGE> <GO_IMAGE>192.168.40.153:9080/common/golang:1.15.6</GO_IMAGE> <JAR_FILE>${project.build.finalName}.xjar</JAR_FILE> </buildArgs> diff --git a/src/main/java/com/mesa/reportservice/util/StringUtil.java b/src/main/java/com/mesa/reportservice/util/StringUtil.java index 63bc219..00d686a 100644 --- a/src/main/java/com/mesa/reportservice/util/StringUtil.java +++ b/src/main/java/com/mesa/reportservice/util/StringUtil.java @@ -2,7 +2,6 @@ package com.mesa.reportservice.util; import org.apache.commons.lang3.StringUtils; -import sun.misc.BASE64Encoder; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; |