diff --git a/README.cn.md b/README.cn.md index edd21d452da0784a895c6a572ffff4951d2e19a1..2f6ec082e066dccba3de3c2364f51bf1d7a7c8fe 100644 --- a/README.cn.md +++ b/README.cn.md @@ -1,23 +1,24 @@ -# FrameWiKi Network Proxy - -维基框架内网穿透工具 - -********************* - -## FrameWiKi Network Proxy 是做什么的？ - -- 需要用户自行提供硬件支持的服务或电脑、部署的内网穿透工具。 -- 可提供TCP协议类型的内网穿透服务，包括但不限于 http(s)、数据库连接、ssh等协议。 -- 支持https 与 http协议与应用交互方式（推荐使用https更安全）。 -- 支持无加密、控制端口加密交互、数据加密交互方式。 -- 主要服务场景，需要将内网的应用开放到公网，如微信小程序开发调试、支付回调等。 -- 支持 http 根据 host 进行反向代理；目标依然是内网应用，只是可以根据 http 协议 header 中的 host 字段区分选择目标应用（注意：只是有人提出来了 - http 监听统一端口并用域名访问的问题，并且有做的价值才补充的该功能；没做负载功能，这个是内网穿透，不是 - nginx，更不建议直接用在生产上，需要负载的可以自己去实现） +

+keytool +

+ +

+ star +fork + + + + + license MIT + +

# 1、简介 -

维基代理（wiki-proxy）是一个基于Netty的、开源的java内网穿透项目。遵循MIT许可，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。

+- 维基代理（wiki-proxy）、开源的java内网穿透项目。 +- 技术栈：cdkjFramework（维基框架）、JPA、Netty +- 遵循MIT许可，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。 +- 官网地址：https://www.framewiki.com/ # 2、项目结构 @@ -123,9 +124,9 @@ spring:

先将wiki-proxy-server.jar包、Dockerfile、start.sh、stop.sh上传至服务器 /user/web/wiki-proxy/server 目录下。

-### 4.1.1 构建Docker镜像 +### 4.1.1 构建并运行Docker镜像 -

切换工作目录至/user/web/wiki-proxy/server目录下

+

切换工作目录至/user/web/wiki-proxy/server目录下（根据自己的服务器目录结构进行修改）

```shell cd /user/web/wiki-proxy/server @@ -134,14 +135,7 @@ cd /user/web/wiki-proxy/server

执行如下命令构建Docker镜像

-```shell -docker build -t wiki-proxy-server . - -``` - -### 4.1.2 运行Docker镜像 - -```shell +``` shell ./start.sh ``` @@ -157,9 +151,9 @@ docker build -t wiki-proxy-server .

先将wiki-proxy-client.jar包、Dockerfile、start.sh、stop.sh上传至服务器 /user/web/wiki-proxy/client 目录下。

-### 4.2.1 构建Docker镜像 +### 4.2.1 构建并运行Docker镜像 -

切换工作目录至/user/web/wiki-proxy/client 目录下

+

切换工作目录至/user/web/wiki-proxy/client 目录下（根据自己的服务器目录结构进行修改）

```shell cd /user/web/wiki-proxy/client @@ -168,13 +162,6 @@ cd /user/web/wiki-proxy/client

执行如下命令构建Docker镜像

-```shell -docker build -t wiki-proxy-client . - -``` - -### 4.2.2 运行Docker镜像 - ```shell ./start.sh diff --git a/README.md b/README.md index 8df36c078ddf6b3ec8b346a50214ce574879149c..9a0a4af390130decd516c5c1849d99d89c3daa98 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,24 @@ -# FrameWiKi Network Proxy - -Wiki Framework Internal Network Penetration Tool -********************* - -## What does FrameWiKi Network Proxy do? - --Users are required to provide hardware support services, computers, and deployed intranet penetration tools on their -own. --We can provide intranet penetration services for TCP protocol types, including but not limited to HTTP (s), database -connection, SSH, and other protocols. --Support HTTPS and HTTP protocols and application interaction methods (HTTPS is recommended for greater security). --Support unencrypted, control port encrypted interaction, and data encrypted interaction methods. --The main service scenario requires opening up internal network applications to the public network, such as WeChat mini -program development and debugging, payment callbacks, etc. --Support HTTP reverse proxy based on host; The target is still an internal network application, but the target -application can be selected based on the host field in the HTTP protocol header (note: it was only suggested by someone) -The issue of HTTP listening on a unified port and accessing it using a domain name, and the added value of this feature; -There is no load function, this is internal network penetration, not -nginx， It is not recommended to use it directly in production, and those that require load can be implemented by -themselves +

+keytool +

+ +

+ star +fork + + + + + license MIT + +

# 1. Introduction -

Wiki proxy is an open-source Java intranet penetration project based on Netty. Following the MIT license, you may copy, -modify, distribute, and use it for any personal or commercial activity.

+- Wiki proxy, an open-source Java intranet penetration project. +- Technical stack: cdkjFramework (Wiki Framework) JPA、Netty +- Following the MIT license, you may copy, modify, distribute, and use it for any personal or commercial activity. +- Official website address: https://www.framewiki.com/ # 2. Project Structure @@ -129,9 +124,9 @@ spring:

First, upload the wiki-proxy-server. jar package, Dockerfile, start.sh, and stop.sh to the server/user/web/wiki proxy/server directory.

-### 4.1.1 Building Docker Images +### 4.1.1 Build and run Docker images -

Switch the working directory to the /user/web/wiki proxy/server directory

+

Switch the working directory to the/user/web/wiki-proxy/server directory (modify according to your own server directory structure)

```shell cd /user/web/wiki-proxy/server @@ -140,13 +135,6 @@ cd /user/web/wiki-proxy/server

Execute the following command to build a Docker image

-```shell -docker build -t wiki-proxy-server . - -``` - -### 4.1.2 Run Docker image - ```shell ./start.sh @@ -161,11 +149,11 @@ docker build -t wiki-proxy-server . ## 4.2 Deploy client -

First, upload the wiki-proy-client. jar package, Dockerfile, start.sh, and stop.sh to the server/user/web/wiki proxy/client directory.

+

First, upload the wiki-proy-client. jar package, Dockerfile, start.sh, and stop.sh to the server/user/web/wiki proxy/client directory (modify according to your own server directory structure)

-### 4.2.1 Building Docker Images +### 4.2.1 Build and run Docker images -

Switch the working directory to the /user/web/wiki proxy/client directory

+

Switch the working directory to the /user/web/wiki-proxy/client directory

```shell cd /user/web/wiki-proxy/client @@ -174,13 +162,6 @@ cd /user/web/wiki-proxy/client

Execute the following command to build a Docker image

-```shell -docker build -t wiki-proxy-client . - -``` - -### 4.2.2 Run Docker image - ```shell ./start.sh diff --git a/client/proxy-client-web/Dockerfile b/client/proxy-client-web/Dockerfile index 967a3e3a2fbe1eead2696db3d6a2e89d190f35db..77f940e764760ea614b486ddcca6484732c60a5a 100644 --- a/client/proxy-client-web/Dockerfile +++ b/client/proxy-client-web/Dockerfile @@ -1,23 +1,38 @@ -#指定以 openjdk:17-jdk-oracle 为基础镜像，来构建此镜像，可以理解为运行的需要基础环境 +# 使用官方OpenJDK镜像 FROM openjdk:17-jdk-oracle -#创建目录 -RUN mkdir -p /user/web -RUN mkdir -p /user/web/wiki-proxy -RUN mkdir -p /user/web/wiki-proxy/client -#指定容器的工作目录 -ENV jar_file /user/web/wiki-proxy/client -#添加时区指向 -ENV TZ=Asia/Shanghai -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -#WORKDIR指令用于指定容器的一个目录， 容器启动时执行的命令会在该目录下执行。 -WORKDIR ${jar_file} -#将当前文件夹下面 demo.jar 复制到容器对应目录下 -ENV jar_name wiKi-proxy-client.jar -ADD ${jar_name} ${jar_file}${jar_name} -#jar文件端口 通过启动命令传入进来 -ENV server_port ${server_port} -EXPOSE ${server_port} -#容器启动时执行的命令 -CMD nohup java -jar \ --Xmx256m -Xmn256m -Xss256k -XX:+HeapDumpOnOutOfMemoryError \ -${jar_file}${jar_name} --server.port=${server_port} \ No newline at end of file + +# 定义构建参数（带默认值） +ARG SERVER_PORT=8888 +ARG TCP_PORT=10010 +ARG TCP_IP=127.0.0.1 +ARG SPRING_PROFILE=test +ARG JAR_NAME=wiki-proxy-client.jar + +# 设置时区和工作目录的环境变量 +ENV TZ=Asia/Shanghai \ + JAR_FILE=/usr/web/wiki-proxy/client/ \ + SPRING_PROFILES_ACTIVE=${SPRING_PROFILE} \ + SPRING_PROXY_CLIENT_SERVICE_IP=${TCP_IP} \ + SPRING_PROXY_CLIENT_SERVICE_PORT=${TCP_PORT} + +# 创建目录（合并为单条RUN指令减少层数） +RUN mkdir -p ${JAR_FILE} && \ + ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \ + echo $TZ > /etc/timezone + +# 设置工作目录 +WORKDIR ${JAR_FILE} + +# 复制JAR文件到容器指定目录 +COPY ${JAR_NAME} ${JAR_FILE}${JAR_NAME} + +# 暴露端口（使用构建参数） +EXPOSE ${SERVER_PORT} + +# 使用 sh -c 执行启动命令，确保环境变量得到解析 +ENTRYPOINT ["sh", "-c", "java -jar -Xmx256m -Xmn256m -Xss256k \ + -XX:+HeapDumpOnOutOfMemoryError ${JAR_FILE}wiki-proxy-client.jar \ + -Dspring.proxy.client.serviceIp=${TCP_IP} \ + -Dspring.proxy.client.servicePort=${TCP_PORT} \ + -Dserver.port=${SERVER_PORT} \ + -Dspring.profiles.active=${SPRING_PROFILE}"] \ No newline at end of file diff --git a/client/proxy-client-web/pom.xml b/client/proxy-client-web/pom.xml index 375db5cff4cce51663e84ca57f2895ab694f78cf..c9fb96fc53114b306e3904ff5852255e16bb21ee 100644 --- a/client/proxy-client-web/pom.xml +++ b/client/proxy-client-web/pom.xml @@ -37,7 +37,7 @@ compile - wiKi-proxy-client + wiki-proxy-client org.springframework.boot diff --git a/client/proxy-client-web/src/main/resources/application-test.yml b/client/proxy-client-web/src/main/resources/application-test.yml new file mode 100644 index 0000000000000000000000000000000000000000..45da09b7f900f7cd1af14f510fc5dd4eefa57200 --- /dev/null +++ b/client/proxy-client-web/src/main/resources/application-test.yml @@ -0,0 +1,5 @@ +spring: + proxy: + server: + # 证书存放路径 + ssl-key-store-path: /usr/web/wiki-proxy/server/wiki-proxy.jks \ No newline at end of file diff --git a/client/proxy-client-web/src/main/resources/application.yml b/client/proxy-client-web/src/main/resources/application.yml index 518ab239b9508a4126d646ad27ddbe634b127a70..5a884dcad88579cc8d4cf33c03f03838a5b78968 100644 --- a/client/proxy-client-web/src/main/resources/application.yml +++ b/client/proxy-client-web/src/main/resources/application.yml @@ -2,12 +2,13 @@ server: port: 8888 spring: + profile: test application: name: wiki-proxy-client proxy: client: # 服务端ip - service-ip: 127.0.0.1 + service-ip: 10.10.0.94 # 服务端端口 service-port: 10010 ip: @@ -16,8 +17,8 @@ spring: - 50501 port: - 443 # 服务端暴露端口 - # 证书存放路径，若不想打进jar包，可不带classpath:前缀 - ssl-key-store-path: "D:\\Project\\wiki-proxy\\server\\proxy-server-web\\src\\main\\resources\\wiki-proxy.jks" + # 证书存放路径 + ssl-key-store-path: "F:\\workspace\\wiki-proxy\\server\\proxy-server-web\\src\\main\\resources\\wiki-proxy.jks" # 证书密码 ssl-key-store-password: "wiki-proxy@SaFePwd2025!" # 证书类型 diff --git a/client/proxy-client-web/start.sh b/client/proxy-client-web/start.sh index 677f09c317129a8573f0083fcb21a09195b99e65..5d751a35c1536e0bd5c9915facca754b0733bf48 100644 --- a/client/proxy-client-web/start.sh +++ b/client/proxy-client-web/start.sh @@ -1,23 +1,73 @@ #!/bin/bash -echo "开始构建" -#构建镜像 -#分别输入 容器名称 和要构建的 版本号 eg test 111 生成版本号为 test:111 -#contain_name=test -#version=1 -contain_name=wiKi-proxy-client -read -p "Please enter your contain name and version eg : v1.0: " version -echo "contain name and version is [${contain_name}:${version}]" -#输入要构建的端口号 或者自定义 -#server_port=8001 -read -p "Please enter your application server port in(1024到49151) " server_port -echo "you input server port is [${server_port}]" -#取消自定义命令 -#contain_name=demo -docker rmi ${contain_name}:${version} -docker buildx build -t ${contain_name}:${version} . -#停用之前的服务 -docker stop ${contain_name} -docker rm ${contain_name} -#启动容器 -docker run -p ${server_port}:${server_port} -e server_port=${server_port} --name ${contain_name} -d ${contain_name}:${version} -echo "构建完成" \ No newline at end of file + +contain_name="wiki-proxy-client" +default_port=8888 +default_tcp_port=10010 +default_ip="127.0.0.1" +default_profile="test" + +# 输入镜像版本 +read -p "请输入镜像版本号（例如 v1.0.0）: " version +if [[ -z "$version" ]]; then + echo "错误：版本号不能为空！" + exit 1 +fi + +# 输入应用端口（校验范围） +while true; do + read -p "请输入应用端口号（1024-49151，默认${default_port}）: " server_port + server_port=${server_port:-$default_port} + if [[ "$server_port" =~ ^[0-9]+$ ]] && [ "$server_port" -ge 1024 ] && [ "$server_port" -le 49151 ]; then + break + else + echo "错误：端口号必须是1024到49151之间的数字！" + fi +done +# 输入应用TCP端口（校验范围） +while true; do + read -p "请输入应用TCP端口号（1024-49151，默认${default_tcp_port}）: " tcp_port + tcp_port=${tcp_port:-$default_tcp_port} + if [[ "$tcp_port" =~ ^[0-9]+$ ]] && [ "$tcp_port" -ge 1024 ] && [ "$tcp_port" -le 49151 ]; then + break + else + echo "错误：端口号必须是1024到49151之间的数字！" + fi +done + +# 输入 Spring 配置文件（例如 test, dev, prod） +read -p "请输入应用TCP IP（默认${default_ip}）切记输入为服务器的IP地址: " tcp_ip +tcp_ip=${tcp_ip:-$default_ip} + +# 输入 Spring 配置文件（例如 test, dev, prod） +read -p "请输入 Spring 配置文件（默认${default_profile}）: " profile +profile=${profile:-$default_profile} + +echo "------------------------------" +echo "镜像名称与版本: ${contain_name}:${version}" +echo "应用端口号: ${server_port}" +echo "应用TCP端口号: ${tcp_port}" +echo "应用TCP IP: ${tcp_ip}" +echo "使用的 Spring 配置文件: ${profile}" +echo "------------------------------" + +# 清理旧镜像和容器 +docker stop ${contain_name} 2>/dev/null +docker rm ${contain_name} 2>/dev/null +docker rmi ${contain_name}:${version} 2>/dev/null + +# 构建镜像（传递构建参数） +docker build --build-arg SERVER_PORT=${server_port} --build-arg TCP_IP=${tcp_ip} --build-arg TCP_PORT=${tcp_port} --build-arg SPRING_PROFILE=${profile} -t ${contain_name}:${version} . + +# 运行容器（传递环境变量） +docker run -d \ + --restart always \ + -p ${server_port}:${server_port} \ + --name ${contain_name} \ + -e SERVER_PORT=${server_port} \ + -e TCP_PORT=${tcp_port} \ + -e TCP_IP=${tcp_ip} \ + -e SPRING_PROFILE=${profile} \ + ${contain_name}:${version} + +echo "构建完成！" +echo "访问地址：http://localhost:${server_port}" diff --git a/client/proxy-client-web/stop.sh b/client/proxy-client-web/stop.sh index de4fc7399d705b8568e57568bff8d5bd0e735bb0..7567df2cbd9b859d5b5e7c24dffee4175ddbe783 100644 --- a/client/proxy-client-web/stop.sh +++ b/client/proxy-client-web/stop.sh @@ -1,9 +1,11 @@ -#vi stopAndRemoveContain.sh #!/bin/bash -contain_name=wiKi-proxy-client -#停止容器 -docker stop ${contain_name} -#删除容器 -docker rm ${contain_name} -#删除容器镜像 -docker rmi ${contain_name} \ No newline at end of file + +contain_name="wiki-proxy-client" + +# 检查并停止容器 +if docker ps -q -f name=${contain_name}; then + echo "停止容器 ${contain_name} ..." + docker stop ${contain_name} +else + echo "容器 ${contain_name} 未运行或不存在！" +fi \ No newline at end of file diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/WikiProxyClient.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/WikiProxyClient.java index 1f1164d1432255660970dd64b05b2f003a841750..caf1721116f64fd1f1274e846614427e6e4cd830 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/WikiProxyClient.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/WikiProxyClient.java @@ -1,8 +1,10 @@ package com.framewiki.proxy.client.core; +import com.cdkjframework.util.log.LogUtils; +import com.cdkjframework.util.tool.JsonUtils; import com.framewiki.proxy.client.core.config.ProxyConfig; -import com.framewiki.network.proxy.common.CommonConstants; -import com.framewiki.network.proxy.model.HttpRoute; +import com.framewiki.proxy.core.common.CommonConstants; +import com.framewiki.proxy.core.model.HttpRoute; import com.framewiki.proxy.client.core.side.client.ClientControlThread; import com.framewiki.proxy.client.core.side.client.config.impl.AllSecretInteractiveClientConfig; import com.framewiki.proxy.client.core.side.client.config.impl.HttpRouteClientConfig; @@ -12,7 +14,7 @@ import org.apache.commons.lang3.StringUtils; import java.util.List; -import static com.framewiki.network.proxy.common.CommonConstants.ListenDest; +import static com.framewiki.proxy.core.common.CommonConstants.ListenDest; /** * @ProjectName: wiki-proxy @@ -24,6 +26,10 @@ import static com.framewiki.network.proxy.common.CommonConstants.ListenDest; * @Version: 1.0 */ public class WikiProxyClient { + /** + * 日志 + */ + private final LogUtils log = LogUtils.getLogger(WikiProxyClient.class); /** * 配置 diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/config/ProxyConfig.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/config/ProxyConfig.java index 9bdf18a43751e8838211ffbcea0dec17d8187eb1..a1d319844d57c84aaffdf311b54da165ad4e7cb3 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/config/ProxyConfig.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/config/ProxyConfig.java @@ -3,6 +3,7 @@ package com.framewiki.proxy.client.core.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,6 +19,7 @@ import java.util.List; * @Version: 1.0 */ @Data +@Primary @Component @Configuration @ConfigurationProperties(prefix = "spring.proxy.client") diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/ClientControlThread.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/ClientControlThread.java index 6329cb36a834e217423a430bcc50434481354ee9..e2d7ab210837e396cf8d20fd66a72e121a6598cd 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/ClientControlThread.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/ClientControlThread.java @@ -1,8 +1,8 @@ package com.framewiki.proxy.client.core.side.client; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.IBelongControl; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.api.IBelongControl; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; import com.framewiki.proxy.client.core.side.client.adapter.ClientAdapter; import com.framewiki.proxy.client.core.side.client.config.ClientConfig; import com.framewiki.proxy.client.core.side.client.heart.IClientHeartThread; @@ -16,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.nio + * @Package: com.framewiki.proxy.core.nio * @ClassName: FrameExecutor * @Description: 客户端控制服务 * @Author: frank tiger diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/adapter/ClientAdapter.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/adapter/ClientAdapter.java index 0dbbe0fabeaf61f883e27d8483f321a36d1b96d7..eba6764d4bf86c3167f0b5ce2b8bc4d2d3f5e65d 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/adapter/ClientAdapter.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/adapter/ClientAdapter.java @@ -1,7 +1,7 @@ package com.framewiki.proxy.client.core.side.client.adapter; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.interactive.ServerWaitModel; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.interactive.ServerWaitModel; import java.time.LocalDateTime; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/adapter/impl/InteractiveSimpleClientAdapter.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/adapter/impl/InteractiveSimpleClientAdapter.java index a1bd250b47a8b8ed7a552cf5f049e353deae1d3c..2dc1fcb6e3d92b2d064c1d3201dd679bb8e77a8f 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/adapter/impl/InteractiveSimpleClientAdapter.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/adapter/impl/InteractiveSimpleClientAdapter.java @@ -2,15 +2,15 @@ package com.framewiki.proxy.client.core.side.client.adapter.impl; import com.cdkjframework.exceptions.GlobalRuntimeException; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.executor.FrameExecutor; -import com.framewiki.network.proxy.model.FrameResultModel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.FrameResultEnum; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; -import com.framewiki.network.proxy.model.interactive.ClientControlModel; -import com.framewiki.network.proxy.model.interactive.ServerWaitModel; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.executor.FrameExecutor; +import com.framewiki.proxy.core.model.FrameResultModel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.FrameResultEnum; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.model.interactive.ClientControlModel; +import com.framewiki.proxy.core.model.interactive.ServerWaitModel; import com.framewiki.proxy.client.core.side.client.ClientControlThread; import com.framewiki.proxy.client.core.side.client.adapter.ClientAdapter; import com.framewiki.proxy.client.core.side.client.config.ClientConfig; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/ClientConfig.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/ClientConfig.java index 8d398a8f529a3d36da5fd28aa70ca555076d7ed2..7b06e26d11576ffc52a3bc0a284bf11781ef1be8 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/ClientConfig.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/ClientConfig.java @@ -1,7 +1,7 @@ package com.framewiki.proxy.client.core.side.client.config; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; import com.framewiki.proxy.client.core.side.client.ClientControlThread; import com.framewiki.proxy.client.core.side.client.adapter.ClientAdapter; import com.framewiki.proxy.client.core.side.client.heart.IClientHeartThread; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/AllSecretInteractiveClientConfig.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/AllSecretInteractiveClientConfig.java index bd0ce9de752d5ed221f00e74ca98db804aa96c52..d32ace2aaa6c295d3594bae64ca31b003284e34e 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/AllSecretInteractiveClientConfig.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/AllSecretInteractiveClientConfig.java @@ -1,10 +1,10 @@ package com.framewiki.proxy.client.core.side.client.config.impl; -import com.framewiki.network.proxy.api.secret.impl.AesSecret; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; -import com.framewiki.network.proxy.api.socket.part.SecretSocketPart; +import com.framewiki.proxy.core.api.secret.impl.AesSecret; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.api.socket.part.SecretSocketPart; import com.framewiki.proxy.client.core.side.client.ClientControlThread; -import com.framewiki.network.proxy.util.AesUtils; +import com.framewiki.proxy.core.util.AesUtils; import lombok.Getter; import lombok.Setter; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/HttpRouteClientConfig.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/HttpRouteClientConfig.java index 886f0923da387939223b14f0edf11211f57f3959..21b2ab3261257a9bc382eb090c11c0ab9b910fae 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/HttpRouteClientConfig.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/HttpRouteClientConfig.java @@ -1,12 +1,12 @@ package com.framewiki.proxy.client.core.side.client.config.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.IHttpRouting; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; -import com.framewiki.network.proxy.api.socket.part.HttpRouteSocketPart; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.HttpRoute; -import com.framewiki.network.proxy.model.InteractiveModel; +import com.framewiki.proxy.core.api.IHttpRouting; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.api.socket.part.HttpRouteSocketPart; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.HttpRoute; +import com.framewiki.proxy.core.model.InteractiveModel; import com.framewiki.proxy.client.core.side.client.ClientControlThread; import com.framewiki.proxy.client.core.side.client.adapter.ClientAdapter; import com.framewiki.proxy.client.core.side.client.adapter.impl.InteractiveSimpleClientAdapter; @@ -14,7 +14,7 @@ import com.framewiki.proxy.client.core.side.client.handler.impl.CommonReplyHandl import com.framewiki.proxy.client.core.side.client.handler.impl.ServerHeartHandler; import com.framewiki.proxy.client.core.side.client.handler.impl.ServerWaitClientHandler; import com.framewiki.proxy.client.core.side.client.heart.IClientHeartThread; -import com.framewiki.network.proxy.util.AssertUtils; +import com.framewiki.proxy.core.util.AssertUtils; import lombok.Getter; import org.apache.commons.lang3.StringUtils; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/InteractiveClientConfig.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/InteractiveClientConfig.java index 8918418f7859aa1add55e2465f4f6cac3a5597f3..dbb240e21fc5a585df19f95093f0915c509a9ac3 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/InteractiveClientConfig.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/InteractiveClientConfig.java @@ -2,11 +2,11 @@ package com.framewiki.proxy.client.core.side.client.config.impl; import com.cdkjframework.exceptions.GlobalRuntimeException; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; -import com.framewiki.network.proxy.api.socket.part.SimpleSocketPart; -import com.framewiki.network.proxy.channel.impl.InteractiveChannelBase; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.api.socket.part.SimpleSocketPart; +import com.framewiki.proxy.core.channel.impl.InteractiveChannelBase; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; import com.framewiki.proxy.client.core.side.client.ClientControlThread; import com.framewiki.proxy.client.core.side.client.adapter.ClientAdapter; import com.framewiki.proxy.client.core.side.client.adapter.impl.InteractiveSimpleClientAdapter; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/SecretInteractiveClientConfig.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/SecretInteractiveClientConfig.java index b3bad2056f6ad63f40c915af2088bf0f38672cb0..be61138d994a29bf92e13575213b3340563cd854 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/SecretInteractiveClientConfig.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/config/impl/SecretInteractiveClientConfig.java @@ -2,11 +2,10 @@ package com.framewiki.proxy.client.core.side.client.config.impl; import com.cdkjframework.exceptions.GlobalRuntimeException; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.channel.impl.SecretInteractiveChannelBase; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.util.AesUtils; -import com.framewiki.proxy.client.core.side.client.adapter.impl.InteractiveSimpleClientAdapter; +import com.framewiki.proxy.core.channel.impl.SecretInteractiveChannelBase; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.util.AesUtils; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/CommonReplyHandler.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/CommonReplyHandler.java index 644262e98a44562e62a3f709436db7e5fd38e0a9..2b591ffcc0de720d887c0df384a6fb90fc02a943 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/CommonReplyHandler.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/CommonReplyHandler.java @@ -1,10 +1,9 @@ package com.framewiki.proxy.client.core.side.client.handler.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; import com.framewiki.proxy.client.core.side.client.adapter.ClientAdapter; -import com.framewiki.proxy.client.core.side.client.adapter.impl.InteractiveSimpleClientAdapter; import com.framewiki.proxy.client.core.side.client.handler.IClientHandler; import lombok.Getter; import lombok.Setter; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/ServerHeartHandler.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/ServerHeartHandler.java index dab9bb8f56927312fb0d73b6c5f10e02f9de8a72..ebe6deeeef9409ae062d9ec832c380edd7acdef6 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/ServerHeartHandler.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/ServerHeartHandler.java @@ -1,11 +1,10 @@ package com.framewiki.proxy.client.core.side.client.handler.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.FrameResultEnum; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.FrameResultEnum; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; import com.framewiki.proxy.client.core.side.client.adapter.ClientAdapter; -import com.framewiki.proxy.client.core.side.client.config.impl.SecretInteractiveClientConfig; import com.framewiki.proxy.client.core.side.client.handler.IClientHandler; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/ServerWaitClientHandler.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/ServerWaitClientHandler.java index d4bed5469e5ea547f723998de769ff0e0f1675da..cc0328b9aeeec466ec469a9bb0fbad427c6e08a8 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/ServerWaitClientHandler.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/handler/impl/ServerWaitClientHandler.java @@ -1,9 +1,8 @@ package com.framewiki.proxy.client.core.side.client.handler.impl; -import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; -import com.framewiki.network.proxy.model.interactive.ServerWaitModel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.model.interactive.ServerWaitModel; import com.framewiki.proxy.client.core.side.client.adapter.ClientAdapter; import com.framewiki.proxy.client.core.side.client.handler.IClientHandler; diff --git a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/heart/impl/ClientHeartThread.java b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/heart/impl/ClientHeartThread.java index 9b98ba91ee3082e947471001cfd87636abbc55c1..3aaf30df33f1cf9f92c988b30fc3583efe3eb69f 100644 --- a/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/heart/impl/ClientHeartThread.java +++ b/client/proxy-client/src/main/java/com/framewiki/proxy/client/core/side/client/heart/impl/ClientHeartThread.java @@ -1,7 +1,7 @@ package com.framewiki.proxy.client.core.side.client.heart.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.executor.FrameExecutor; +import com.framewiki.proxy.core.executor.FrameExecutor; import com.framewiki.proxy.client.core.side.client.ClientControlThread; import com.framewiki.proxy.client.core.side.client.heart.IClientHeartThread; import lombok.Getter; diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/agent.iml b/proxy-core/src/main/java/com/framewiki/network/proxy/agent.iml deleted file mode 100644 index bcafec0b05d50033e397ad0063068af993de1e4f..0000000000000000000000000000000000000000 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/agent.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/IBelongControl.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/IBelongControl.java similarity index 85% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/IBelongControl.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/IBelongControl.java index bc57731160881592d1908dfe35dc5ff7310e6ade..9319120106dffe66ec1794ec072b0c9989c8d7f4 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/IBelongControl.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/IBelongControl.java @@ -1,8 +1,8 @@ -package com.framewiki.network.proxy.api; +package com.framewiki.proxy.core.api; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api + * @Package: com.framewiki.proxy.core.api * @ClassName: IBelongControl * @Description: 通知上次停止的统一类，为适应不同的类型进行不同的函数封装 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/IHttpRouting.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/IHttpRouting.java similarity index 70% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/IHttpRouting.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/IHttpRouting.java index 2e5953806c5ed83e3aeadf10761132e284aaabb9..9a09921b77ce346168bc633589521a8c3b293927 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/IHttpRouting.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/IHttpRouting.java @@ -1,10 +1,10 @@ -package com.framewiki.network.proxy.api; +package com.framewiki.proxy.core.api; -import com.framewiki.network.proxy.model.HttpRoute; +import com.framewiki.proxy.core.model.HttpRoute; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api + * @Package: com.framewiki.proxy.core.api * @ClassName: IHttpRouting * @Description: http 路由器 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/passway/SecretPassway.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/passway/SecretPassway.java similarity index 89% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/passway/SecretPassway.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/passway/SecretPassway.java index 00f2ae85b461b06792ed3f52ee1efa0a736f164f..b67744705d482c4fb4830b9331632f35b6c4714d 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/passway/SecretPassway.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/passway/SecretPassway.java @@ -1,12 +1,12 @@ -package com.framewiki.network.proxy.api.passway; +package com.framewiki.proxy.core.api.passway; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.IBelongControl; -import com.framewiki.network.proxy.api.secret.ISecret; -import com.framewiki.network.proxy.channel.impl.LengthChannelBase; -import com.framewiki.network.proxy.executor.FrameExecutor; -import com.framewiki.network.proxy.nio.impl.NioHallows; -import com.framewiki.network.proxy.util.ToolsUtils; +import com.framewiki.proxy.core.api.IBelongControl; +import com.framewiki.proxy.core.api.secret.ISecret; +import com.framewiki.proxy.core.channel.impl.LengthChannelBase; +import com.framewiki.proxy.core.executor.FrameExecutor; +import com.framewiki.proxy.core.nio.impl.NioHallows; +import com.framewiki.proxy.core.util.ToolsUtils; import lombok.Data; @@ -20,7 +20,7 @@ import java.util.Objects; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api.passway + * @Package: com.framewiki.proxy.core.api.passway * @ClassName: SecretPassway * @Description: 加密型隧道，一侧加密，一侧原样输入、输出 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/passway/SimplePassway.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/passway/SimplePassway.java similarity index 92% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/passway/SimplePassway.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/passway/SimplePassway.java index 6d2beaa1b38d23d191f4f270fc9b724045dc9e81..9701ab4a6a828676c9538c2e4e1ab775f4053bf7 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/passway/SimplePassway.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/passway/SimplePassway.java @@ -1,12 +1,11 @@ -package com.framewiki.network.proxy.api.passway; +package com.framewiki.proxy.core.api.passway; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.IBelongControl; -import com.framewiki.network.proxy.api.socket.part.SimpleSocketPart; -import com.framewiki.network.proxy.executor.FrameExecutor; -import com.framewiki.network.proxy.nio.NioProcessed; -import com.framewiki.network.proxy.nio.impl.NioHallows; -import com.framewiki.network.proxy.util.ToolsUtils; +import com.framewiki.proxy.core.api.IBelongControl; +import com.framewiki.proxy.core.executor.FrameExecutor; +import com.framewiki.proxy.core.nio.NioProcessed; +import com.framewiki.proxy.core.nio.impl.NioHallows; +import com.framewiki.proxy.core.util.ToolsUtils; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -23,7 +22,7 @@ import java.util.Objects; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api.passway + * @Package: com.framewiki.proxy.core.api.passway * @ClassName: SimplePassway * @Description: 简单的隧道，无任何处理，只从输入侧原样输出到输出侧 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/secret/ISecret.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/secret/ISecret.java similarity index 86% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/secret/ISecret.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/secret/ISecret.java index bea41ca14b17aa19f081f9af995315fb34239f0c..833927e62a887470b8070432fdafa72555eaf589 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/secret/ISecret.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/secret/ISecret.java @@ -1,8 +1,8 @@ -package com.framewiki.network.proxy.api.secret; +package com.framewiki.proxy.core.api.secret; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api.secret + * @Package: com.framewiki.proxy.core.api.secret * @ClassName: ISecret * @Description: 加密方法 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/secret/impl/AesSecret.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/secret/impl/AesSecret.java similarity index 83% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/secret/impl/AesSecret.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/secret/impl/AesSecret.java index 22fd35ca5e2282da9c77e4fbf585725b234253b0..bdab1f564e6aa6d46b2645d066dbedb5eee28c3d 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/secret/impl/AesSecret.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/secret/impl/AesSecret.java @@ -1,14 +1,14 @@ -package com.framewiki.network.proxy.api.secret.impl; +package com.framewiki.proxy.core.api.secret.impl; -import com.framewiki.network.proxy.api.secret.ISecret; -import com.framewiki.network.proxy.util.AesUtils; +import com.framewiki.proxy.core.api.secret.ISecret; +import com.framewiki.proxy.core.util.AesUtils; import lombok.Data; import java.security.Key; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api + * @Package: com.framewiki.proxy.core.api * @ClassName: AesSecret * @Description: AES加密方式 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/BaseSocketPart.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/BaseSocketPart.java similarity index 91% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/BaseSocketPart.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/BaseSocketPart.java index 92f0d9f4066d7a6d952b355ded19e30436da81d5..e862eb15283e89d40fb66681167d4b0395a9563c 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/BaseSocketPart.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/BaseSocketPart.java @@ -1,6 +1,6 @@ -package com.framewiki.network.proxy.api.socket.part; +package com.framewiki.proxy.core.api.socket.part; -import com.framewiki.network.proxy.api.IBelongControl; +import com.framewiki.proxy.core.api.IBelongControl; import lombok.AccessLevel; import lombok.Data; import lombok.Getter; @@ -12,7 +12,7 @@ import java.time.LocalDateTime; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api.socketpart + * @Package: com.framewiki.proxy.core.api.socketpart * @ClassName: BaseSocketPart * @Description: socketPart抽象类 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/HttpRouteSocketPart.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/HttpRouteSocketPart.java similarity index 92% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/HttpRouteSocketPart.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/HttpRouteSocketPart.java index 8cde2aacabeff3ebf1061ba5de7be99d570aa166..6a0d58a87b0057b2a7b37eea8dac6c89bed4d397 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/HttpRouteSocketPart.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/HttpRouteSocketPart.java @@ -1,12 +1,12 @@ -package com.framewiki.network.proxy.api.socket.part; +package com.framewiki.proxy.core.api.socket.part; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.IBelongControl; -import com.framewiki.network.proxy.api.IHttpRouting; -import com.framewiki.network.proxy.api.passway.SimplePassway; -import com.framewiki.network.proxy.model.HttpRoute; -import com.framewiki.network.proxy.util.AssertUtils; -import com.framewiki.network.proxy.util.ToolsUtils; +import com.framewiki.proxy.core.api.IBelongControl; +import com.framewiki.proxy.core.api.IHttpRouting; +import com.framewiki.proxy.core.api.passway.SimplePassway; +import com.framewiki.proxy.core.model.HttpRoute; +import com.framewiki.proxy.core.util.AssertUtils; +import com.framewiki.proxy.core.util.ToolsUtils; import java.io.BufferedInputStream; @@ -19,7 +19,7 @@ import java.nio.charset.StandardCharsets; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api.socketpart + * @Package: com.framewiki.proxy.core.api.socketpart * @ClassName: HttpRouteSocketPart * @Description: http路由socket对 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/SecretSocketPart.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/SecretSocketPart.java similarity index 90% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/SecretSocketPart.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/SecretSocketPart.java index 237010152f2e59bc8baad25702505802b3ea2f3b..b4b561246ce4d282b9eb449ed5d656f648614cba 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/SecretSocketPart.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/SecretSocketPart.java @@ -1,11 +1,11 @@ -package com.framewiki.network.proxy.api.socket.part; +package com.framewiki.proxy.core.api.socket.part; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.IBelongControl; -import com.framewiki.network.proxy.api.passway.SecretPassway; -import com.framewiki.network.proxy.api.secret.ISecret; -import com.framewiki.network.proxy.model.FrameResultModel; -import com.framewiki.network.proxy.util.AssertUtils; +import com.framewiki.proxy.core.api.IBelongControl; +import com.framewiki.proxy.core.api.passway.SecretPassway; +import com.framewiki.proxy.core.api.secret.ISecret; +import com.framewiki.proxy.core.model.FrameResultModel; +import com.framewiki.proxy.core.util.AssertUtils; import lombok.Getter; import lombok.Setter; @@ -16,7 +16,7 @@ import java.util.concurrent.CountDownLatch; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api.socketpart + * @Package: com.framewiki.proxy.core.api.socketpart * @ClassName: SecretSocketPart * @Description: 加密-无加密socket对 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/SimpleSocketPart.java b/proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/SimpleSocketPart.java similarity index 91% rename from proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/SimpleSocketPart.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/SimpleSocketPart.java index 9a8bf5ea3f7c3c3718352b0023d6a282660a3f4b..53e8993a17ddb5eca963fb8a2af1730638a0f508 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/api/socket/part/SimpleSocketPart.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/api/socket/part/SimpleSocketPart.java @@ -1,10 +1,9 @@ -package com.framewiki.network.proxy.api.socket.part; +package com.framewiki.proxy.core.api.socket.part; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.IBelongControl; -import com.framewiki.network.proxy.api.passway.SecretPassway; -import com.framewiki.network.proxy.api.passway.SimplePassway; -import com.framewiki.network.proxy.util.AssertUtils; +import com.framewiki.proxy.core.api.IBelongControl; +import com.framewiki.proxy.core.api.passway.SimplePassway; +import com.framewiki.proxy.core.util.AssertUtils; import lombok.Getter; import lombok.Setter; @@ -15,7 +14,7 @@ import java.util.concurrent.CountDownLatch; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.api.socketpart + * @Package: com.framewiki.proxy.core.api.socketpart * @ClassName: SimpleSocketPart * @Description: socket匹配对 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/Channel.java b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/Channel.java similarity index 91% rename from proxy-core/src/main/java/com/framewiki/network/proxy/channel/Channel.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/channel/Channel.java index c93dd122dbe3cb776a7ad042635998ea5a4c142a..5a0d192629e2ffd4fbe689b3b2c0f07be7a6413c 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/Channel.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/Channel.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.channel; +package com.framewiki.proxy.core.channel; import java.io.Closeable; import java.nio.charset.Charset; @@ -7,7 +7,7 @@ import java.nio.charset.Charset; * @param 读取返回的类型 * @param 写入的类型 * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.channel + * @Package: com.framewiki.proxy.core.channel * @ClassName: StringChannelBase * @Description: 读写通道 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/BaseSocketChannel.java b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/BaseSocketChannel.java similarity index 85% rename from proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/BaseSocketChannel.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/BaseSocketChannel.java index 5280adaf911c1f8830c1d0eda37ed61081c6173b..8bbc35ab7a644ad3bb36826016434b9f3be602ff 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/BaseSocketChannel.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/BaseSocketChannel.java @@ -1,6 +1,6 @@ -package com.framewiki.network.proxy.channel.impl; +package com.framewiki.proxy.core.channel.impl; -import com.framewiki.network.proxy.channel.Channel; +import com.framewiki.proxy.core.channel.Channel; import java.io.IOException; import java.net.Socket; @@ -9,7 +9,7 @@ import java.net.Socket; * @param 通道读取的类型 * @param 通道写入的类型 * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.channel + * @Package: com.framewiki.proxy.core.channel * @ClassName: BaseSocketChannel * @Description: socket通道 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/InteractiveChannelBase.java b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/InteractiveChannelBase.java similarity index 93% rename from proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/InteractiveChannelBase.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/InteractiveChannelBase.java index 306b5351a58af86b266fe272107d42a09ba3aad8..c8a3eb828ddff519474b00d8c86b5b8b5f20fc2a 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/InteractiveChannelBase.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/InteractiveChannelBase.java @@ -1,7 +1,7 @@ -package com.framewiki.network.proxy.channel.impl; +package com.framewiki.proxy.core.channel.impl; import com.alibaba.fastjson.JSONObject; -import com.framewiki.network.proxy.model.InteractiveModel; +import com.framewiki.proxy.core.model.InteractiveModel; import java.io.IOException; import java.net.Socket; @@ -13,7 +13,7 @@ import java.nio.charset.Charset; */ /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.channel + * @Package: com.framewiki.proxy.core.channel * @ClassName: InteractiveChannelBase * @Description: InteractiveModel 模式读写 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/JsonChannelBase.java b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/JsonChannelBase.java similarity index 96% rename from proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/JsonChannelBase.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/JsonChannelBase.java index 31e9e6ef33bb99db539696a8fde0f27cdf0ebb92..f992d8969ede78d069906c94c9ca32a0555886a8 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/JsonChannelBase.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/JsonChannelBase.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.channel.impl; +package com.framewiki.proxy.core.channel.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONAware; @@ -10,7 +10,7 @@ import java.nio.charset.Charset; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.channel + * @Package: com.framewiki.proxy.core.channel * @ClassName: JsonChannelBase * @Description: json方式读写 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/LengthChannelBase.java b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/LengthChannelBase.java similarity index 97% rename from proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/LengthChannelBase.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/LengthChannelBase.java index b69df7da5a45dd68ee911802902dee1471c6ee7a..fd6a59a7962dc2b7f3e1946b8900be35f4e27b00 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/LengthChannelBase.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/LengthChannelBase.java @@ -1,6 +1,6 @@ -package com.framewiki.network.proxy.channel.impl; +package com.framewiki.proxy.core.channel.impl; -import com.framewiki.network.proxy.util.ToolsUtils; +import com.framewiki.proxy.core.util.ToolsUtils; import java.io.IOException; import java.io.InputStream; @@ -12,7 +12,7 @@ import java.util.concurrent.locks.ReentrantLock; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.channel + * @Package: com.framewiki.proxy.core.channel * @ClassName: LengthChannel * @Description: 长度限定读写通道 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/SecretInteractiveChannelBase.java b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/SecretInteractiveChannelBase.java similarity index 93% rename from proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/SecretInteractiveChannelBase.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/SecretInteractiveChannelBase.java index c050c77fa96ad5b5b16753bd0231b38a766f71af..02081a6c1ded8438d39d84eab7703f0889c8ebda 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/SecretInteractiveChannelBase.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/SecretInteractiveChannelBase.java @@ -1,9 +1,9 @@ -package com.framewiki.network.proxy.channel.impl; +package com.framewiki.proxy.core.channel.impl; import com.alibaba.fastjson.JSONObject; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.SecretInteractiveModel; -import com.framewiki.network.proxy.util.AesUtils; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.SecretInteractiveModel; +import com.framewiki.proxy.core.util.AesUtils; import lombok.*; import lombok.EqualsAndHashCode.Exclude; @@ -14,7 +14,7 @@ import java.security.Key; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.channel + * @Package: com.framewiki.proxy.core.channel * @ClassName: SecretInteractiveChannel * @Description: InteractiveModel 加密型通道，AES加密 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/StringChannelBase.java b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/StringChannelBase.java similarity index 96% rename from proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/StringChannelBase.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/StringChannelBase.java index 3d7a6b96f4bbd024e87c647b82836c9555abea1a..cbd92a9890d10d4aa180d88452ad8ce9d63ccdd3 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/channel/impl/StringChannelBase.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/channel/impl/StringChannelBase.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.channel.impl; +package com.framewiki.proxy.core.channel.impl; import java.io.IOException; import java.net.Socket; @@ -7,7 +7,7 @@ import java.nio.charset.StandardCharsets; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.channel + * @Package: com.framewiki.proxy.core.channel * @ClassName: StringChannelBase * @Description: 字符型通道 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/common/CommonConstants.java b/proxy-core/src/main/java/com/framewiki/proxy/core/common/CommonConstants.java similarity index 94% rename from proxy-core/src/main/java/com/framewiki/network/proxy/common/CommonConstants.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/common/CommonConstants.java index fbc0c223f9867c116561cd32c8df0c2681d2b76c..df363af5556a1b8f7ab8866ad263a3e51f6f261a 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/common/CommonConstants.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/common/CommonConstants.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.common; +package com.framewiki.proxy.core.common; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -8,7 +8,7 @@ import java.util.List; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.common + * @Package: com.framewiki.proxy.core.common * @ClassName: CommonConstants * @Description: 公共参数 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/common/CommonFormat.java b/proxy-core/src/main/java/com/framewiki/proxy/core/common/CommonFormat.java similarity index 94% rename from proxy-core/src/main/java/com/framewiki/network/proxy/common/CommonFormat.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/common/CommonFormat.java index f94e5c11caf4cdf60c15afcd88ff656dfaaf7731..908903deb719e796c1f0e31bfb42ff852ef49f35 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/common/CommonFormat.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/common/CommonFormat.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.common; +package com.framewiki.proxy.core.common; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -10,7 +10,7 @@ import java.time.format.DateTimeFormatter; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.common + * @Package: com.framewiki.proxy.core.common * @ClassName: CommonConstants * @Description: 公用的格式化类 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/common/Optional.java b/proxy-core/src/main/java/com/framewiki/proxy/core/common/Optional.java similarity index 89% rename from proxy-core/src/main/java/com/framewiki/network/proxy/common/Optional.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/common/Optional.java index 7355d90283ed1c9354c1764d57b28bcde9a7abd6..13c355f3b850dc16f0fc41adf0a2de87de14026f 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/common/Optional.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/common/Optional.java @@ -1,8 +1,8 @@ -package com.framewiki.network.proxy.common; +package com.framewiki.proxy.core.common; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.common + * @Package: com.framewiki.proxy.core.common * @ClassName: Optional * @Description: 操作对象，主要是让值能够通过引用进行传递 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/executor/FrameExecutor.java b/proxy-core/src/main/java/com/framewiki/proxy/core/executor/FrameExecutor.java similarity index 90% rename from proxy-core/src/main/java/com/framewiki/network/proxy/executor/FrameExecutor.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/executor/FrameExecutor.java index 66ecbc8998203ac7251b713a2e5dbce750ee128a..d97bf429fc0b663ab2ce81fc1a7312a184383c66 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/executor/FrameExecutor.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/executor/FrameExecutor.java @@ -1,7 +1,7 @@ -package com.framewiki.network.proxy.executor; +package com.framewiki.proxy.core.executor; -import com.framewiki.network.proxy.executor.impl.SimpleExecutor; -import com.framewiki.network.proxy.nio.impl.NioHallows; +import com.framewiki.proxy.core.executor.impl.SimpleExecutor; +import com.framewiki.proxy.core.nio.impl.NioHallows; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -10,7 +10,7 @@ import java.util.concurrent.ScheduledFuture; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.nio + * @Package: com.framewiki.proxy.core.nio * @ClassName: FrameExecutor * @Description: 线程执行器 主要是为了统一位置，方便管理 * @Author: frank tiger @@ -81,7 +81,7 @@ public final class FrameExecutor { /** * 隧道线程执行器 *

- * For {@link com.framewiki.network.proxy.api.passway} + * For {@link com.framewiki.proxy.core.api.passway} * * @param runnable 可运行 */ diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/executor/IExecutor.java b/proxy-core/src/main/java/com/framewiki/proxy/core/executor/IExecutor.java similarity index 88% rename from proxy-core/src/main/java/com/framewiki/network/proxy/executor/IExecutor.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/executor/IExecutor.java index bd937cfa1bd04bb5b68660eba5bfe0f349f2f507..089cefcc97e35d20276e2df66f99d9e19f176c58 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/executor/IExecutor.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/executor/IExecutor.java @@ -1,10 +1,12 @@ -package com.framewiki.network.proxy.executor; +package com.framewiki.proxy.core.executor; + +import com.framewiki.proxy.core.nio.impl.NioHallows; import java.util.concurrent.ScheduledFuture; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.nio + * @Package: com.framewiki.proxy.core.nio * @ClassName: IExecutor * @Description: 执行器实现 * @Author: frank tiger @@ -56,7 +58,7 @@ public interface IExecutor { /** * 隧道线程执行器 - * For {@link com.framewiki.network.proxy.api.passway} + * For {@link com.framewiki.proxy.core.api.passway} * * @param runnable 待执行任务 */ @@ -66,7 +68,7 @@ public interface IExecutor { /** * nio事件任务执行器 - * For {@link com.framewiki.network.proxy.nio.impl.NioHallows#run()} + * For {@link NioHallows#run()} * * @param runnable 待执行任务 */ diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/executor/impl/SimpleExecutor.java b/proxy-core/src/main/java/com/framewiki/proxy/core/executor/impl/SimpleExecutor.java similarity index 90% rename from proxy-core/src/main/java/com/framewiki/network/proxy/executor/impl/SimpleExecutor.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/executor/impl/SimpleExecutor.java index 4a82334080264da0687c330b44975716e1c72a7d..98b40784d206142a54244345aac37fd63565c80b 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/executor/impl/SimpleExecutor.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/executor/impl/SimpleExecutor.java @@ -1,12 +1,12 @@ -package com.framewiki.network.proxy.executor.impl; +package com.framewiki.proxy.core.executor.impl; -import com.framewiki.network.proxy.executor.IExecutor; +import com.framewiki.proxy.core.executor.IExecutor; import java.util.concurrent.*; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.executor.impl + * @Package: com.framewiki.proxy.core.executor.impl * @ClassName: FrameExecutor * @Description: 线程执行器 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/FrameResultModel.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/FrameResultModel.java similarity index 94% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/FrameResultModel.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/FrameResultModel.java index 87824c0fb392b07a97ebb42370446b5a70dc5caf..d908db6433b0f6213c4e8d5d272dc9fe554cf67d 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/FrameResultModel.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/FrameResultModel.java @@ -1,10 +1,9 @@ -package com.framewiki.network.proxy.model; +package com.framewiki.proxy.core.model; import com.alibaba.fastjson.JSONAware; import com.alibaba.fastjson.JSONObject; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.socket.part.HttpRouteSocketPart; -import com.framewiki.network.proxy.model.enums.FrameResultEnum; +import com.framewiki.proxy.core.model.enums.FrameResultEnum; import lombok.Data; @@ -13,7 +12,7 @@ import java.lang.reflect.Field; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.model + * @Package: com.framewiki.proxy.core.model * @ClassName: FrameResultModel * @Description: 常规类型的前后端返回model * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/HttpRoute.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/HttpRoute.java similarity index 93% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/HttpRoute.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/HttpRoute.java index 37f3ea49a2f067d4dbc700700650f45ca7d8dee6..6e19a3bf10d5ede26a0da952b7fa10138452707e 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/HttpRoute.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/HttpRoute.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.model; +package com.framewiki.proxy.core.model; import lombok.AccessLevel; import lombok.Getter; @@ -6,7 +6,7 @@ import lombok.Setter; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.model + * @Package: com.framewiki.proxy.core.model * @ClassName: HttpRoute * @Description: http路由表 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/InteractiveModel.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/InteractiveModel.java similarity index 93% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/InteractiveModel.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/InteractiveModel.java index 70d9bb532b11b95cfa2a7b0e3d0422af6953fa66..d69ec440787ac34738eb6bb95de6e3f16aef2459 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/InteractiveModel.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/InteractiveModel.java @@ -1,10 +1,10 @@ -package com.framewiki.network.proxy.model; +package com.framewiki.proxy.core.model; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONAware; import com.alibaba.fastjson.JSONObject; -import com.framewiki.network.proxy.common.CommonFormat; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.common.CommonFormat; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.model + * @Package: com.framewiki.proxy.core.model * @ClassName: InteractiveModel * @Description: 交互基础类型 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/SecretInteractiveModel.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/SecretInteractiveModel.java similarity index 93% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/SecretInteractiveModel.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/SecretInteractiveModel.java index dabb5ac97afbd3dca52f723b3617d7927dd7aa1f..e538864c64cfae2bc0a68fc388a617ba1ad81890 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/SecretInteractiveModel.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/SecretInteractiveModel.java @@ -1,9 +1,9 @@ -package com.framewiki.network.proxy.model; +package com.framewiki.proxy.core.model; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.framewiki.network.proxy.util.AesUtils; -import com.framewiki.network.proxy.util.Md5Signature; +import com.framewiki.proxy.core.util.AesUtils; +import com.framewiki.proxy.core.util.Md5Signature; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -16,7 +16,7 @@ import java.security.Key; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.model + * @Package: com.framewiki.proxy.core.model * @ClassName: SecretInteractiveModel * @Description: 基于InteractiveModel模型的加密交互模型 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/enums/FrameResultEnum.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/enums/FrameResultEnum.java similarity index 90% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/enums/FrameResultEnum.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/enums/FrameResultEnum.java index bb4fe86698087521c0a4d5d680dceff5534d083b..5c540dce9a5c70d972037571aa8ad108d909079b 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/enums/FrameResultEnum.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/enums/FrameResultEnum.java @@ -1,11 +1,11 @@ -package com.framewiki.network.proxy.model.enums; +package com.framewiki.proxy.core.model.enums; -import com.framewiki.network.proxy.model.FrameResultModel; +import com.framewiki.proxy.core.model.FrameResultModel; import org.apache.commons.lang3.StringUtils; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.model.enums + * @Package: com.framewiki.proxy.core.model.enums * @ClassName: FrameResultEnum * @Description: 客户端服务端返回码 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/enums/InteractiveTypeEnum.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/enums/InteractiveTypeEnum.java similarity index 93% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/enums/InteractiveTypeEnum.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/enums/InteractiveTypeEnum.java index a684f100b9f7539a437aec8e59fd09b8d772c4f1..8d49992224f74a88bf21d15011869e457b332b19 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/enums/InteractiveTypeEnum.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/enums/InteractiveTypeEnum.java @@ -1,11 +1,11 @@ -package com.framewiki.network.proxy.model.enums; +package com.framewiki.proxy.core.model.enums; import lombok.Getter; import org.apache.commons.lang3.StringUtils; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.channel + * @Package: com.framewiki.proxy.core.channel * @ClassName: InteractiveTypeEnum * @Description: 交互类型enum * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ClientConnectModel.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ClientConnectModel.java similarity index 78% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ClientConnectModel.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ClientConnectModel.java index e0eee9d809e296aac996d9a1f19baec8e1b6f3d6..d5353429d3caefb0430f06d73c372fb980a54a3f 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ClientConnectModel.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ClientConnectModel.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.model.interactive; +package com.framewiki.proxy.core.model.interactive; import lombok.AllArgsConstructor; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.model.interactive + * @Package: com.framewiki.proxy.core.model.interactive * @ClassName: ClientConnectModel * @Description: 客户端连接请求 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ClientControlModel.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ClientControlModel.java similarity index 78% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ClientControlModel.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ClientControlModel.java index fb77919be3c33414114d6bd7ffa16dbc96df1ccb..2a0109a6b431a25acf7a04c36d669c5e18b93bab 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ClientControlModel.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ClientControlModel.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.model.interactive; +package com.framewiki.proxy.core.model.interactive; import lombok.AllArgsConstructor; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.model.interactive + * @Package: com.framewiki.proxy.core.model.interactive * @ClassName: ClientControlModel * @Description: 请求建立控制器模型 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ServerWaitModel.java b/proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ServerWaitModel.java similarity index 78% rename from proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ServerWaitModel.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ServerWaitModel.java index 073cff165e2bc83a081095337f5569dc65c424f8..8dea05ae38be22c638675524c0a1d30947fd8d0d 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/model/interactive/ServerWaitModel.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/model/interactive/ServerWaitModel.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.model.interactive; +package com.framewiki.proxy.core.model.interactive; import lombok.AllArgsConstructor; import lombok.Data; @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.model.interactive + * @Package: com.framewiki.proxy.core.model.interactive * @ClassName: ServerWaitModel * @Description: 服务端等待建立隧道模型 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/nio/NioProcessed.java b/proxy-core/src/main/java/com/framewiki/proxy/core/nio/NioProcessed.java similarity index 81% rename from proxy-core/src/main/java/com/framewiki/network/proxy/nio/NioProcessed.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/nio/NioProcessed.java index 9462f1158d260f847bc9a6f2f6e7288680d1a8cc..e6ec53237f0534bb7ea6f5dfecf577a6eeedc418 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/nio/NioProcessed.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/nio/NioProcessed.java @@ -1,10 +1,10 @@ -package com.framewiki.network.proxy.nio; +package com.framewiki.proxy.core.nio; import java.nio.channels.SelectionKey; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.nio + * @Package: com.framewiki.proxy.core.nio * @ClassName: NioProcessed * @Description: nio 执行器 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/nio/impl/NioHallows.java b/proxy-core/src/main/java/com/framewiki/proxy/core/nio/impl/NioHallows.java similarity index 96% rename from proxy-core/src/main/java/com/framewiki/network/proxy/nio/impl/NioHallows.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/nio/impl/NioHallows.java index 19d40615fd1b8191afd519c0825050ea7f4a53a1..f956968ab6f5422688cd139c0226452b39b8e3ea 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/nio/impl/NioHallows.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/nio/impl/NioHallows.java @@ -1,11 +1,10 @@ -package com.framewiki.network.proxy.nio.impl; +package com.framewiki.proxy.core.nio.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.executor.FrameExecutor; -import com.framewiki.network.proxy.model.FrameResultModel; -import com.framewiki.network.proxy.nio.NioProcessed; -import com.framewiki.network.proxy.util.AssertUtils; -import com.framewiki.network.proxy.util.CountWaitLatch; +import com.framewiki.proxy.core.executor.FrameExecutor; +import com.framewiki.proxy.core.nio.NioProcessed; +import com.framewiki.proxy.core.util.AssertUtils; +import com.framewiki.proxy.core.util.CountWaitLatch; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -24,7 +23,7 @@ import java.util.concurrent.TimeUnit; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.nio + * @Package: com.framewiki.proxy.core.nio * @ClassName: NioHallows * @Description: nio 容器 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/nio/impl/ProcessedHolder.java b/proxy-core/src/main/java/com/framewiki/proxy/core/nio/impl/ProcessedHolder.java similarity index 85% rename from proxy-core/src/main/java/com/framewiki/network/proxy/nio/impl/ProcessedHolder.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/nio/impl/ProcessedHolder.java index aba9376f468454ea19de63f409ccd97f54b0c1b8..e043e6874db9e2fd8f173cf263f9f32847505c6b 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/nio/impl/ProcessedHolder.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/nio/impl/ProcessedHolder.java @@ -1,6 +1,6 @@ -package com.framewiki.network.proxy.nio.impl; +package com.framewiki.proxy.core.nio.impl; -import com.framewiki.network.proxy.nio.NioProcessed; +import com.framewiki.proxy.core.nio.NioProcessed; import lombok.AllArgsConstructor; import lombok.Data; @@ -9,7 +9,7 @@ import java.nio.channels.SelectionKey; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.nio + * @Package: com.framewiki.proxy.core.nio * @ClassName: ProcessedHolder * @Description: 执行器暂存 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/util/AesUtils.java b/proxy-core/src/main/java/com/framewiki/proxy/core/util/AesUtils.java similarity index 96% rename from proxy-core/src/main/java/com/framewiki/network/proxy/util/AesUtils.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/util/AesUtils.java index 61bfb76fe2358008963d766a912424d21db9ebd3..211aea773cce2c2d5b2bfd7a6e2dffee5b45826f 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/util/AesUtils.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/util/AesUtils.java @@ -1,7 +1,6 @@ -package com.framewiki.network.proxy.util; +package com.framewiki.proxy.core.util; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.socket.part.HttpRouteSocketPart; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -16,7 +15,7 @@ import java.util.Base64; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.util + * @Package: com.framewiki.proxy.core.util * @ClassName: AesUtils * @Description: AES加解密工具 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/util/AssertUtils.java b/proxy-core/src/main/java/com/framewiki/proxy/core/util/AssertUtils.java similarity index 92% rename from proxy-core/src/main/java/com/framewiki/network/proxy/util/AssertUtils.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/util/AssertUtils.java index 86a134018435ef91e21a059cd92efe9aa2ecb252..acba12ca8be3a39820b2a1619d97d39afd217c46 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/util/AssertUtils.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/util/AssertUtils.java @@ -1,8 +1,8 @@ -package com.framewiki.network.proxy.util; +package com.framewiki.proxy.core.util; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.util + * @Package: com.framewiki.proxy.core.util * @ClassName: AssertUtils * @Description: 断言 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/util/CountWaitLatch.java b/proxy-core/src/main/java/com/framewiki/proxy/core/util/CountWaitLatch.java similarity index 97% rename from proxy-core/src/main/java/com/framewiki/network/proxy/util/CountWaitLatch.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/util/CountWaitLatch.java index db30be5837cb9e4ff3204de8c465d107cab1d2b3..f64221bf9a7fccc6fb71bad64fc6ecb944e4e0c6 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/util/CountWaitLatch.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/util/CountWaitLatch.java @@ -1,11 +1,11 @@ -package com.framewiki.network.proxy.util; +package com.framewiki.proxy.core.util; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.AbstractQueuedSynchronizer; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.util + * @Package: com.framewiki.proxy.core.util * @ClassName: CountWaitLatch * @Description: 可增 计数 门闩 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/util/Md5Signature.java b/proxy-core/src/main/java/com/framewiki/proxy/core/util/Md5Signature.java similarity index 95% rename from proxy-core/src/main/java/com/framewiki/network/proxy/util/Md5Signature.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/util/Md5Signature.java index e06c5368c2039d6c4c238d346fad0b211ab9c9fe..05feeb19b0483d39c73f7800213a3bed2c095171 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/util/Md5Signature.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/util/Md5Signature.java @@ -1,7 +1,6 @@ -package com.framewiki.network.proxy.util; +package com.framewiki.proxy.core.util; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.socket.part.HttpRouteSocketPart; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -15,7 +14,7 @@ import java.util.Random; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.util + * @Package: com.framewiki.proxy.core.util * @ClassName: Md5Signature * @Description: MD5散列签名 * @Author: frank tiger diff --git a/proxy-core/src/main/java/com/framewiki/network/proxy/util/ToolsUtils.java b/proxy-core/src/main/java/com/framewiki/proxy/core/util/ToolsUtils.java similarity index 95% rename from proxy-core/src/main/java/com/framewiki/network/proxy/util/ToolsUtils.java rename to proxy-core/src/main/java/com/framewiki/proxy/core/util/ToolsUtils.java index 998fa4b0ecc2122ab996539053115d20dea06693..382292ccb38254e03eb1e3c70001994be6bd36fc 100644 --- a/proxy-core/src/main/java/com/framewiki/network/proxy/util/ToolsUtils.java +++ b/proxy-core/src/main/java/com/framewiki/proxy/core/util/ToolsUtils.java @@ -1,4 +1,4 @@ -package com.framewiki.network.proxy.util; +package com.framewiki.proxy.core.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -11,7 +11,7 @@ import java.nio.channels.WritableByteChannel; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.util + * @Package: com.framewiki.proxy.core.util * @ClassName: ToolsUtils * @Description: 无归类的工具集 * @Author: frank tiger diff --git a/server/proxy-server-web/Dockerfile b/server/proxy-server-web/Dockerfile index c2ca0e1d03627d3e3aca12c49d0f89e992abd6b0..907b394cd1e8ab04e274d3b9c181d2ab65837bb8 100644 --- a/server/proxy-server-web/Dockerfile +++ b/server/proxy-server-web/Dockerfile @@ -1,23 +1,37 @@ -#指定以 openjdk:17-jdk-oracle 为基础镜像，来构建此镜像，可以理解为运行的需要基础环境 +# 使用官方OpenJDK镜像 FROM openjdk:17-jdk-oracle -#创建目录 -RUN mkdir -p /user/web -RUN mkdir -p /user/web/wiki-proxy -RUN mkdir -p /user/web/wiki-proxy/server -#指定容器的工作目录 -ENV jar_file /user/web/wiki-proxy/server -#添加时区指向 -ENV TZ=Asia/Shanghai -RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -#WORKDIR指令用于指定容器的一个目录， 容器启动时执行的命令会在该目录下执行。 -WORKDIR ${jar_file} -#将当前文件夹下面 demo.jar 复制到容器对应目录下 -ENV jar_name wiki-proxy-server.jar -ADD ${jar_name} ${jar_file}${jar_name} -#jar文件端口 通过启动命令传入进来 -ENV server_port ${server_port} -EXPOSE ${server_port} -#容器启动时执行的命令 -CMD nohup java -jar \ --Xmx256m -Xmn256m -Xss256k -XX:+HeapDumpOnOutOfMemoryError \ -${jar_file}${jar_name} --server.port=${server_port} \ No newline at end of file + +# 定义构建参数（带默认值） +ARG SERVER_PORT=6666 +ARG TCP_PORT=10010 +ARG JAR_NAME=wiki-proxy-server.jar +ARG SPRING_PROFILE=test +# 默认配置为test + +# 设置时区和工作目录的环境变量 +ENV TZ=Asia/Shanghai \ + JAR_FILE=/usr/web/wiki-proxy/server/ \ + SPRING_PROFILES_ACTIVE=${SPRING_PROFILE} + +# 创建目录（合并为单条RUN指令减少层数） +RUN mkdir -p ${JAR_FILE} && \ + ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && \ + echo $TZ > /etc/timezone + +# 设置工作目录 +WORKDIR ${JAR_FILE} + +# 复制JAR文件到容器指定目录 +COPY ${JAR_NAME} ${JAR_FILE}${JAR_NAME} +COPY wiki-proxy.jks ${JAR_FILE}wiki-proxy.jks + +# 暴露端口（使用构建参数） +EXPOSE ${SERVER_PORT} +EXPOSE ${TCP_PORT} + +# 使用 sh -c 执行启动命令，确保环境变量得到解析 +ENTRYPOINT ["sh", "-c", "java -jar -Xmx256m -Xmn256m -Xss256k \ + -XX:+HeapDumpOnOutOfMemoryError ${JAR_FILE}wiki-proxy-server.jar \ + -Dspring.proxy.server.servicePort=${TCP_PORT} \ + -Dserver.port=${SERVER_PORT} \ + -Dspring.profiles.active=${SPRING_PROFILE}"] diff --git a/server/proxy-server-web/src/main/resources/application-test.yml b/server/proxy-server-web/src/main/resources/application-test.yml new file mode 100644 index 0000000000000000000000000000000000000000..45da09b7f900f7cd1af14f510fc5dd4eefa57200 --- /dev/null +++ b/server/proxy-server-web/src/main/resources/application-test.yml @@ -0,0 +1,5 @@ +spring: + proxy: + server: + # 证书存放路径 + ssl-key-store-path: /usr/web/wiki-proxy/server/wiki-proxy.jks \ No newline at end of file diff --git a/server/proxy-server-web/src/main/resources/application.yml b/server/proxy-server-web/src/main/resources/application.yml index 5437007e519f7ee473cd0f6e71783210ee47761a..0366f7c6907c83fae72e793cbda383ced771feb0 100644 --- a/server/proxy-server-web/src/main/resources/application.yml +++ b/server/proxy-server-web/src/main/resources/application.yml @@ -11,8 +11,8 @@ spring: # 暴露端口 可以为多个 port: - 443 - # 证书存放路径，若不想打进jar包，可不带classpath:前缀 - ssl-key-store-path: "D:\\Project\\wiki-proxy\\server\\proxy-server-web\\src\\main\\resources\\wiki-proxy.jks" + # 证书存放路径 + ssl-key-store-path: "F:\\workspace\\wiki-proxy\\server\\proxy-server-web\\src\\main\\resources\\wiki-proxy.jks" # 证书密码 ssl-key-store-password: "wiki-proxy@SaFePwd2025!" # 证书类型 diff --git a/server/proxy-server-web/start.sh b/server/proxy-server-web/start.sh index c9df325b5cb604487a3eb5bc57e4e7efd68d1a4a..b1a1eef7a15700a956b3bba6bff1bee86dcc83f5 100644 --- a/server/proxy-server-web/start.sh +++ b/server/proxy-server-web/start.sh @@ -1,23 +1,85 @@ #!/bin/bash -echo "开始构建" -#构建镜像 -#分别输入 容器名称 和要构建的 版本号 eg test 111 生成版本号为 test:111 -#contain_name=test -#version=1 -contain_name=wiKi-proxy-server -read -p "Please enter your contain name and version eg : v1.0: " version -echo "contain name and version is [${contain_name}:${version}]" -#输入要构建的端口号 或者自定义 -#server_port=8001 -read -p "Please enter your application server port in(1024到49151) " server_port -echo "you input server port is [${server_port}]" -#取消自定义命令 -#contain_name=demo -docker rmi ${contain_name}:${version} -docker buildx build -t ${contain_name}:${version} . -#停用之前的服务 -docker stop ${contain_name} -docker rm ${contain_name} -#启动容器 -docker run -p ${server_port}:${server_port} -e server_port=${server_port} --name ${contain_name} -d ${contain_name}:${version} -echo "构建完成" \ No newline at end of file + +contain_name="wiki-proxy-server" +default_port=6666 +default_tcp_port=10010 +default_profile="test" + +# 输入镜像版本 +read -p "请输入镜像版本号（例如 v1.0.0）: " version +if [[ -z "$version" ]]; then + echo "错误：版本号不能为空！" + exit 1 +fi + +# 输入应用端口（校验范围） +while true; do + read -p "请输入应用端口号（1024-49151，默认${default_port}）: " server_port + server_port=${server_port:-$default_port} + if [[ "$server_port" =~ ^[0-9]+$ ]] && [ "$server_port" -ge 1024 ] && [ "$server_port" -le 49151 ]; then + break + else + echo "错误：端口号必须是1024到49151之间的数字！" + fi +done + +# 输入应用TCP端口（校验范围） +while true; do + read -p "请输入应用TCP端口号（1024-49151，默认${default_tcp_port}）: " tcp_port + tcp_port=${tcp_port:-$default_tcp_port} + if [[ "$tcp_port" =~ ^[0-9]+$ ]] && [ "$tcp_port" -ge 1024 ] && [ "$tcp_port" -le 49151 ]; then + break + else + echo "错误：端口号必须是1024到49151之间的数字！" + fi +done + +# 输入 Spring 配置文件（例如 test, dev, prod） +read -p "请输入 Spring 配置文件（默认${default_profile}）: " profile +profile=${profile:-$default_profile} + +echo "------------------------------" +echo "镜像名称与版本: ${contain_name}:${version}" +echo "应用端口号: ${server_port}" +echo "应用TCP端口号: ${tcp_port}" +echo "使用的 Spring 配置文件: ${profile}" +echo "------------------------------" + +# 清理旧镜像和容器（提供确认提示） +read -p "是否清理旧的容器和镜像？（y/n）: " confirm +if [[ "$confirm" == "y" || "$confirm" == "Y" ]]; then + echo "正在停止并删除旧的容器..." + docker stop ${contain_name} 2>/dev/null + docker rm ${contain_name} 2>/dev/null + docker rmi ${contain_name}:${version} 2>/dev/null +else + echo "跳过清理旧容器和镜像。" +fi + +# 构建镜像（传递构建参数） +echo "正在构建镜像..." +docker build --build-arg SERVER_PORT=${server_port} --build-arg TCP_PORT=${tcp_port} --build-arg SPRING_PROFILE=${profile} -t ${contain_name}:${version} . +if [ $? -ne 0 ]; then + echo "镜像构建失败，退出！" + exit 1 +fi + +# 运行容器（传递环境变量） +echo "正在启动容器..." +docker run -d \ + --restart always \ + -p ${server_port}:${server_port} \ + -p ${tcp_port}:${tcp_port} \ + --name ${contain_name} \ + -e SERVER_PORT=${server_port} \ + -e TCP_PORT=${tcp_port} \ + -e SPRING_PROFILE=${profile} \ + ${contain_name}:${version} + +if [ $? -eq 0 ]; then + echo "构建完成！" + echo "访问地址：http://localhost:${server_port}" +else + echo "容器启动失败！" + exit 1 +fi diff --git a/server/proxy-server-web/stop.sh b/server/proxy-server-web/stop.sh index 696eb6217de46d90418255d96ce33908000231a0..18eb29dc70ff3841b4d565cbf330f7c025323cfe 100644 --- a/server/proxy-server-web/stop.sh +++ b/server/proxy-server-web/stop.sh @@ -1,9 +1,11 @@ -#vi stopAndRemoveContain.sh #!/bin/bash -contain_name=wiKi-proxy-server -#停止容器 -docker stop ${contain_name} -#删除容器 -docker rm ${contain_name} -#删除容器镜像 -docker rmi ${contain_name} \ No newline at end of file + +contain_name="wiki-proxy-server" + +# 检查并停止容器 +if docker ps -q -f name=${contain_name}; then + echo "停止容器 ${contain_name} ..." + docker stop ${contain_name} +else + echo "容器 ${contain_name} 未运行或不存在！" +fi \ No newline at end of file diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/WikiProxyServer.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/WikiProxyServer.java index 6ec266739b25c71c94b3c965d39dfe7e1956ffc8..e50cf878ea5404722bafcbee43dec5e8ba4a0fcb 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/WikiProxyServer.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/WikiProxyServer.java @@ -12,7 +12,7 @@ import com.framewiki.proxy.server.core.side.server.listen.config.impl.MultContro import com.framewiki.proxy.server.core.side.server.listen.config.impl.SecretSimpleListenServerConfig; import com.framewiki.proxy.server.core.side.server.listen.config.impl.SimpleListenServerConfig; import com.framewiki.proxy.server.core.side.server.listen.serversocket.ICreateServerSocket; -import com.framewiki.network.proxy.common.CommonConstants; +import com.framewiki.proxy.core.common.CommonConstants; import org.apache.commons.lang3.StringUtils; import javax.net.ssl.KeyManagerFactory; @@ -22,7 +22,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.security.KeyStore; -import static com.framewiki.network.proxy.common.CommonConstants.ListenDest; +import static com.framewiki.proxy.core.common.CommonConstants.ListenDest; /** * @ProjectName: wiki-proxy diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/config/ProxyAutoConfiguration.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/config/ProxyAutoConfiguration.java index cf76ec5411d74dddfed46267e536633d8345f2bc..55f7862c891d23ac1530438d0805f4e7e057dd45 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/config/ProxyAutoConfiguration.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/config/ProxyAutoConfiguration.java @@ -10,6 +10,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Lazy; +import org.springframework.context.annotation.Primary; /** * @ProjectName: wiki-proxy diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/config/ProxyConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/config/ProxyConfig.java index ee7473288d9b689e1912e65256667c51185d3663..7e4741570e50b3acc8ef16d93ccec6a89a8dd006 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/config/ProxyConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/config/ProxyConfig.java @@ -3,6 +3,7 @@ package com.framewiki.proxy.server.core.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -18,6 +19,7 @@ import java.util.List; * @Version: 1.0 */ @Data +@Primary @Component @Configuration @ConfigurationProperties(prefix = "spring.proxy.server") diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/ClientServiceThread.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/ClientServiceThread.java index 8b375826859cadebf491f92323fe12e5b5d4c10d..bd9466f37f8867e2c66f8a6d91ae0c7835356a60 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/ClientServiceThread.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/ClientServiceThread.java @@ -3,10 +3,10 @@ package com.framewiki.proxy.server.core.side.server.client; import com.cdkjframework.exceptions.GlobalRuntimeException; import com.cdkjframework.util.log.LogUtils; import com.framewiki.proxy.server.core.side.server.client.config.IClientServiceConfig; -import com.framewiki.network.proxy.executor.FrameExecutor; -import com.framewiki.network.proxy.nio.NioProcessed; -import com.framewiki.network.proxy.nio.impl.NioHallows; -import com.framewiki.network.proxy.util.AssertUtils; +import com.framewiki.proxy.core.executor.FrameExecutor; +import com.framewiki.proxy.core.nio.NioProcessed; +import com.framewiki.proxy.core.nio.impl.NioHallows; +import com.framewiki.proxy.core.util.AssertUtils; import java.io.IOException; import java.net.ServerSocket; @@ -18,7 +18,7 @@ import java.util.Objects; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client + * @Package: com.framewiki.proxy.core.side.server.client * @ClassName: ClientServiceThread * @Description: Client service process * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/ClientServiceAdapter.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/ClientServiceAdapter.java index 810c6cff7b0d57255267a0f5f0f01ca19d3127cf..a790041bca31a6275d5383dc4803020115669332 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/ClientServiceAdapter.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/ClientServiceAdapter.java @@ -4,7 +4,7 @@ import java.net.Socket; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.adapter + * @Package: com.framewiki.proxy.core.side.server.client.adapter * @ClassName: ClientServiceAdapter * @Description: Client service adapter * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/DefaultReadAheadPassValueAdapter.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/DefaultReadAheadPassValueAdapter.java index f72e5f3f486429ef120e363eb90f7c1790e6fb06..f966c6aff29dfe94c3b6a58f2cccd81f24ea89d0 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/DefaultReadAheadPassValueAdapter.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/DefaultReadAheadPassValueAdapter.java @@ -1,12 +1,12 @@ package com.framewiki.proxy.server.core.side.server.client.adapter.impl; import com.framewiki.proxy.server.core.side.server.client.config.IClientServiceConfig; -import com.framewiki.network.proxy.model.InteractiveModel; +import com.framewiki.proxy.core.model.InteractiveModel; import com.framewiki.proxy.server.core.side.server.client.handler.impl.DefaultInteractiveProcessHandler; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.adapter + * @Package: com.framewiki.proxy.core.side.server.client.adapter * @ClassName: DefaultReadAheadPassValueAdapter * @Description: 默认的预读后处理适配器 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/PassValueNextEnum.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/PassValueNextEnum.java index 20d65b5e273b016478933e3cc465c227c7b2acfd..207f1e48d98a47e0f281f5bebe3a8d60f41218d0 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/PassValueNextEnum.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/PassValueNextEnum.java @@ -4,7 +4,7 @@ import lombok.Getter; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.adapter + * @Package: com.framewiki.proxy.core.side.server.client.adapter * @ClassName: PassValueNextEnum * @Description: 传值适配器的handler回复信息 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/ReadAheadPassValueAdapter.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/ReadAheadPassValueAdapter.java index dd042906ce5cc460ed73b06f03505a3381d9886f..377b5d6f46fd11b058450a5a6f79ffd20d452adf 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/ReadAheadPassValueAdapter.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/adapter/impl/ReadAheadPassValueAdapter.java @@ -1,8 +1,8 @@ package com.framewiki.proxy.server.core.side.server.client.adapter.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.common.Optional; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.common.Optional; import com.framewiki.proxy.server.core.side.server.client.adapter.ClientServiceAdapter; import com.framewiki.proxy.server.core.side.server.client.config.IClientServiceConfig; import com.framewiki.proxy.server.core.side.server.client.handler.PassValueHandler; @@ -15,7 +15,7 @@ import java.util.List; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.adapter + * @Package: com.framewiki.proxy.core.side.server.client.adapter * @ClassName: ReadAheadPassValueAdapter * @Description: 预读后处理适配器 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/IClientServiceConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/IClientServiceConfig.java index a2fad51c8b5b4757d5593894e3b2dc0226ba1238..6a2fe0f1df49e80fb2fa3b4e691a1991a564afcf 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/IClientServiceConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/IClientServiceConfig.java @@ -1,6 +1,6 @@ package com.framewiki.proxy.server.core.side.server.client.config; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; import com.framewiki.proxy.server.core.side.server.client.adapter.ClientServiceAdapter; import java.net.ServerSocket; @@ -9,7 +9,7 @@ import java.nio.charset.Charset; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.config + * @Package: com.framewiki.proxy.core.side.server.client.config * @ClassName: IClientServiceConfig * @Description: 客户端服务配置 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/SecretSimpleClientServiceConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/SecretSimpleClientServiceConfig.java index b9fbd92389b63a3b4cee1d37778d5f90dd447395..f44d5e57a84106477ec7d800d881446da36d74dc 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/SecretSimpleClientServiceConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/SecretSimpleClientServiceConfig.java @@ -1,9 +1,9 @@ package com.framewiki.proxy.server.core.side.server.client.config; -import com.framewiki.network.proxy.channel.impl.SecretInteractiveChannelBase; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.util.AesUtils; +import com.framewiki.proxy.core.channel.impl.SecretInteractiveChannelBase; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.util.AesUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -13,7 +13,7 @@ import java.security.Key; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.config + * @Package: com.framewiki.proxy.core.side.server.client.config * @ClassName: SecretSimpleClientServiceConfig * @Description: 隧道过程加密的配置类 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/SimpleClientServiceConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/SimpleClientServiceConfig.java index 9969050487183643d6b9b84fbf9d6413dff64f0e..c280789dc5e81f2464ecdda548fd0eb11a433f15 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/SimpleClientServiceConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/config/SimpleClientServiceConfig.java @@ -1,9 +1,9 @@ package com.framewiki.proxy.server.core.side.server.client.config; import com.framewiki.proxy.server.core.side.server.client.adapter.impl.DefaultReadAheadPassValueAdapter; -import com.framewiki.network.proxy.channel.impl.InteractiveChannelBase; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; +import com.framewiki.proxy.core.channel.impl.InteractiveChannelBase; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; import com.framewiki.proxy.server.core.side.server.client.adapter.ClientServiceAdapter; import lombok.NoArgsConstructor; @@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.config + * @Package: com.framewiki.proxy.core.side.server.client.config * @ClassName: SimpleClientServiceConfig * @Description: 简单交互的客户端服务配置 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/PassValueHandler.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/PassValueHandler.java index 43b1eba6968afffb1a505497136704ccd47168a6..d132537c781e3914186a39d6df9ea52cc112a560 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/PassValueHandler.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/PassValueHandler.java @@ -1,12 +1,12 @@ package com.framewiki.proxy.server.core.side.server.client.handler; import com.framewiki.proxy.server.core.side.server.client.adapter.impl.PassValueNextEnum; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.common.Optional; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.common.Optional; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.handler + * @Package: com.framewiki.proxy.core.side.server.client.handler * @ClassName: PassValueHandler * @Description: 传值方式客户端是配置的处理接口 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/impl/DefaultInteractiveProcessHandler.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/impl/DefaultInteractiveProcessHandler.java index 25c3e7b402c68dbae694ef1b27d617897504d0c8..8d139ce22329d541afdbcaa741030d1d22fba9c9 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/impl/DefaultInteractiveProcessHandler.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/impl/DefaultInteractiveProcessHandler.java @@ -5,7 +5,7 @@ import com.framewiki.proxy.server.core.side.server.client.process.impl.ClientCon /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.handler + * @Package: com.framewiki.proxy.core.side.server.client.handler * @ClassName: DefaultInteractiveProcessHandler * @Description: 默认的接收处理handler * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/impl/InteractiveProcessHandler.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/impl/InteractiveProcessHandler.java index 480973ca9f4576df39ef182e626cdc02713d3746..2b519b5ec4febdfff22266b1def9a9073432eac4 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/impl/InteractiveProcessHandler.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/handler/impl/InteractiveProcessHandler.java @@ -1,15 +1,14 @@ package com.framewiki.proxy.server.core.side.server.client.handler.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.common.Optional; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.FrameResultEnum; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.common.Optional; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.FrameResultEnum; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; import com.framewiki.proxy.server.core.side.server.client.adapter.impl.PassValueNextEnum; import com.framewiki.proxy.server.core.side.server.client.handler.PassValueHandler; import com.framewiki.proxy.server.core.side.server.client.process.IProcess; -import com.framewiki.proxy.server.core.side.server.listen.ServerListenThread; import java.util.LinkedList; @@ -17,7 +16,7 @@ import java.util.List; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.handler + * @Package: com.framewiki.proxy.core.side.server.client.handler * @ClassName: InteractiveIProcessHandler * @Description: 常规接收处理handler * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/IProcess.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/IProcess.java index 150650014d462b9b1625027c64bcd20de7155528..07e88dcf63f2a03db658dea0233e44f03abaef3f 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/IProcess.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/IProcess.java @@ -1,11 +1,11 @@ package com.framewiki.proxy.server.core.side.server.client.process; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.process + * @Package: com.framewiki.proxy.core.side.server.client.process * @ClassName: IProcess * @Description: 处理方法接口 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/impl/ClientConnectProcess.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/impl/ClientConnectProcess.java index 0ce786fb3cff04aad1b709687aaf07ee86175807..9cfa18813d1e7bd4317199f4752c84785411cd13 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/impl/ClientConnectProcess.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/impl/ClientConnectProcess.java @@ -3,17 +3,17 @@ package com.framewiki.proxy.server.core.side.server.client.process.impl; import com.framewiki.proxy.server.core.side.server.client.process.IProcess; import com.framewiki.proxy.server.core.side.server.listen.ListenServerControl; import com.framewiki.proxy.server.core.side.server.listen.ServerListenThread; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.common.CommonFormat; -import com.framewiki.network.proxy.model.FrameResultModel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.FrameResultEnum; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; -import com.framewiki.network.proxy.model.interactive.ClientConnectModel; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.common.CommonFormat; +import com.framewiki.proxy.core.model.FrameResultModel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.FrameResultEnum; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.model.interactive.ClientConnectModel; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.process + * @Package: com.framewiki.proxy.core.side.server.client.process * @ClassName: ClientConnectProcess * @Description: 请求建立隧道处理器 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/impl/ClientControlProcess.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/impl/ClientControlProcess.java index c9175b5fd26d4ecdc1ae01ca0024afbf10000c1b..a0f96b0d634e31f4718c208dbabfbff797835361 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/impl/ClientControlProcess.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/client/process/impl/ClientControlProcess.java @@ -2,17 +2,17 @@ package com.framewiki.proxy.server.core.side.server.client.process.impl; import com.framewiki.proxy.server.core.side.server.listen.ListenServerControl; import com.framewiki.proxy.server.core.side.server.listen.ServerListenThread; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.FrameResultModel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.FrameResultEnum; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; -import com.framewiki.network.proxy.model.interactive.ClientControlModel; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.FrameResultModel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.FrameResultEnum; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.model.interactive.ClientControlModel; import com.framewiki.proxy.server.core.side.server.client.process.IProcess; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.client.process + * @Package: com.framewiki.proxy.core.side.server.client.process * @ClassName: ClientControlProcess * @Description: 请求建立控制器处理方法 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ListenServerControl.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ListenServerControl.java index bed7dd42715b377631d52ab8cf5cdd039006fb69..45e17fe5a114ab261c9f2613b11f3438cf572e7b 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ListenServerControl.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ListenServerControl.java @@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen + * @Package: com.framewiki.proxy.core.side.server.listen * @ClassName: ListenServerControl * @Description: 转发监听服务控制类 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ServerListen.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ServerListen.java index 77ace2bffa1a9da7e932e661d9335799025ba7e9..16010de66cc710999f6aedec0298fedc933a357f 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ServerListen.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ServerListen.java @@ -4,7 +4,7 @@ import com.framewiki.proxy.server.core.side.server.listen.control.IControlSocket /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen + * @Package: com.framewiki.proxy.core.side.server.listen * @ClassName: ServerListen * @Description: 监听转发服务进程 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ServerListenThread.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ServerListenThread.java index 72f1b0b7d760bc05d485d5769d65c8d206afdaa5..f5fb3a09acf2e8a33bb3342131b1eb42b78a8a0a 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ServerListenThread.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/ServerListenThread.java @@ -2,17 +2,16 @@ package com.framewiki.proxy.server.core.side.server.listen; import com.cdkjframework.exceptions.GlobalRuntimeException; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.proxy.server.core.side.server.listen.config.impl.SimpleListenServerConfig; import com.framewiki.proxy.server.core.side.server.listen.control.IControlSocket; -import com.framewiki.network.proxy.api.IBelongControl; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; -import com.framewiki.network.proxy.common.CommonFormat; -import com.framewiki.network.proxy.executor.FrameExecutor; -import com.framewiki.network.proxy.nio.NioProcessed; -import com.framewiki.network.proxy.nio.impl.NioHallows; +import com.framewiki.proxy.core.api.IBelongControl; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.common.CommonFormat; +import com.framewiki.proxy.core.executor.FrameExecutor; +import com.framewiki.proxy.core.nio.NioProcessed; +import com.framewiki.proxy.core.nio.impl.NioHallows; import com.framewiki.proxy.server.core.side.server.listen.clear.IClearInvalidSocketPartThread; import com.framewiki.proxy.server.core.side.server.listen.config.ListenServerConfig; -import com.framewiki.network.proxy.util.AssertUtils; +import com.framewiki.proxy.core.util.AssertUtils; import java.io.IOException; @@ -26,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen + * @Package: com.framewiki.proxy.core.side.server.listen * @ClassName: ServerListenThread * @Description: 监听转发服务进程 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/clear/IClearInvalidSocketPartThread.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/clear/IClearInvalidSocketPartThread.java index e1d626b3cbbba375dd58893731966f74a356aa9f..39de7260401bc37226453180d551e94636dbbd79 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/clear/IClearInvalidSocketPartThread.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/clear/IClearInvalidSocketPartThread.java @@ -2,7 +2,7 @@ package com.framewiki.proxy.server.core.side.server.listen.clear; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen + * @Package: com.framewiki.proxy.core.side.server.listen * @ClassName: IClearInvalidSocketPartThread * @Description: 清理无效端口 线程 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/clear/impl/ClearInvalidSocketPartThread.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/clear/impl/ClearInvalidSocketPartThread.java index ecf29b7e7d62d04247f4eb0907d62995e42acb69..f9f824b3dcb3c7eae98be61063a52142814be2e8 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/clear/impl/ClearInvalidSocketPartThread.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/clear/impl/ClearInvalidSocketPartThread.java @@ -3,8 +3,7 @@ package com.framewiki.proxy.server.core.side.server.listen.clear.impl; import com.cdkjframework.util.log.LogUtils; import com.framewiki.proxy.server.core.side.server.listen.ServerListenThread; import com.framewiki.proxy.server.core.side.server.listen.clear.IClearInvalidSocketPartThread; -import com.framewiki.network.proxy.executor.FrameExecutor; -import com.framewiki.proxy.server.core.side.server.listen.config.impl.SecretSimpleListenServerConfig; +import com.framewiki.proxy.core.executor.FrameExecutor; import lombok.Getter; import lombok.Setter; @@ -14,7 +13,7 @@ import java.util.concurrent.ScheduledFuture; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen + * @Package: com.framewiki.proxy.core.side.server.listen * @ClassName: ClearInvalidSocketPartThread * @Description: 清理无效端口 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/ListenServerConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/ListenServerConfig.java index ccebb1afc514ab94328b8527a9996c14d5c7c224..26bc674e566112200d77acfde1d68cd688a187ad 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/ListenServerConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/ListenServerConfig.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.framewiki.proxy.server.core.side.server.listen.ServerListenThread; import com.framewiki.proxy.server.core.side.server.listen.clear.IClearInvalidSocketPartThread; import com.framewiki.proxy.server.core.side.server.listen.control.IControlSocket; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; import java.net.ServerSocket; import java.net.Socket; @@ -12,7 +12,7 @@ import java.nio.charset.Charset; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.config + * @Package: com.framewiki.proxy.core.side.server.listen.config * @ClassName: ListenServerConfig * @Description: 穿透监听服务配置 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/AllSecretSimpleListenServerConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/AllSecretSimpleListenServerConfig.java index f49e2cf78b9a9c3c73f4f1b95475228e924d81f2..2ce65c775409eec6a04016cedb6d675961b5c211 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/AllSecretSimpleListenServerConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/AllSecretSimpleListenServerConfig.java @@ -1,10 +1,10 @@ package com.framewiki.proxy.server.core.side.server.listen.config.impl; import com.framewiki.proxy.server.core.side.server.listen.ServerListenThread; -import com.framewiki.network.proxy.api.secret.impl.AesSecret; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; -import com.framewiki.network.proxy.api.socket.part.SecretSocketPart; -import com.framewiki.network.proxy.util.AesUtils; +import com.framewiki.proxy.core.api.secret.impl.AesSecret; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.api.socket.part.SecretSocketPart; +import com.framewiki.proxy.core.util.AesUtils; import lombok.Getter; import lombok.Setter; @@ -12,7 +12,7 @@ import java.security.Key; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.config + * @Package: com.framewiki.proxy.core.side.server.listen.config * @ClassName: AllSecretSimpleListenServerConfig * @Description: 交互及隧道都加密 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/MultControlListenServerConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/MultControlListenServerConfig.java index 0cf1268cc28f6e77faf772a8a6ebdca213be19a7..dd81fda8461ac85f9830265a417f9ec2d12be966 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/MultControlListenServerConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/MultControlListenServerConfig.java @@ -5,7 +5,7 @@ import com.framewiki.proxy.server.core.side.server.listen.ServerListenThread; import com.framewiki.proxy.server.core.side.server.listen.clear.IClearInvalidSocketPartThread; import com.framewiki.proxy.server.core.side.server.listen.control.IControlSocket; import com.framewiki.proxy.server.core.side.server.listen.control.impl.MultiControlSocket; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; import com.framewiki.proxy.server.core.side.server.listen.config.ListenServerConfig; import java.net.ServerSocket; @@ -14,7 +14,7 @@ import java.nio.charset.Charset; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.config + * @Package: com.framewiki.proxy.core.side.server.listen.config * @ClassName: MultControlListenServerConfig * @Description: 多客户端；监听服务配置 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/SecretSimpleListenServerConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/SecretSimpleListenServerConfig.java index 6f28d9c536e1ccc96849d5289b930aae9fa8ce63..84067637f36e6692f3f3d61ad03db849c8554043 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/SecretSimpleListenServerConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/SecretSimpleListenServerConfig.java @@ -1,11 +1,10 @@ package com.framewiki.proxy.server.core.side.server.listen.config.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.channel.impl.SecretInteractiveChannelBase; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.util.AesUtils; -import com.framewiki.proxy.server.core.side.server.listen.control.impl.ControlSocket; +import com.framewiki.proxy.core.channel.impl.SecretInteractiveChannelBase; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.util.AesUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -17,7 +16,7 @@ import java.security.Key; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.config + * @Package: com.framewiki.proxy.core.side.server.listen.config * @ClassName: SecretSimpleListenServerConfig * @Description: 交互加密配置 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/SimpleListenServerConfig.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/SimpleListenServerConfig.java index 065130871ed8b02a1c0ce9f69efe9404d1bea10b..b503de4ac88b8a041658fd7d11834c6527846b69 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/SimpleListenServerConfig.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/config/impl/SimpleListenServerConfig.java @@ -2,12 +2,11 @@ package com.framewiki.proxy.server.core.side.server.listen.config.impl; import com.alibaba.fastjson.JSONObject; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.api.socket.part.BaseSocketPart; -import com.framewiki.network.proxy.api.socket.part.SimpleSocketPart; -import com.framewiki.network.proxy.channel.impl.InteractiveChannelBase; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.proxy.server.core.side.server.client.adapter.impl.ReadAheadPassValueAdapter; +import com.framewiki.proxy.core.api.socket.part.BaseSocketPart; +import com.framewiki.proxy.core.api.socket.part.SimpleSocketPart; +import com.framewiki.proxy.core.channel.impl.InteractiveChannelBase; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; import com.framewiki.proxy.server.core.side.server.listen.ServerListenThread; import com.framewiki.proxy.server.core.side.server.listen.clear.IClearInvalidSocketPartThread; import com.framewiki.proxy.server.core.side.server.listen.clear.impl.ClearInvalidSocketPartThread; @@ -32,7 +31,7 @@ import java.nio.charset.StandardCharsets; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.config + * @Package: com.framewiki.proxy.core.side.server.listen.config * @ClassName: SimpleListenServerConfig * @Description: 简单的交互、隧道；监听服务配置 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/IControlSocket.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/IControlSocket.java index d4080279a8b4f1df5984c4165fddbd7bcb5228e7..d5aee7a31736b66f95b89c23bd5a674dec149795 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/IControlSocket.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/IControlSocket.java @@ -4,7 +4,7 @@ import com.framewiki.proxy.server.core.side.server.listen.ServerListen; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.control + * @Package: com.framewiki.proxy.core.side.server.listen.control * @ClassName: IControlSocket * @Description: 控制端口接口 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/ControlSocket.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/ControlSocket.java index 1413e84ca54bdd3fb959d126094d8959682580ee..e60d015e3dc1e8e986f2bd903db815a858a2a2d6 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/ControlSocket.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/ControlSocket.java @@ -1,12 +1,11 @@ package com.framewiki.proxy.server.core.side.server.listen.control.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.FrameResultEnum; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; -import com.framewiki.network.proxy.model.interactive.ServerWaitModel; -import com.framewiki.proxy.server.core.side.server.client.handler.impl.InteractiveProcessHandler; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.FrameResultEnum; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.model.interactive.ServerWaitModel; import com.framewiki.proxy.server.core.side.server.listen.ServerListen; import com.framewiki.proxy.server.core.side.server.listen.control.IControlSocket; import com.framewiki.proxy.server.core.side.server.listen.recv.IRecvHandler; @@ -20,7 +19,7 @@ import java.util.Objects; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.config + * @Package: com.framewiki.proxy.core.side.server.listen.config * @ClassName: ControlSocket * @Description: 控制socket实例 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/MultControlSocket.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/MultControlSocket.java index 09b2794ef606817eb0f904d260f8b6cfb5ae9c09..d03296cb390bfbb7674da95fe81b36b34aea6ade 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/MultControlSocket.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/MultControlSocket.java @@ -9,7 +9,7 @@ import java.util.Objects; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.config + * @Package: com.framewiki.proxy.core.side.server.listen.config * @ClassName: MultControlSocket * @Description: 复合 控制socket实例 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/MultiControlSocket.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/MultiControlSocket.java index e3d5a53243d7742b1473db3455163fd540db9103..5c50d6f5ffa1b3109377a92e600b56bfa76a3fba 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/MultiControlSocket.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/control/impl/MultiControlSocket.java @@ -9,7 +9,7 @@ import java.util.Objects; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.config + * @Package: com.framewiki.proxy.core.side.server.listen.config * @ClassName: MultiControlSocket * @Description: 复合 控制socket实例 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/IRecvHandler.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/IRecvHandler.java index 0a731e3574523292717d75545a7931390d7b81d4..803f27bc4ea43330230bd397ea1f6bc5b9b9bcd5 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/IRecvHandler.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/IRecvHandler.java @@ -1,10 +1,10 @@ package com.framewiki.proxy.server.core.side.server.listen.recv; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.recv + * @Package: com.framewiki.proxy.core.side.server.listen.recv * @ClassName: IRecvHandler * @Description: 接收处理器 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/impl/ClientHeartHandler.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/impl/ClientHeartHandler.java index bd342c0738b561b93fc248c15c93be2cc0e7947e..8b41e1ec5dd62de4ae301f2fdd316d731f04140c 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/impl/ClientHeartHandler.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/impl/ClientHeartHandler.java @@ -1,14 +1,14 @@ package com.framewiki.proxy.server.core.side.server.listen.recv.impl; import com.framewiki.proxy.server.core.side.server.listen.recv.IRecvHandler; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.FrameResultEnum; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.FrameResultEnum; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.recv + * @Package: com.framewiki.proxy.core.side.server.listen.recv * @ClassName: ClientHeartHandler * @Description: 心跳检测 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/impl/CommonReplyHandler.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/impl/CommonReplyHandler.java index 048d08ff157b6dd1500614c3f63f898dae838eb4..b15fea984341e2ec0bb93af2bb85a4232b1dbd3d 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/impl/CommonReplyHandler.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/recv/impl/CommonReplyHandler.java @@ -1,10 +1,9 @@ package com.framewiki.proxy.server.core.side.server.listen.recv.impl; import com.cdkjframework.util.log.LogUtils; -import com.framewiki.network.proxy.channel.impl.BaseSocketChannel; -import com.framewiki.network.proxy.model.InteractiveModel; -import com.framewiki.network.proxy.model.enums.InteractiveTypeEnum; -import com.framewiki.proxy.server.core.side.server.listen.clear.impl.ClearInvalidSocketPartThread; +import com.framewiki.proxy.core.channel.impl.BaseSocketChannel; +import com.framewiki.proxy.core.model.InteractiveModel; +import com.framewiki.proxy.core.model.enums.InteractiveTypeEnum; import com.framewiki.proxy.server.core.side.server.listen.recv.IRecvHandler; import lombok.Getter; import lombok.Setter; @@ -14,7 +13,7 @@ import java.util.Objects; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.recv + * @Package: com.framewiki.proxy.core.side.server.listen.recv * @ClassName: CommonReplyHandler * @Description: 统一回复 处理器 * @Author: frank tiger diff --git a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/serversocket/ICreateServerSocket.java b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/serversocket/ICreateServerSocket.java index 1bab14e1aaa9b1dd2230c41f6ff2dae31e48833b..ee9e6fad47116bfe12e74f386235dc3c6ce53593 100644 --- a/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/serversocket/ICreateServerSocket.java +++ b/server/proxy-server/src/main/java/com/framewiki/proxy/server/core/side/server/listen/serversocket/ICreateServerSocket.java @@ -4,7 +4,7 @@ import java.net.ServerSocket; /** * @ProjectName: wiki-proxy - * @Package: com.framewiki.network.proxy.side.server.listen.serversocket + * @Package: com.framewiki.proxy.core.side.server.listen.serversocket * @ClassName: ICreateServerSocket * @Description: 创建服务端口接口 * @Author: frank tiger