From be1621c42d0778b06816bd1e34fd5fee1832f867 Mon Sep 17 00:00:00 2001
From: xgc <classxgc@mima>
Date: Mon, 22 Jan 2024 12:16:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8starter=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../neutrino-proxy-client-starter}/Dockerfile |   0
 .../neutrino-proxy-client-starter}/pom.xml    |  20 ++++++------------
 .../client/starter/SpringProxyClient.java     |   0
 .../starter/config/MainBusListeners.java      |   0
 .../starter/config/ProxyConfiguration.java    |   0
 .../starter/config/SpringProxyConfig.java     |   0
 .../starter/core/ProxyClientService.java      |   0
 .../client/starter/handler/BeanHandler.java   |   0
 .../starter/util/ApplicationContextUtils.java |   0
 .../src/main/resources/application.yml        |   0
 .../src/main/resources/test.jks               | Bin
 pom.xml                                       |   1 -
 12 files changed, 7 insertions(+), 14 deletions(-)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/Dockerfile (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/pom.xml (92%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/java/org/dromara/neutrinoproxy/client/starter/SpringProxyClient.java (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/java/org/dromara/neutrinoproxy/client/starter/config/MainBusListeners.java (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/java/org/dromara/neutrinoproxy/client/starter/config/ProxyConfiguration.java (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/java/org/dromara/neutrinoproxy/client/starter/config/SpringProxyConfig.java (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/java/org/dromara/neutrinoproxy/client/starter/core/ProxyClientService.java (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/java/org/dromara/neutrinoproxy/client/starter/handler/BeanHandler.java (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/java/org/dromara/neutrinoproxy/client/starter/util/ApplicationContextUtils.java (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/resources/application.yml (100%)
 rename {neutrino-proxy-client-starter => client+/neutrino-proxy-client-starter}/src/main/resources/test.jks (100%)

diff --git a/neutrino-proxy-client-starter/Dockerfile b/client+/neutrino-proxy-client-starter/Dockerfile
similarity index 100%
rename from neutrino-proxy-client-starter/Dockerfile
rename to client+/neutrino-proxy-client-starter/Dockerfile
diff --git a/neutrino-proxy-client-starter/pom.xml b/client+/neutrino-proxy-client-starter/pom.xml
similarity index 92%
rename from neutrino-proxy-client-starter/pom.xml
rename to client+/neutrino-proxy-client-starter/pom.xml
index ef3bebb2..fcad790c 100644
--- a/neutrino-proxy-client-starter/pom.xml
+++ b/client+/neutrino-proxy-client-starter/pom.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.noear</groupId>
-        <artifactId>solon-parent</artifactId>
-        <version>2.5.12</version>
-        <relativePath />
-    </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.javpower</groupId>
     <artifactId>neutrino-proxy-client-spring-boot-starter</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
-    <url>https://github.com/javpower/easy-proxy</url>
+    <url>https://github.com/javpower/neutrino-proxy</url>
     <licenses>
         <license>
             <name> The Apache Software License, Version 2.0 </name>
@@ -21,9 +15,9 @@
         </license>
     </licenses>
     <scm>
-        <url>https://github.com/javpower/easy-proxy</url>
-        <connection>scm:git@github.com/javpower/easy-proxy.git</connection>
-        <developerConnection>scm:git@github.com/javpower/easy-proxy.git</developerConnection>
+        <url>https://github.com/javpower/neutrino-proxy</url>
+        <connection>scm:git@github.com/javpower/neutrino-proxy.git</connection>
+        <developerConnection>scm:git@github.com/javpower/neutrino-proxy.git</developerConnection>
     </scm>
     <developers>
         <developer>
@@ -71,7 +65,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
+            <version>1.18.30</version>
         </dependency>
         <dependency>
             <groupId>net.dreamlu</groupId>
@@ -110,8 +104,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>21</source>
+                    <target>21</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
diff --git a/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/SpringProxyClient.java b/client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/SpringProxyClient.java
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/SpringProxyClient.java
rename to client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/SpringProxyClient.java
diff --git a/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/MainBusListeners.java b/client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/MainBusListeners.java
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/MainBusListeners.java
rename to client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/MainBusListeners.java
diff --git a/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/ProxyConfiguration.java b/client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/ProxyConfiguration.java
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/ProxyConfiguration.java
rename to client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/ProxyConfiguration.java
diff --git a/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/SpringProxyConfig.java b/client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/SpringProxyConfig.java
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/SpringProxyConfig.java
rename to client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/config/SpringProxyConfig.java
diff --git a/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/core/ProxyClientService.java b/client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/core/ProxyClientService.java
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/core/ProxyClientService.java
rename to client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/core/ProxyClientService.java
diff --git a/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/handler/BeanHandler.java b/client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/handler/BeanHandler.java
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/handler/BeanHandler.java
rename to client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/handler/BeanHandler.java
diff --git a/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/util/ApplicationContextUtils.java b/client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/util/ApplicationContextUtils.java
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/util/ApplicationContextUtils.java
rename to client+/neutrino-proxy-client-starter/src/main/java/org/dromara/neutrinoproxy/client/starter/util/ApplicationContextUtils.java
diff --git a/neutrino-proxy-client-starter/src/main/resources/application.yml b/client+/neutrino-proxy-client-starter/src/main/resources/application.yml
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/resources/application.yml
rename to client+/neutrino-proxy-client-starter/src/main/resources/application.yml
diff --git a/neutrino-proxy-client-starter/src/main/resources/test.jks b/client+/neutrino-proxy-client-starter/src/main/resources/test.jks
similarity index 100%
rename from neutrino-proxy-client-starter/src/main/resources/test.jks
rename to client+/neutrino-proxy-client-starter/src/main/resources/test.jks
diff --git a/pom.xml b/pom.xml
index 5deba066..70cd80d5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,6 @@
         <module>neutrino-proxy-client</module>
         <module>neutrino-proxy-server</module>
         <module>neutrino-proxy-client-sdk</module>
-        <module>neutrino-proxy-client-starter</module>
     </modules>
 
     <properties>