diff --git a/neutrino-proxy-client/Dockerfile b/neutrino-proxy-client/Dockerfile index 85388bdf..6ebc8aee 100644 --- a/neutrino-proxy-client/Dockerfile +++ b/neutrino-proxy-client/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jdk-alpine +FROM openjdk:17-jdk-alpine #同步时间 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ apk update && apk add wget unzip vim && apk add -U tzdata && \ diff --git a/neutrino-proxy-server/Dockerfile b/neutrino-proxy-server/Dockerfile index 6893ea59..76309336 100644 --- a/neutrino-proxy-server/Dockerfile +++ b/neutrino-proxy-server/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:8-jdk-alpine +FROM openjdk:17-jdk-alpine #同步时间 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories && \ apk update && apk add wget unzip vim && apk add -U tzdata && \ @@ -12,4 +12,4 @@ COPY ../neutrino-proxy-admin/dist /root/neutrino-proxy/neutrino-proxy-admin/dist #VOLUME ["/root/neutrino-proxy"] ENTRYPOINT ["java","-jar","neutrino-proxy-server.jar","config=./config/app.yml"] -#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7 \ No newline at end of file +#docker run -it -p 9000-9200:9000-9200/tcp -p 8888:8888 -v /root/neutrino-proxy/config:/root/neutrino-proxy/config -d --restart=always --name neutrino registry.cn-hangzhou.aliyuncs.com/asgc/aoshiguchen-docker-images:1.7 diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml index 87c4110e..236f978c 100644 --- a/neutrino-proxy-server/pom.xml +++ b/neutrino-proxy-server/pom.xml @@ -52,8 +52,8 @@ sqlite-jdbc - mysql - mysql-connector-java + com.mysql + mysql-connector-j com.zaxxer diff --git a/pom.xml b/pom.xml index 05cd8558..91d1545e 100644 --- a/pom.xml +++ b/pom.xml @@ -29,11 +29,12 @@ UTF-8 UTF-8 1.0-SNAPSHOT - - 1.8 - 3.8.0 + 17 + 17 + 17 + 3.10.1 1.1.0 - 1.18.4 + 1.18.26 @@ -41,7 +42,7 @@ io.netty netty-all - 4.1.22.Final + 4.1.91.Final org.slf4j @@ -94,10 +95,15 @@ sqlite-jdbc 3.39.2.1 + + + + + - mysql - mysql-connector-java - 5.1.49 + com.mysql + mysql-connector-j + 8.0.32 com.zaxxer