From d0572a4aba40df36fc3dd64f797ab200c42fa70d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Thu, 27 Mar 2025 00:01:09 +0800 Subject: [PATCH 1/9] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9docker=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E5=81=9C=E6=AD=A2=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/proxy-client-web/Dockerfile | 10 +++++----- client/proxy-client-web/pom.xml | 2 +- client/proxy-client-web/start.sh | 4 ++-- client/proxy-client-web/stop.sh | 2 +- server/proxy-server-web/Dockerfile | 8 ++++---- server/proxy-server-web/start.sh | 4 ++-- server/proxy-server-web/stop.sh | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/proxy-client-web/Dockerfile b/client/proxy-client-web/Dockerfile index 967a3e3..d79fe56 100644 --- a/client/proxy-client-web/Dockerfile +++ b/client/proxy-client-web/Dockerfile @@ -1,18 +1,18 @@ #指定以 openjdk:17-jdk-oracle 为基础镜像，来构建此镜像，可以理解为运行的需要基础环境 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 +RUN mkdir -p /usr/web +RUN mkdir -p /usr/web/wiki-proxy +RUN mkdir -p /usr/web/wiki-proxy/client #指定容器的工作目录 -ENV jar_file /user/web/wiki-proxy/client +ENV jar_file /usr/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 +ENV jar_name wiki-proxy-client.jar ADD ${jar_name} ${jar_file}${jar_name} #jar文件端口 通过启动命令传入进来 ENV server_port ${server_port} diff --git a/client/proxy-client-web/pom.xml b/client/proxy-client-web/pom.xml index 375db5c..c9fb96f 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/start.sh b/client/proxy-client-web/start.sh index 677f09c..a19f01c 100644 --- a/client/proxy-client-web/start.sh +++ b/client/proxy-client-web/start.sh @@ -4,7 +4,7 @@ echo "开始构建" #分别输入 容器名称 和要构建的 版本号 eg test 111 生成版本号为 test:111 #contain_name=test #version=1 -contain_name=wiKi-proxy-client +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}]" #输入要构建的端口号 或者自定义 @@ -14,7 +14,7 @@ echo "you input server port is [${server_port}]" #取消自定义命令 #contain_name=demo docker rmi ${contain_name}:${version} -docker buildx build -t ${contain_name}:${version} . +docker build -t ${contain_name}:${version} . #停用之前的服务 docker stop ${contain_name} docker rm ${contain_name} diff --git a/client/proxy-client-web/stop.sh b/client/proxy-client-web/stop.sh index de4fc73..7362d83 100644 --- a/client/proxy-client-web/stop.sh +++ b/client/proxy-client-web/stop.sh @@ -1,6 +1,6 @@ #vi stopAndRemoveContain.sh #!/bin/bash -contain_name=wiKi-proxy-client +contain_name=wiki-proxy-client #停止容器 docker stop ${contain_name} #删除容器 diff --git a/server/proxy-server-web/Dockerfile b/server/proxy-server-web/Dockerfile index c2ca0e1..d4963c4 100644 --- a/server/proxy-server-web/Dockerfile +++ b/server/proxy-server-web/Dockerfile @@ -1,11 +1,11 @@ #指定以 openjdk:17-jdk-oracle 为基础镜像，来构建此镜像，可以理解为运行的需要基础环境 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 +RUN mkdir -p /usr/web +RUN mkdir -p /usr/web/wiki-proxy +RUN mkdir -p /usr/web/wiki-proxy/server #指定容器的工作目录 -ENV jar_file /user/web/wiki-proxy/server +ENV jar_file /usr/web/wiki-proxy/server/ #添加时区指向 ENV TZ=Asia/Shanghai RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone diff --git a/server/proxy-server-web/start.sh b/server/proxy-server-web/start.sh index c9df325..cbeca3a 100644 --- a/server/proxy-server-web/start.sh +++ b/server/proxy-server-web/start.sh @@ -4,7 +4,7 @@ echo "开始构建" #分别输入 容器名称 和要构建的 版本号 eg test 111 生成版本号为 test:111 #contain_name=test #version=1 -contain_name=wiKi-proxy-server +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}]" #输入要构建的端口号 或者自定义 @@ -14,7 +14,7 @@ echo "you input server port is [${server_port}]" #取消自定义命令 #contain_name=demo docker rmi ${contain_name}:${version} -docker buildx build -t ${contain_name}:${version} . +docker build -t ${contain_name}:${version} . #停用之前的服务 docker stop ${contain_name} docker rm ${contain_name} diff --git a/server/proxy-server-web/stop.sh b/server/proxy-server-web/stop.sh index 696eb62..869d2e4 100644 --- a/server/proxy-server-web/stop.sh +++ b/server/proxy-server-web/stop.sh @@ -1,6 +1,6 @@ #vi stopAndRemoveContain.sh #!/bin/bash -contain_name=wiKi-proxy-server +contain_name=wiki-proxy-server #停止容器 docker stop ${contain_name} #删除容器 -- Gitee From 790e8da17d97fe5e06a535075ba345a5aba60fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Fri, 28 Mar 2025 21:09:11 +0800 Subject: [PATCH 2/9] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9docker=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=EF=BC=8C=E5=81=9C=E6=AD=A2=E8=84=9A=E6=9C=AC=203=E3=80=81?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 24 +--- README.md | 24 +--- client/proxy-client-web/Dockerfile | 59 ++++++---- .../src/main/resources/application-test.yml | 5 + .../src/main/resources/application.yml | 7 +- client/proxy-client-web/start.sh | 94 ++++++++++++---- client/proxy-client-web/stop.sh | 18 +-- .../proxy/client/core/WikiProxyClient.java | 12 +- .../proxy/client/core/config/ProxyConfig.java | 2 + .../core/side/client/ClientControlThread.java | 6 +- .../side/client/adapter/ClientAdapter.java | 4 +- .../impl/InteractiveSimpleClientAdapter.java | 18 +-- .../core/side/client/config/ClientConfig.java | 4 +- .../AllSecretInteractiveClientConfig.java | 8 +- .../config/impl/HttpRouteClientConfig.java | 14 +-- .../config/impl/InteractiveClientConfig.java | 10 +- .../impl/SecretInteractiveClientConfig.java | 9 +- .../handler/impl/CommonReplyHandler.java | 5 +- .../handler/impl/ServerHeartHandler.java | 7 +- .../handler/impl/ServerWaitClientHandler.java | 7 +- .../client/heart/impl/ClientHeartThread.java | 2 +- .../com/framewiki/network/proxy/agent.iml | 11 -- .../core}/api/IBelongControl.java | 4 +- .../core}/api/IHttpRouting.java | 6 +- .../core}/api/passway/SecretPassway.java | 16 +-- .../core}/api/passway/SimplePassway.java | 15 ++- .../core}/api/secret/ISecret.java | 4 +- .../core}/api/secret/impl/AesSecret.java | 8 +- .../core}/api/socket/part/BaseSocketPart.java | 6 +- .../api/socket/part/HttpRouteSocketPart.java | 16 +-- .../api/socket/part/SecretSocketPart.java | 14 +-- .../api/socket/part/SimpleSocketPart.java | 11 +- .../proxy => proxy/core}/channel/Channel.java | 4 +- .../core}/channel/impl/BaseSocketChannel.java | 6 +- .../channel/impl/InteractiveChannelBase.java | 6 +- .../core}/channel/impl/JsonChannelBase.java | 4 +- .../core}/channel/impl/LengthChannelBase.java | 6 +- .../impl/SecretInteractiveChannelBase.java | 10 +- .../core}/channel/impl/StringChannelBase.java | 4 +- .../core}/common/CommonConstants.java | 4 +- .../core}/common/CommonFormat.java | 4 +- .../proxy => proxy/core}/common/Optional.java | 4 +- .../core}/executor/FrameExecutor.java | 10 +- .../core}/executor/IExecutor.java | 10 +- .../core}/executor/impl/SimpleExecutor.java | 6 +- .../core}/model/FrameResultModel.java | 7 +- .../proxy => proxy/core}/model/HttpRoute.java | 4 +- .../core}/model/InteractiveModel.java | 8 +- .../core}/model/SecretInteractiveModel.java | 8 +- .../core}/model/enums/FrameResultEnum.java | 6 +- .../model/enums/InteractiveTypeEnum.java | 4 +- .../model/interactive/ClientConnectModel.java | 4 +- .../model/interactive/ClientControlModel.java | 4 +- .../model/interactive/ServerWaitModel.java | 4 +- .../core}/nio/NioProcessed.java | 4 +- .../core}/nio/impl/NioHallows.java | 13 +-- .../core}/nio/impl/ProcessedHolder.java | 6 +- .../proxy => proxy/core}/util/AesUtils.java | 5 +- .../core}/util/AssertUtils.java | 4 +- .../core}/util/CountWaitLatch.java | 4 +- .../core}/util/Md5Signature.java | 5 +- .../proxy => proxy/core}/util/ToolsUtils.java | 4 +- server/proxy-server-web/Dockerfile | 58 ++++++---- .../src/main/resources/application-test.yml | 5 + .../src/main/resources/application.yml | 4 +- server/proxy-server-web/start.sh | 106 ++++++++++++++---- server/proxy-server-web/stop.sh | 18 +-- .../proxy/server/core/WikiProxyServer.java | 4 +- .../core/config/ProxyAutoConfiguration.java | 1 + .../proxy/server/core/config/ProxyConfig.java | 2 + .../server/client/ClientServiceThread.java | 10 +- .../client/adapter/ClientServiceAdapter.java | 2 +- .../DefaultReadAheadPassValueAdapter.java | 4 +- .../adapter/impl/PassValueNextEnum.java | 2 +- .../impl/ReadAheadPassValueAdapter.java | 6 +- .../client/config/IClientServiceConfig.java | 4 +- .../SecretSimpleClientServiceConfig.java | 10 +- .../config/SimpleClientServiceConfig.java | 8 +- .../client/handler/PassValueHandler.java | 6 +- .../DefaultInteractiveProcessHandler.java | 2 +- .../impl/InteractiveProcessHandler.java | 13 +-- .../side/server/client/process/IProcess.java | 6 +- .../process/impl/ClientConnectProcess.java | 16 +-- .../process/impl/ClientControlProcess.java | 14 +-- .../server/listen/ListenServerControl.java | 2 +- .../core/side/server/listen/ServerListen.java | 2 +- .../server/listen/ServerListenThread.java | 17 ++- .../clear/IClearInvalidSocketPartThread.java | 2 +- .../impl/ClearInvalidSocketPartThread.java | 5 +- .../listen/config/ListenServerConfig.java | 4 +- .../AllSecretSimpleListenServerConfig.java | 10 +- .../impl/MultControlListenServerConfig.java | 4 +- .../impl/SecretSimpleListenServerConfig.java | 11 +- .../config/impl/SimpleListenServerConfig.java | 13 +-- .../server/listen/control/IControlSocket.java | 2 +- .../listen/control/impl/ControlSocket.java | 13 +-- .../control/impl/MultControlSocket.java | 2 +- .../control/impl/MultiControlSocket.java | 2 +- .../side/server/listen/recv/IRecvHandler.java | 4 +- .../listen/recv/impl/ClientHeartHandler.java | 10 +- .../listen/recv/impl/CommonReplyHandler.java | 9 +- .../serversocket/ICreateServerSocket.java | 2 +- 102 files changed, 575 insertions(+), 462 deletions(-) create mode 100644 client/proxy-client-web/src/main/resources/application-test.yml delete mode 100644 proxy-core/src/main/java/com/framewiki/network/proxy/agent.iml rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/IBelongControl.java (85%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/IHttpRouting.java (70%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/passway/SecretPassway.java (89%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/passway/SimplePassway.java (92%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/secret/ISecret.java (86%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/secret/impl/AesSecret.java (83%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/socket/part/BaseSocketPart.java (91%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/socket/part/HttpRouteSocketPart.java (92%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/socket/part/SecretSocketPart.java (90%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/api/socket/part/SimpleSocketPart.java (91%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/channel/Channel.java (91%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/channel/impl/BaseSocketChannel.java (85%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/channel/impl/InteractiveChannelBase.java (93%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/channel/impl/JsonChannelBase.java (96%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/channel/impl/LengthChannelBase.java (97%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/channel/impl/SecretInteractiveChannelBase.java (93%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/channel/impl/StringChannelBase.java (96%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/common/CommonConstants.java (94%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/common/CommonFormat.java (94%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/common/Optional.java (89%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/executor/FrameExecutor.java (90%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/executor/IExecutor.java (88%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/executor/impl/SimpleExecutor.java (90%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/FrameResultModel.java (94%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/HttpRoute.java (93%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/InteractiveModel.java (93%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/SecretInteractiveModel.java (93%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/enums/FrameResultEnum.java (90%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/enums/InteractiveTypeEnum.java (93%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/interactive/ClientConnectModel.java (78%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/interactive/ClientControlModel.java (78%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/model/interactive/ServerWaitModel.java (78%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/nio/NioProcessed.java (81%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/nio/impl/NioHallows.java (96%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/nio/impl/ProcessedHolder.java (85%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/util/AesUtils.java (96%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/util/AssertUtils.java (92%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/util/CountWaitLatch.java (97%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/util/Md5Signature.java (95%) rename proxy-core/src/main/java/com/framewiki/{network/proxy => proxy/core}/util/ToolsUtils.java (95%) create mode 100644 server/proxy-server-web/src/main/resources/application-test.yml diff --git a/README.cn.md b/README.cn.md index edd21d4..944d594 100644 --- a/README.cn.md +++ b/README.cn.md @@ -123,9 +123,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 +134,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 +150,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 +161,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 8df36c0..7831baf 100644 --- a/README.md +++ b/README.md @@ -129,9 +129,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 +140,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 +154,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 +167,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 d79fe56..77f940e 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 /usr/web -RUN mkdir -p /usr/web/wiki-proxy -RUN mkdir -p /usr/web/wiki-proxy/client -#指定容器的工作目录 -ENV jar_file /usr/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/src/main/resources/application-test.yml b/client/proxy-client-web/src/main/resources/application-test.yml new file mode 100644 index 0000000..45da09b --- /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 518ab23..5a884dc 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 a19f01c..5d751a3 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 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 7362d83..7567df2 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 1f1164d..caf1721 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 9bdf18a..a1d3198 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 6329cb3..e2d7ab2 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 0dbbe0f..eba6764 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 a1bd250..2dc1fcb 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 8d398a8..7b06e26 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 bd0ce9d..d32ace2 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 886f092..21b2ab3 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 8918418..dbb240e 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 b3bad20..be61138 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 644262e..2b591ff 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 dab9bb8..ebe6dee 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 d4bed54..cc0328b 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 9b98ba9..3aaf30d 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 bcafec0..0000000 --- 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 bc57731..9319120 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 2e59538..9a09921 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 00f2ae8..b677447 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 6d2beaa..9701ab4 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 bea41ca..833927e 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 22fd35c..bdab1f5 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 92f0d9f..e862eb1 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 8cde2aa..6a0d58a 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 2370101..b4b5612 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 9a8bf5e..53e8993 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 c93dd12..5a0d192 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 5280ada..8bbc35a 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 306b535..c8a3eb8 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 31e9e6e..f992d89 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 b69df7d..fd6a59a 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 c050c77..02081a6 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 3d7a6b9..cbd92a9 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 fbc0c22..df363af 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 f94e5c1..908903d 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 7355d90..13c355f 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 66ecbc8..d97bf42 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 bd937cf..089cefc 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 4a82334..98b4078 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 87824c0..d908db6 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 37f3ea4..6e19a3b 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 70d9bb5..d69ec44 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 dabb5ac..e538864 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 bb4fe86..5c540dc 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 a684f10..8d49992 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 e0eee9d..d535342 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 fb77919..2a0109a 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 073cff1..8dea05a 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 9462f11..e6ec532 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 19d4061..f956968 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 aba9376..e043e68 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 61bfb76..211aea7 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 86a1340..acba12c 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 db30be5..f64221b 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 e06c536..05feeb1 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 998fa4b..382292c 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 d4963c4..907b394 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 /usr/web -RUN mkdir -p /usr/web/wiki-proxy -RUN mkdir -p /usr/web/wiki-proxy/server -#指定容器的工作目录 -ENV jar_file /usr/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 0000000..45da09b --- /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 5437007..0366f7c 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 cbeca3a..b1a1eef 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 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 869d2e4..18eb29d 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 6ec2667..e50cf87 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 cf76ec5..55f7862 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 ee74732..7e47415 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 8b37582..bd9466f 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 810c6cf..a790041 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 f72e5f3..f966c6a 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 20d65b5..207f1e4 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 dd04290..377b5d6 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 a2fad51..6a2fe0f 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 b9fbd92..f44d5e5 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 9969050..c280789 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 43b1eba..d132537 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 25c3e7b..8d139ce 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 480973c..2b519b5 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 1506500..07e88dc 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 0ce786f..9cfa188 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 c9175b5..a0f96b0 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 bed7dd4..45e17fe 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 77ace2b..16010de 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 72f1b0b..f5fb3a0 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 e1d626b..39de726 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 ecf29b7..f9f824b 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 ccebb1a..26bc674 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 f49e2cf..2ce65c7 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 0cf1268..dd81fda 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 6f28d9c..8406763 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 0651308..b503de4 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 d408027..d5aee7a 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 1413e84..e60d015 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 09b2794..d03296c 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 e3d5a53..5c50d6f 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 0a731e3..803f27b 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 bd342c0..8b41e1e 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 048d08f..b15fea9 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 1bab14e..ee9e6fa 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 -- Gitee From 32f082630cd0c1a790d371006e4d46ec62f31088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Fri, 28 Mar 2025 21:32:16 +0800 Subject: [PATCH 3/9] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4MD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 34 +++++++++++++++++----------------- README.md | 40 +++++++++++++++++----------------------- 2 files changed, 34 insertions(+), 40 deletions(-) diff --git a/README.cn.md b/README.cn.md index 944d594..ca49f15 100644 --- a/README.cn.md +++ b/README.cn.md @@ -1,23 +1,23 @@ -# 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、项目结构 diff --git a/README.md b/README.md index 7831baf..1cc2442 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,23 @@ -# 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 -- Gitee From a4ca06afb2ab9f23a44ff7f17830e0f57a9d4736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Fri, 28 Mar 2025 21:35:52 +0800 Subject: [PATCH 4/9] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4MD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1cc2442..476248b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@

keytool

+

维基代理

+

Wiki Proxy

star fork -- Gitee From 1dbb8989ec1548f9081aa9069f7d734c521ade14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Fri, 28 Mar 2025 21:36:36 +0800 Subject: [PATCH 5/9] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4MD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.cn.md b/README.cn.md index ca49f15..6e35173 100644 --- a/README.cn.md +++ b/README.cn.md @@ -1,6 +1,8 @@

keytool

+

维基代理

+

Wiki Proxy

star fork -- Gitee From 671e35174c9861dc3baee8afbdc0508d72882e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Fri, 28 Mar 2025 21:42:45 +0800 Subject: [PATCH 6/9] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4MD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 6 ++++-- README.md | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/README.cn.md b/README.cn.md index 6e35173..8f6e4f4 100644 --- a/README.cn.md +++ b/README.cn.md @@ -1,8 +1,10 @@

keytool

-

维基代理

-

Wiki Proxy

+ +
维基代理
+
Wiki Proxy
+

star fork diff --git a/README.md b/README.md index 476248b..a7a47b6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,10 @@

keytool

-

维基代理

-

Wiki Proxy

+ +
维基代理
+
Wiki Proxy
+

star fork -- Gitee From 480b85536fe1728b115ddd2ccdb72f1937c237e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Fri, 28 Mar 2025 21:43:19 +0800 Subject: [PATCH 7/9] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4MD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 5 +++-- README.md | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README.cn.md b/README.cn.md index 8f6e4f4..f2d3c10 100644 --- a/README.cn.md +++ b/README.cn.md @@ -2,8 +2,9 @@ keytool

-
维基代理
-
Wiki Proxy
+#
维基代理 + +###
Wiki Proxy

star diff --git a/README.md b/README.md index a7a47b6..23d1c19 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,9 @@ keytool

-
维基代理
-
Wiki Proxy
+#
维基代理 + +###
Wiki Proxy

star -- Gitee From b2ceee53bdf5023144ef9b7e90a4da70b74ad47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Fri, 28 Mar 2025 21:45:38 +0800 Subject: [PATCH 8/9] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4MD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 7 +++++-- README.md | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.cn.md b/README.cn.md index f2d3c10..098b158 100644 --- a/README.cn.md +++ b/README.cn.md @@ -2,9 +2,12 @@ keytool

-#
维基代理 -###
Wiki Proxy +

+维基代理 +

+ +

Wiki Proxy

star diff --git a/README.md b/README.md index 23d1c19..c492c90 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,12 @@ keytool

-#
维基代理 +

+维基代理 +

+ +

Wiki Proxy

-###
Wiki Proxy

star -- Gitee From 8689a53063359395f4ec8dcb17c098d7d40d33d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=B4=E5=9F=BA=E6=A1=86=E6=9E=B6?= Date: Fri, 28 Mar 2025 21:49:06 +0800 Subject: [PATCH 9/9] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4MD=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.cn.md | 7 ------- README.md | 7 ------- 2 files changed, 14 deletions(-) diff --git a/README.cn.md b/README.cn.md index 098b158..2f6ec08 100644 --- a/README.cn.md +++ b/README.cn.md @@ -2,13 +2,6 @@ keytool

- -

-维基代理 -

- -

Wiki Proxy

-

star fork diff --git a/README.md b/README.md index c492c90..9a0a4af 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,6 @@ keytool

-

-维基代理 -

- -

Wiki Proxy

- -

star fork -- Gitee