From f0769fb8fdd257d7cdc01a9e6de7c1510806f872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=8B=87?= <tanyong@cqliving.com>
Date: Tue, 11 Apr 2023 15:45:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7jdk17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 05cd8558..b8435a21 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,11 +29,12 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
         <revision>1.0-SNAPSHOT</revision>
-
-        <java.version>1.8</java.version>
-        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>17</java.version>
+        <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
         <maven-flatten.version>1.1.0</maven-flatten.version>
-        <org.projectlombok.version>1.18.4</org.projectlombok.version>
+        <org.projectlombok.version>1.18.26</org.projectlombok.version>
     </properties>
 
     <dependencyManagement>
@@ -41,7 +42,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-all</artifactId>
-                <version>4.1.22.Final</version>
+                <version>4.1.91.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>

From 25fab997239869b0918fc0466a35d9def962bcb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=8B=87?= <tanyong@cqliving.com>
Date: Tue, 11 Apr 2023 15:46:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?Dockerfile=E5=8D=87=E7=BA=A7jdk17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-client/Dockerfile | 2 +-
 neutrino-proxy-server/Dockerfile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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

From ec4f8cbd7fe31722772029626cdca53effc27152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=AD=E5=8B=87?= <tanyong@cqliving.com>
Date: Tue, 11 Apr 2023 15:54:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?mysql=E9=A9=B1=E5=8A=A8=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-server/pom.xml |  4 ++--
 pom.xml                       | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

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 @@
             <artifactId>sqlite-jdbc</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
diff --git a/pom.xml b/pom.xml
index b8435a21..91d1545e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,10 +95,15 @@
                 <artifactId>sqlite-jdbc</artifactId>
                 <version>3.39.2.1</version>
             </dependency>
+<!--            <dependency>-->
+<!--                <groupId>mysql</groupId>-->
+<!--                <artifactId>mysql-connector-java</artifactId>-->
+<!--                <version>5.1.49</version>-->
+<!--            </dependency>-->
             <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.49</version>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
+                <version>8.0.32</version>
             </dependency>
             <dependency>
                 <groupId>com.zaxxer</groupId>