Merge remote-tracking branch 'origin/main'

# Conflicts:
#	.gitignore

.devcontainer/devcontainer.json

@@ -0,0 +1,28 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/java
+{
+  "name": "Java",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/java:0-17",
+
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "none",
+      "installMaven": "true",
+      "installGradle": "false"
+    },
+    "ghcr.io/devcontainers-contrib/features/ant-sdkman:2": {}
+  }
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "java -version",
+
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

.gitattributes

@@ -0,0 +1,21 @@
+# GitHub 语言检测配置
+# 设置主要语言为 Java
+*.java linguist-language=Java
+*.vue linguist-language=Vue
+*.js linguist-language=JavaScript
+
+# 排除不需要统计的文件
+target/ linguist-vendored=true
+node_modules/ linguist-vendored=true
+webroot/ linguist-vendored=true
+logs/ linguist-vendored=true
+db/ linguist-vendored=true
+
+# 文本文件使用 LF 换行符，适用于 Linux 和 macOS
+*.sh text eol=lf
+*.service text eol=lf
+
+# Windows 执行的文件使用 CRLF 换行符
+*.bat text eol=crlf
+*.cmd text eol=crlf
+bin/nfd-service-template.xml text eol=crlf

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: https://blog.qaiu.top/archives/da-shang-zhuan-yong # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    open-pull-requests-limit: 10
+    ignore:
+      # 忽略通过 BOM 管理的 Vert.x 依赖
+      # 这些依赖的版本通过 vertx-dependencies BOM 统一管理
+      # 应该通过更新 pom.xml 中的 vertx.version 属性来更新这些依赖
+      - dependency-name: "io.vertx:vertx-web"
+      - dependency-name: "io.vertx:vertx-codegen"
+      - dependency-name: "io.vertx:vertx-config"
+      - dependency-name: "io.vertx:vertx-config-yaml"
+      - dependency-name: "io.vertx:vertx-service-proxy"
+      - dependency-name: "io.vertx:vertx-web-proxy"
+      - dependency-name: "io.vertx:vertx-web-client"
+

.github/workflows/build.yml

@@ -0,0 +1,45 @@
+name: 编译项目
+
+on:
+  push:
+    branches: [ main, master ]
+    paths-ignore:
+      - 'bin/**'
+      - '.github/**'
+      - '.mvn/**'
+      - '.run/**'
+      - '.vscode/**'
+      - '*.txt'
+      - '*.md'
+  pull_request:
+    branches: [ main, master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - name: 检出代码
+      uses: actions/checkout@v4
+      
+    - name: 设置 Java 17
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        
+    - name: 缓存 Maven 依赖
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2
+        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
+        restore-keys: ${{ runner.os }}-m2
+        
+    - name: 编译项目
+      run: ./mvnw clean compile
+      
+#    - name: 运行测试
+#      run: ./mvnw test
+      
+    - name: 打包项目
+      run: ./mvnw package -DskipTests

.github/workflows/maven.yml

@@ -11,12 +11,25 @@ name: Java CI with Maven
 # The API requires write permission on the repository to submit dependencies
 permissions:
   contents: write
+  packages: write
 
 on:
   push:
-    branches: [ "main" ]
+    tags:
+      - '*'  # 只有推送tag时才会触发构建
+    branches-ignore:
+      - '*'  # 排除所有分支的提交
+    paths-ignore:
+      - 'bin/**'
+      - '.github/**'
+      - '.mvn/**'
+      - '.run/**'
+      - '.vscode/**'
+      - '*.txt'
+      - '*.md'
   pull_request:
-    branches: [ "main" ]
+    branches:
+      - "main"
 
 jobs:
   build:
@@ -25,19 +38,64 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
+
+    - uses: actions/setup-node@v4
+      with:
+        node-version: '18'
+
     - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         java-version: '17'
         distribution: 'temurin'
         cache: maven
+
+    - name: Build Frontend
+      run: cd web-front && yarn install && yarn run build
+
     - name: Build with Maven
-      run: mvn -B package --file pom.xml
+      run: mvn -B package -DskipTests --file pom.xml
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Update dependency graph
       uses: advanced-security/maven-dependency-submission-action@v3
+      if: github.event_name != 'pull_request'
+      with:
+        ignore-maven-wrapper: true
 
 #    - uses: release-drafter/release-drafter@v5
 #      env:
 #        GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        path: web-service/target/netdisk-fast-download-bin.zip
+
+    - name: Login to GitHub Container Registry
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Extract git tag
+      id: tag
+      run: |
+        GIT_TAG=$(git tag --points-at HEAD | head -n 1)
+        echo "tag=$GIT_TAG" >> $GITHUB_OUTPUT
+
+    - name: Build and push Docker image
+      if: github.event_name != 'pull_request'
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        push: true
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        tags: |
+          ghcr.io/qaiu/netdisk-fast-download:${{ steps.tag.outputs.tag }}
+          ghcr.io/qaiu/netdisk-fast-download:latest

.gitignore

@@ -29,6 +29,8 @@ target/
 /src/logs/
 *.zip
 sdkTest.log
+app.yml
+app-local.yml
 
 
 #some local files
@@ -38,3 +40,52 @@ gradlew
 gradlew.bat
 unused.txt
 /web-service/src/main/generated/
+/db
+/webroot/nfd-front/
+package-lock.json
+
+# Maven generated files
+.flattened-pom.xml
+**/.flattened-pom.xml
+
+# Test files
+test-filelist.java
+
+# Temporary files
+*.tmp
+*.temp
+*.log
+*.bak
+*.swp
+*.swo
+*~
+
+# Node.js (if any)
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Build artifacts
+*.jar
+*.war
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# IDE specific
+.vscode/
+.cursor/
+*.iml
+*.ipr
+*.iws
+
+# Build directories
+**/target/
+**/build/
+**/classes/
+**/out/
+**/${project.build.directory}/
+**/${project.basedir}/target/
+**/${basedir}/target/

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.run/AppMain.run.xml

@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="AppMain" type="Application" factoryName="Application" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="cn.qaiu.lz.AppMain" />
+    <module name="web-service" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="cn.qaiu.lz.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Current File",
+            "request": "launch",
+            "mainClass": "${file}"
+        },
+        {
+            "type": "java",
+            "name": "AppMain",
+            "request": "launch",
+            "mainClass": "cn.qaiu.lz.AppMain",
+            "projectName": "web-service"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

Dockerfile

@@ -0,0 +1,17 @@
+FROM eclipse-temurin:17-jre
+
+WORKDIR /app
+
+# 安装 unzip
+RUN apt-get update && apt-get install -y unzip && rm -rf /var/lib/apt/lists/*
+
+COPY ./web-service/target/netdisk-fast-download-bin.zip .
+
+RUN unzip netdisk-fast-download-bin.zip && \
+    mv netdisk-fast-download/* ./ && \
+    rm netdisk-fast-download-bin.zip && \
+    chmod +x run.sh
+
+EXPOSE 6400 6401
+
+ENTRYPOINT ["sh", "run.sh"]

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 qaiu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,73 +1,534 @@
-# netdisk-fast-download
-# 网盘快速下载器--直链解析
-[![Java CI with Maven](https://github.com/qaiu/netdisk-fast-download/actions/workflows/maven.yml/badge.svg)](https://github.com/qaiu/netdisk-fast-download/actions/workflows/maven.yml)
-## 网盘支持情况:  
-` 网盘名称(网盘标识): ` 
-- 蓝奏云 (lz)
-    - [ ] 登录, 上传, 下载, 分享
-    - [x] 直链解析
-- 奶牛快传 (cow)
-    - [ ] 登录, 上传, 下载, 分享
-    - [x] 直链解析
-- 移动云空间 (ec)
-    - [ ] 登录, 上传, 下载, 分享
-    - [x] 直链解析
-- UC网盘 (uc)
-    - [ ] 登录, 上传, 下载, 分享
-    - [x] 直链解析
-- 夸克网盘 (qk)
-- TODO
+<p align="center">
+  <img src="https://github.com/user-attachments/assets/87401aae-b0b6-4ffb-bbeb-44756404d26f" alt="项目预览图" />
+</p>
 
-技术栈: 
-Jdk17+Vert.x4.4.1+Jsoup  
-Core模块集成Vert.x实现类spring的注解式路由API  
+<p align="center">
+<a href="https://github.com/qaiu/netdisk-fast-download/actions/workflows/maven.yml"><img src="https://img.shields.io/github/actions/workflow/status/qaiu/netdisk-fast-download/maven.yml?branch=v0.1.9b8a&style=flat"></a>
+<a href="https://www.oracle.com/cn/java/technologies/downloads"><img src="https://img.shields.io/badge/jdk-%3E%3D17-blue"></a>
+<a href="https://vertx-china.github.io"><img src="https://img.shields.io/badge/vert.x-4.5.22-blue?style=flat"></a>
+<a href="https://raw.githubusercontent.com/qaiu/netdisk-fast-download/master/LICENSE"><img src="https://img.shields.io/github/license/qaiu/netdisk-fast-download?style=flat"></a>
+<a href="https://github.com/qaiu/netdisk-fast-download/releases/"><img src="https://img.shields.io/github/v/release/qaiu/netdisk-fast-download?style=flat"></a>
+</p>
 
-API接口
+
+
+
+# netdisk-fast-download 网盘分享链接云解析服务  
+QQ交流群：1017480890
+
+netdisk-fast-download网盘直链云解析(nfd云解析)能把网盘分享下载链接转化为直链，支持多款云盘，已支持蓝奏云/蓝奏云优享/奶牛快传/移动云云空间/小飞机盘/亿方云/123云盘/Cloudreve等，支持加密分享，以及部分网盘文件夹分享。  
+
+## 快速开始
+命令行下载分享文件：  
 ```shell
-(括号内表示可选内容)
-1. 解析并自动302跳转 : 
-    http(s)://you_host/parser?url=分享链接
-    http(s)://you_host/网盘标识/分享id(#分享密码)
-2. 获取解析后的直链--JSON格式
-    http(s)://you_host/json/网盘标识/分享id(#分享密码)
+curl -LOJ "https://lz.qaiu.top/parser?url=https://share.feijipan.com/s/nQOaNRPW&pwd=1234"  
+```
+或者使用wget:  
+```shell
+wget -O bilibili.mp4 "https://lz.qaiu.top/parser?url=https://share.feijipan.com/s/nQOaNRPW&pwd=1234"
+```
+或者使用浏览器[直接访问](https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.top%2Fparser%3Furl%3Dhttps%3A%2F%2Fshare.feijipan.com%2Fs%2FnQOaNRPW&name=bilibili.mp4&ext=mp4):
+```
+### 调用演示站下载：
+https://lz.qaiu.top/parser?url=https://share.feijipan.com/s/nQOaNRPW&pwd=1234  
+### 调用演示站预览：
+https://nfd-parser.github.io/nfd-preview/preview.html?src=https%3A%2F%2Flz.qaiu.top%2Fparser%3Furl%3Dhttps%3A%2F%2Fshare.feijipan.com%2Fs%2FnQOaNRPW&name=bilibili.mp4&ext=mp4  
 
 ```
 
+**解析器模块文档：** [parser/README.md](parser/README.md)
 
-示例:  
+**JavaScript解析器文档：** [JavaScript解析器开发指南](parser/doc/JAVASCRIPT_PARSER_GUIDE.md) | [自定义解析器扩展指南](parser/doc/CUSTOM_PARSER_GUIDE.md) | [快速开始](parser/doc/CUSTOM_PARSER_QUICKSTART.md)
+
+**Playground功能：** [JS解析器演练场密码保护说明](web-service/doc/PLAYGROUND_PASSWORD_PROTECTION.md)
+
+## 预览地址  
+[预览地址1](https://lz.qaiu.top)  
+[预览地址2](https://lz0.qaiu.top)  
+[天翼云盘/移动云盘限时体验版](https://189.qaiu.top)  
+
+main分支依赖JDK17, 提供了JDK11分支[main-jdk11](https://github.com/qaiu/netdisk-fast-download/tree/main-jdk11)  
+**0.1.8及以上版本json接口格式有调整 参考json返回数据格式示例**  
+**小飞机解析有IP限制，多数云服务商的大陆IP会被拦截（可以自行配置代理），和本程序无关**  
+**注意: 请不要过度依赖lz.qaiu.top预览地址服务，建议本地搭建或者云服务器自行搭建。解析次数过多IP会被部分网盘厂商限制，不推荐做公共解析。**  
+
+## 网盘支持情况:
+> 20230905 奶牛云直链做了防盗链，需加入请求头：Referer: https://cowtransfer.com/  
+> 20230824 123云盘解析大文件(>100MB)失效，需要登录  
+> 20230722 UC网盘解析失效，需要登录  
+
+网盘名称-网盘标识:  
+
+- [蓝奏云-lz](https://pc.woozooo.com/)
+- [蓝奏云优享-iz](https://www.ilanzou.com/)
+- [奶牛快传-cow](https://cowtransfer.com/)
+- [移动云云空间-ec](https://www.ecpan.cn/web)
+- [小飞机网盘-fj](https://www.feijipan.com/)
+- [亿方云-fc](https://www.fangcloud.com/)
+- [123云盘-ye](https://www.123pan.com/)
+- ~[115网盘(失效)-p115](https://115.com/)~
+- ~[118网盘(已停服)-p118](https://www.118pan.com/)~
+- [文叔叔-ws](https://www.wenshushu.cn/)
+- [联想乐云-le](https://lecloud.lenovo.com/)
+- [QQ邮箱云盘-qqw](https://mail.qq.com/)
+- [QQ闪传-qqsc](https://nutty.qq.com/nutty/ssr/26797.html)
+- [城通网盘-ct](https://www.ctfile.com)
+- [网易云音乐分享链接-mnes](https://music.163.com)
+- [酷狗音乐分享链接-mkgs](https://www.kugou.com)
+- [酷我音乐分享链接-mkws](https://kuwo.cn)
+- [QQ音乐分享链接-mqqs](https://y.qq.com)
+- [Cloudreve自建网盘-ce](https://github.com/cloudreve/Cloudreve)
+- ~[微雨云存储-pvvy](https://www.vyuyun.com/)~
+- [超星云盘(需要referer: https://pan-yz.chaoxing.com)-pcx](https://pan-yz.chaoxing.com)
+- [WPS云文档-pwps](https://www.kdocs.cn/)
+- [汽水音乐-qishui_music](https://music.douyin.com/qishui/)
+- [咪咕音乐-migu](https://music.migu.cn/)
+- [一刻相册-baidu_photo](https://photo.baidu.com/)
+- Google云盘-pgd
+- Onedrive-pod
+- Dropbox-pdp
+- iCloud-pic
+### 专属版提供
+- [夸克云盘-qk](https://pan.quark.cn/)
+- [UC云盘-uc](https://fast.uc.cn/)
+- [移动云盘-p139](https://yun.139.com/)
+- [联通云盘-pwo](https://pan.wo.cn/)
+- [天翼云盘-p189](https://cloud.189.cn/)
+
+## API接口
+
+[api接口文档](https://nfdparser.apifox.cn/)
+  
+### 服务端口
+- **6400**: API 服务端口（建议使用 Nginx 代理）
+- **6401**: 内置 Web 解析工具（个人使用可直接开放此端口）
+
+### 接口说明
+
+#### 1. 302 自动跳转下载
+
+**通用接口**
+```
+GET /parser?url={分享链接}&pwd={密码}
 ```
-// 解析并重定向到直链
-###
-# @no-redirect
-GET http://127.0.0.1:6400/parser?url=https://lanzoux.com/ia2cntg
-###
-# @no-redirect
-GET http://127.0.0.1:6400/parser?url=https://cowtransfer.com/s/9a644fe3e3a748
 
-// Rest请求(只提供共享文件Id):
-###
-# @no-redirect
-GET http://127.0.0.1:6400/cow/9a644fe3e3a748
+**标志短链**
+```
+GET /d/{网盘标识}/{分享key}@{密码}
+```
 
-// 解析返回json直链
-###
-GET http://127.0.0.1:6400/json/cow/9a644fe3e3a748
-###
-GET http://127.0.0.1:6400/json/lz/ia2cntg
+#### 2. 获取直链 JSON
+
+**通用接口**
+```
+GET /json/parser?url={分享链接}&pwd={密码}
+```
+
+**标志短链**
+```
+GET /json/{网盘标识}/{分享key}@{密码}
+```
+
+#### 3. 文件夹解析（v0.1.8fixed3+）
+
+```
+GET /json/getFileList?url={分享链接}&pwd={密码}
+```
+
+### 使用规则
+
+- `{分享链接}` 建议使用 URL 编码
+- `{密码}` 无密码时省略 `&pwd=` 或 `@密码` 部分
+- `{网盘标识}` 参考支持的网盘列表
+- `your_host` 替换为您的域名或 IP
+
+### 认证参数（v0.2.1+）
+
+部分网盘（如夸克、UC）需要登录后的 Cookie 才能解析和下载。可通过 `auth` 参数传递认证信息：
+
+**参数格式**：`auth` 参数值为 AES 加密后的 JSON 字符串，经过 Base64 编码和 URL 编码
+
+**加密方式**：
+- 算法：AES/ECB/PKCS5Padding
+- 密钥：`nfd_auth_key2026`（16字节）
+- 流程：JSON → AES加密 → Base64 → URL编码
+
+**JSON 结构**：
+```json
+{
+  "authType": "cookie",        // 认证类型: cookie/accesstoken/authorization/password/custom
+  "token": "your_cookie_here", // Cookie 或 Token 内容
+  "username": "",              // 用户名（password 类型时使用）
+  "password": "",              // 密码（password 类型时使用）
+  "ext1": "",                  // 扩展字段1（custom 类型时使用）
+  "ext2": ""                   // 扩展字段2（custom 类型时使用）
+}
+```
+
+**网盘认证要求**：
+| 网盘 | 认证要求 | 说明 |
+|------|---------|------|
+| 夸克网盘(QK) | **必须** | 必须配置 Cookie 才能解析 |
+| UC网盘(UC) | **必须** | 必须配置 Cookie 才能解析 |
+| 小飞机网盘(FJ) | 可选 | 大文件（>100MB）需要认证 |
+| 蓝奏优享(IZ) | 可选 | 大文件需要认证 |
+
+**使用示例**：
+```
+GET /parser?url={分享链接}&pwd={密码}&auth={加密后的认证参数}
+```
+
+> 💡 提示：Web 界面已内置认证配置功能，可自动处理加密过程，无需手动构造参数。
+
+### 特殊说明
+
+- 移动云云空间的 `分享key` 取分享链接中的 `data` 参数值
+- 移动云云空间、小飞机网盘的加密分享可忽略密码参数
+
+### 示例
+
+```bash
+# 302 跳转（通用接口 - 有密码）
+http://your_host/parser?url=https%3A%2F%2Fwww.ilanzou.com%2Fs%2FlGFndCM&pwd=KMnv
+
+# 302 跳转（标志短链 - 有密码）
+http://your_host/d/iz/lGFndCM@KMnv
+
+# 获取 JSON（通用接口 - 无密码）
+http://your_host/json/parser?url=https%3A%2F%2Fwww.ilanzou.com%2Fs%2FLEBZySxF
+
+# 获取 JSON（标志短链 - 无密码）
+http://your_host/json/iz/LEBZySxF
 
 ```
 
-TODO:  
-解析蓝奏云加密链接
+---
+
+
+### json接口详细说明
+
+#### 1. 文件解析：/json/parser?url=分享链接&pwd=xxx  
+
+json返回数据格式示例:  
+`shareKey`:    全局分享key  
+`directLink`:  下载链接  
+`cacheHit`:    是否为缓存链接  
+`expires`:     缓存到期时间  
+
+```json
+{
+  "code": 200,
+  "msg": "success",
+  "success": true,
+  "count": 0,
+  "data": {
+    "shareKey": "lz:xxx",
+    "directLink": "下载直链", 
+    "cacheHit": true,
+    "expires": "2024-09-18 01:48:02",
+    "expiration": 1726638482825
+  },
+  "timestamp": 1726637151902
+}
+```
+#### 2. 分享链接详情接口 /v2/linkInfo?url=分享链接
+```json
+{
+    "code": 200,
+    "msg": "success",
+    "success": true,
+    "count": 0,
+    "data": {
+        "downLink": "https://lz.qaiu.top/d/fj/xx",
+        "apiLink": "https://lz.qaiu.top/json/fj/xx",
+        "cacheHitTotal": 5,
+        "parserTotal": 2,
+        "sumTotal": 7,
+        "shareLinkInfo": {
+            "shareKey": "xx",
+            "panName": "小飞机网盘",
+            "type": "fj",
+            "sharePassword": "",
+            "shareUrl": "https://share.feijipan.com/s/xx",
+            "standardUrl": "https://www.feijix.com/s/xx",
+            "otherParam": {
+                "UA": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36 Edg/131.0.0.0"
+            },
+            "cacheKey": "fj:xx"
+        }
+    },
+    "timestamp": 1736489219402
+}
+```
+#### 3. 文件夹解析(仅支持蓝奏云/蓝奏优享/小飞机网盘)
+/v2/getFileList?url=分享链接&pwd=分享密码
+
+```json
+{
+  "code": 200,
+  "msg": "success",
+  "success": true,
+  "data": [
+    {
+      "fileName": "xxx",
+      "fileId": "xxx",
+      "fileIcon": null,
+      "size": 999,
+      "sizeStr": "999 M",
+      "fileType": "file/folder",
+      "filePath": null,
+      "createTime": "17 小时前",
+      "updateTime": null,
+      "createBy": null,
+      "description": null,
+      "downloadCount": "下载次数",
+      "panType": "lz",
+      "parserUrl": "下载链接/文件夹链接", 
+      "extParameters": null
+    }
+  ]
+}
+```
+#### 4. 解析次数统计接口 /v2/statisticsInfo
+```json
+{
+    "code": 200,
+    "msg": "success",
+    "success": true,
+    "count": 0,
+    "data": {
+        "parserTotal": 320508,
+        "cacheTotal": 5957910,
+        "total": 6278418
+    },
+    "timestamp": 1736489378770
+}
+```
+
 
 
 # 网盘对比
 
-| 网盘名称  | 可直接下载分享     | 加密分享     | 初始网盘空间   | 单文件大小限制        | 登录接口 |
-|-------|-------------|----------|----------|----------------|------|
-| 蓝奏云   | √           | √        | 不限空间     | 100M           | TODO |
-| 奶牛快传  | √           | X        | 10G      | 不限大小           | TODO |
-| 移动云空间 | √           | √(密码可忽略) | 5G(个人)   | 不限大小           | TODO |
-| UC网盘  | √           | √        | 10G      | 不限大小           | TODO |
-| 夸克网盘  | √(>10M需要登录) | √        | 10G(20G) | 不限大小(>10M需要登录) | X    |
+
+| 网盘名称        | 免登陆下载分享 | 加密分享     | 初始网盘空间    | 单文件大小限制         |
+|-------------|---------|----------|-----------|-----------------|
+| 蓝奏云         | √       | √        | 不限空间      | 100M            | 
+| 奶牛快传        | √       | X        | 10G       | 不限大小            | 
+| 移动云云空间(个人版) | √       | √(密码可忽略) | 5G(个人)    | 不限大小            |
+| 小飞机网盘       | √       | √(密码可忽略) | 10G       | 不限大小            | 
+| 360亿方云      | √       | √(密码可忽略) | 100G(须实名) | 不限大小            | 
+| 123云盘       | √       | √        | 2T        | 100G（>100M需要登录） | 
+| 文叔叔         | √       | √        | 10G       | 5GB             | 
+| WPS云文档      | √       | X        | 5G(免费)   | 10M(免费)/2G(会员)  |
+| 夸克网盘        | x       | √        | 10G       | 不限大小            | 
+| UC网盘        | x       | √        | 10G       | 不限大小            | 
+
+# 打包部署
+
+## JDK下载（lz.qaiu.top提供直链云解析服务）
+- [阿里jdk17(Dragonwell17-windows-x86)](https://lz.qaiu.top/d/ec/e957acef36ce89e1053979672a90d219n)
+- [阿里jdk17(Dragonwell17-linux-x86)](https://lz.qaiu.top/d/ec/6ebc9f2e0bbd53b4c4d5b11013f40a80NHvcYU)
+- [阿里jdk17(Dragonwell17-linux-aarch64)](https://lz.qaiu.top/d/ec/d14c2d06296f61b52a876b525265e0f8tzxTc5)
+- [解析有效性测试-移动云云空间-阿里jdk17-linux-x86](https://lz.qaiu.top/json/ec/6ebc9f2e0bbd53b4c4d5b11013f40a80NHvcYU)
+
+## 开发和打包
+
+```shell
+# 环境要求: Jdk17 + maven;
+mvn clean
+mvn package -DskipTests
+
+```
+打包好的文件位于 web-service/target/netdisk-fast-download-bin.zip
+
+## 🚀 快速部署
+
+[![通过雨云一键部署](https://rainyun-apps.cn-nb1.rains3.com/materials/deploy-on-rainyun-cn.svg)](https://app.rainyun.com/apps/rca/store/7273/ssl_?s=ndf)
+
+## Linux服务部署
+
+### Docker 部署（Main分支）
+
+#### 海外服务器Docker部署
+```shell
+# 创建目录
+mkdir -p netdisk-fast-download
+cd netdisk-fast-download
+
+# 拉取镜像
+docker pull ghcr.io/qaiu/netdisk-fast-download:latest
+
+# 复制配置文件（或下载仓库web-service\src\main\resources）
+docker create --name netdisk-fast-download ghcr.io/qaiu/netdisk-fast-download:latest
+docker cp netdisk-fast-download:/app/resources ./resources
+docker rm netdisk-fast-download
+
+# 启动容器
+docker run -d -it --name netdisk-fast-download -p 6401:6401 --restart unless-stopped -e TZ=Asia/Shanghai -v ./resources:/app/resources -v ./db:/app/db -v ./logs:/app/logs ghcr.io/qaiu/netdisk-fast-download:latest
+
+# 反代6401端口
+
+# 升级容器
+docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower --cleanup --run-once netdisk-fast-download
+```
+
+#### 国内Docker部署
+```shell
+# 创建目录
+mkdir -p netdisk-fast-download
+cd netdisk-fast-download
+
+# 拉取镜像
+docker pull ghcr.nju.edu.cn/qaiu/netdisk-fast-download:latest
+
+# 复制配置文件（或下载仓库web-service\src\main\resources）
+docker create --name netdisk-fast-download ghcr.nju.edu.cn/qaiu/netdisk-fast-download:latest
+docker cp netdisk-fast-download:/app/resources ./resources
+docker rm netdisk-fast-download
+
+# 启动容器
+docker run -d -it --name netdisk-fast-download -p 6401:6401 --restart unless-stopped -e TZ=Asia/Shanghai -v ./resources:/app/resources -v ./db:/app/db -v ./logs:/app/logs ghcr.nju.edu.cn/qaiu/netdisk-fast-download:latest
+
+# 反代6401端口
+
+# 升级容器
+docker run --rm -v /var/run/docker.sock:/var/run/docker.sock containrrr/watchtower --cleanup --run-once netdisk-fast-download
+```
+
+### 宝塔部署指引 -> [点击进入宝塔部署教程](https://blog.qaiu.top/archives/netdisk-fast-download-bao-ta-an-zhuang-jiao-cheng)
+
+### Linux命令行部署
+> 注意: netdisk-fast-download.service中的ExecStart的路径改为实际路径
+```shell
+cd ~
+wget -O netdisk-fast-download.zip https://github.com/qaiu/netdisk-fast-download/releases/download/v0.1.9b7/netdisk-fast-download-bin.zip
+unzip netdisk-fast-download-bin.zip
+cd netdisk-fast-download
+bash service-install.sh
+```
+服务相关命令:  
+
+查看服务状态  
+`systemctl status netdisk-fast-download.service`
+ 
+启动服务  
+`systemctl start netdisk-fast-download.service`
+
+重启服务  
+`systemctl restart netdisk-fast-download.service`
+
+停止服务  
+`systemctl stop netdisk-fast-download.service`
+
+开机启动服务  
+`systemctl enable netdisk-fast-download.service`
+
+停止开机启动  
+`systemctl disable netdisk-fast-download.service`
+
+## Windows服务部署
+1. 下载并解压releases版本netdisk-fast-download-bin.zip
+2. 进入netdisk-fast-download下的bin目录
+3. 使用管理员权限运行nfd-service-install.bat
+如果不想使用服务运行可以直接运行run.bat
+> 注意: 如果jdk环境变量的java版本不是17请修改nfd-service-template.xml中的java命令的路径改为实际路径
+
+## 相关配置说明
+
+resources目录下包含服务端配置文件 配置文件自带说明，具体请查看配置文件内容，  
+app-dev.yml 可以配置解析服务相关信息， 包括端口，域名，缓存时长等  
+server-proxy.yml 可以配置代理服务运行的相关信息， 包括前端反向代理端口，路径等  
+
+### ip代理配置说明  
+有时候解析量很大，IP容易被ban，这时候可以使用其他服务器搭建nfd-proxy代理服务。
+
+修改配置文件：
+app-dev.yml
+
+```yaml
+proxy:
+  - panTypes: pgd,pdb,pod     # 网盘标识
+    type: http                # 支持http/socks4/socks5
+    host: 127.0.0.1           # 代理IP
+    port: 7890                # 端口
+    username:                 # 用户名
+    password:                 # 密码
+```  
+nfd-proxy搭建http代理服务器 
+参考https://github.com/nfd-parser/nfd-proxy
+
+### 认证信息配置说明
+部分网盘（如123）解析大文件时需要登录认证，可以在配置文件中添加认证信息。
+
+修改配置文件：
+app-dev.yml
+
+```yaml
+### 解析认证相关
+auths:
+  # 123：配置用户名密码
+  ye:
+    username: 你的用户名
+    password: 你的密码
+```
+
+**注意：** 目前仅支持 123（ye）的认证配置。
+
+## 开发计划
+### v0.1.8~v0.1.9 ✓
+- API添加文件信息(专属版/开源版)
+- 目录解析(专属版/开源版)
+- 文件预览功能(专属版/开源版)
+- 文件夹预览功能(开源版)
+- 友好的错误提示和一键反馈功能(开源版)
+- 带cookie/token/username/pwd参数解析大文件(专属版)
+### v0.2.x
+- web后台管理--认证配置/分享链接管理(开源版/专属版)
+- 123/小飞机/蓝奏优享等大文件解析(开源版)
+- 直链分享(开源版/专属版)
+- aria2/idm+/curl/wget链接生成(开源版/专属版)
+- IP限流配置(开源版/专属版)
+- refere防盗链，API鉴权防盗链(专属版)
+- 123/小飞机/蓝奏优享/蓝奏文件夹解析API，天翼云盘/移动云盘文件夹解析API(专属版)
+- 用户管理面板--营销推广系统(专属版)
+
+**技术栈:**
+Jdk17+Vert.x4
+Core模块集成Vert.x实现类似spring的注解式路由API
+
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=qaiu/netdisk-fast-download&type=Date)](https://star-history.com/#qaiu/netdisk-fast-download&Date)
+
+## **免责声明**  
+   - 用户在使用本项目时，应自行承担风险，并确保其行为符合当地法律法规。开发者不对用户因使用本项目而导致的任何后果负责。
+
+## 支持该项目
+开源不易，用爱发电，本项目长期维护如果觉得有帮助, 可以请作者喝杯咖啡, 感谢支持  
+
+本项目的服务器由林枫云提供赞助<br>
+</a>
+<a href="https://www.dkdun.cn/aff/WDBRYKGH" target="_blank">
+<img src="https://www.dkdun.cn/themes/web/www/upload/local68c2dbb2ab148.png" width="200">
+</a>
+</p>
+
+
+### 关于赞助定制专属版
+1. 专属版提供对小飞机,蓝奏优享大文件解析的支持, 提供天翼云盘/移动云盘/联通云盘的解析支持。  
+2. 可提供托管服务：包含部署服务和云服务器环境。  
+3. 可提供功能定制开发。  
+您可能需要提供一定的资金赞助支持定制专属版， 请添加以下任意一个联系方式详谈赞助模式:  
+<p>qq: 197575894</p>
+<p>wechat: imcoding_</p>
+
+<!--
+![image](https://github.com/qaiu/netdisk-fast-download/assets/29825328/54276aee-cc3f-4ebd-8973-2e15f6295819)
+
+[手机端支付宝打赏跳转链接](https://qr.alipay.com/fkx01882dnoxxtjenhlxt53)
+-->
+
+
+
 

bin/netdisk-fast-download.service

@@ -7,7 +7,8 @@ Wants=network-online.target
 [Service]
 Type=simple
 # User=USER
-ExecStart=/usr/bin/java -server -Xmx128m -jar /root/java/netdisk-fast-download/netdisk-fast-download-0.0.1.jar
+# 需要JDK17及以上版本 注意修改为自己的路径
+ExecStart=/root/java/jdk-17.0.2/bin/java -server -Xmx128m -jar /root/java/netdisk-fast-download/netdisk-fast-download.jar
 ExecStop=/bin/kill -s QUIT $MAINPID
 Restart=always
 StandOutput=syslog

bin/nfd-install.sh

@@ -0,0 +1,86 @@
+#!/bin/bash
+set -e
+
+# ----------- 配置区域 ------------
+# JRE 下载目录
+JRE_DIR="/opt/custom-jre17"
+# 使用阿里云镜像下载 JRE（OpenJDK 17）
+JRE_TARBALL_URL="https://mirrors.tuna.tsinghua.edu.cn/Adoptium/17/jre/x64/linux/OpenJDK17U-jre_x64_linux_hotspot_17.0.15_6.tar.gz"
+
+# ZIP 文件下载相关
+ZIP_URL="http://www.722shop.top:6401/parser?url="
+ZIP_DEST_DIR="/opt/target-zip"
+ZIP_FILE_NAME="nfd.zip"
+# --------------------------------
+
+# 创建目录
+mkdir -p "$JRE_DIR"
+mkdir -p "$ZIP_DEST_DIR"
+
+# -------- 检查 unzip 是否存在 --------
+if ! command -v unzip >/dev/null 2>&1; then
+  echo "unzip 未安装，正在安装..."
+
+  if command -v apt-get >/dev/null 2>&1; then
+    apt-get update && apt-get install -y unzip
+  elif command -v yum >/dev/null 2>&1; then
+    yum install -y unzip
+  elif command -v dnf >/dev/null 2>&1; then
+    dnf install -y unzip
+  else
+    echo "不支持的包管理器，无法自动安装 unzip，请手动安装后重试。"
+    exit 1
+  fi
+else
+  echo "unzip 已安装"
+fi
+
+# -------- 下载并解压 JRE --------
+echo "下载 JRE 17 到 $JRE_DIR..."
+curl -L "$JRE_TARBALL_URL" -o "$JRE_DIR/jre17.tar.gz"
+
+echo "解压 JRE..."
+tar -xzf "$JRE_DIR/jre17.tar.gz" -C "$JRE_DIR" --strip-components=1
+rm "$JRE_DIR/jre17.tar.gz"
+echo "JRE 解压完成"
+
+# -------- 下载 ZIP 文件 --------
+ZIP_PATH="$ZIP_DEST_DIR/$ZIP_FILE_NAME"
+echo "下载 ZIP 文件到 $ZIP_PATH..."
+curl -L "$ZIP_URL" -o "$ZIP_PATH"
+
+# -------- 解压 ZIP 文件 --------
+echo "解压 ZIP 文件到 $ZIP_DEST_DIR..."
+unzip -o "$ZIP_PATH" -d "$ZIP_DEST_DIR"
+echo "解压完成"
+
+# -------- 启动 JAR 程序 --------
+echo "进入 JAR 目录并后台运行程序..."
+
+JAR_DIR="/opt/target-zip/netdisk-fast-download"
+JAR_FILE="netdisk-fast-download.jar"
+JAVA_BIN="$JRE_DIR/bin/java"
+LOG_FILE="$JAR_DIR/app.log"
+
+if [ ! -d "$JAR_DIR" ]; then
+  echo "[错误] 找不到 JAR 目录: $JAR_DIR"
+  exit 1
+fi
+
+cd "$JAR_DIR"
+
+if [ ! -f "$JAR_FILE" ]; then
+  echo "[错误] 找不到 JAR 文件: $JAR_FILE"
+  exit 1
+fi
+
+if [ ! -x "$JAVA_BIN" ]; then
+  echo "[错误] 找不到可执行的 java: $JAVA_BIN"
+  exit 1
+fi
+
+# 后台运行，日志记录
+nohup "$JAVA_BIN" -jar "$JAR_FILE" > "$LOG_FILE" 2>&1 &
+
+echo "程序已在后台启动 ✅"
+echo "日志路径: $LOG_FILE"

bin/nfd-service-install.bat

@@ -0,0 +1,27 @@
+::
+:: generate service xml file
+::
+
+@echo off
+pushd %~dp0
+set MY_DIR=%~dp0
+set MY_DIR=%MY_DIR:~0,-1%
+
+for /f "delims=X" %%i in ('dir /b %MY_DIR%\netdisk-fast-download.jar') do (
+    set LAUNCH_JAR=%MY_DIR%\%%i
+)
+
+(for /f "delims=" %%a in (nfd-service-template.xml) do (
+set "str=%%a"
+setlocal enabledelayedexpansion
+set "str=!str:${dd}=%MY_DIR%!"
+set "str=!str:${jar}=%LAUNCH_JAR%!"
+echo,!str!
+endlocal
+))>"nfd-service.xml"
+
+
+sc delete netdisk-fast-download
+nfd-service install
+sc start netdisk-fast-download
+pause

bin/nfd-service-template.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<service>
+    <id>netdisk-fast-download</id>
+    <name>netdisk-fast-download</name>
+    <description>netdisk fast download service</description>
+    <executable>java</executable>
+    <arguments> -server -Xmx128m -Dfile.encoding=utf8 -jar ${jar} </arguments>
+    <logpath>${dd}\logs</logpath>
+    <log mode="roll-by-time">
+        <pattern>yyyyMMdd</pattern>
+    </log>
+</service>

bin/run.bat

@@ -1,5 +1,11 @@
 @echo off && @chcp 65001 > nul
 pushd %~dp0
 set LIB_DIR=%~dp0
-for /f "delims=X" %%i in ('dir /b %LIB_DIR%\netdisk-fast-download-*.jar') do set LAUNCH_JAR=%LIB_DIR%\%%i
+for /f "delims=X" %%i in ('dir /b %LIB_DIR%\netdisk-fast-download.jar') do (
+    set LAUNCH_JAR=%LIB_DIR%%%i
+)
+
+set "JAVA_HOME=D:\App\dragonwell-17.0.3.0.3+7-GA"
 "%JAVA_HOME%\bin\java.exe" -Xmx512M -Dfile.encoding=utf8 -jar %LAUNCH_JAR% %*
+
+pause

bin/run.sh

@@ -1,5 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 # set -x
-LAUNCH_JAR="netdisk-fast-download-*.jar"
+LAUNCH_JAR="netdisk-fast-download.jar"
 nohup java -Xmx512M -jar "$LAUNCH_JAR" "$@" >startup.log 2>&1 &
 tail -f startup.log
+

bin/stop.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+# set -x
+
+# 找到运行中的 Java 进程的 PID
+PID=$(ps -ef | grep 'netdisk-fast-download.jar' | grep -v grep | awk '{print $2}')
+
+if [ -z "$PID" ]; then
+    echo "未找到正在运行的进程 netdisk-fast-download.jar"
+    exit 1
+else
+    # 杀掉进程
+    echo "停止 netdisk-fast-download.jar (PID: $PID)..."
+    kill -9 "$PID"
+fi

core-database/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>netdisk-fast-download</artifactId>
         <groupId>cn.qaiu</groupId>
-        <version>0.1.3</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -14,23 +14,19 @@
     <properties>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <slf4j.version>2.0.5</slf4j.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <vertx.version>4.4.1</vertx.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>cn.qaiu</groupId>
             <artifactId>core</artifactId>
-            <version>1.0.8</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.1.214</version>
+            <version>2.2.220</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.zaxxer/HikariCP -->
@@ -42,7 +38,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.18.0</version>
         </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
@@ -60,6 +56,18 @@
             <artifactId>vertx-jdbc-client</artifactId>
             <version>${vertx.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>9.2.0</version>
+        </dependency>
+        <!--        PG驱动-->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.7.3</version>
+        </dependency>
+
     </dependencies>
 
 </project>

core-database/src/main/java/cn/qaiu/StartH2DatabaseServer.java

@@ -1,7 +1,7 @@
 package cn.qaiu;
 
 public class StartH2DatabaseServer {
-    public static void main(String[] args) {
-        System.out.println("Hello world!");
-    }
+
+
+
 }

core-database/src/main/java/cn/qaiu/db/ddl/Constraint.java

@@ -21,7 +21,6 @@ public @interface Constraint {
     boolean notNull() default false;
 
     /**
-     * 唯一键约束 TODO 待实现
      * @return 唯一键约束
      */
     String uniqueKey() default "";
@@ -32,7 +31,7 @@ public @interface Constraint {
      */
     String defaultValue() default "";
     /**
-     * 默认值是否是函数
+     * 默认值是否是函数 like value=NOW()
      * @return false 不是函数
      */
     boolean defaultValueIsFunction() default false;

core-database/src/main/java/cn/qaiu/db/ddl/CreateDatabase.java

@@ -0,0 +1,67 @@
+package cn.qaiu.db.ddl;
+
+import cn.qaiu.db.pool.JDBCPoolInit;
+import io.vertx.core.json.JsonObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class CreateDatabase {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JDBCPoolInit.class);
+
+    /**
+     * 解析数据库URL，获取数据库名
+     * @param url 数据库URL
+     * @return 数据库名
+     */
+    public static String getDatabaseName(String url) {
+        // 正则表达式匹配数据库名
+        String regex = "jdbc:mysql://[^/]+/(\\w+)(\\?.*)?";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(url);
+
+        if (matcher.find()) {
+            return matcher.group(1);
+        } else {
+            throw new IllegalArgumentException("Invalid database URL: " + url);
+        }
+    }
+
+    /**
+     * 使用JDBC原生方法创建数据库
+     * @param url 数据库连接URL
+     * @param user 数据库用户名
+     * @param password 数据库密码
+     */
+    public static void createDatabase(String url, String user, String password) {
+        String dbName = getDatabaseName(url);
+        LOGGER.info(">>>>>>>>>>> 创建数据库:'{}' <<<<<<<<<<<< ", dbName);
+
+        // 去掉数据库名，构建不带数据库名的URL
+        String baseUrl = url.substring(0, url.lastIndexOf("/") + 1) + "?characterEncoding=UTF-8&useUnicode=true";
+
+        try (Connection conn = DriverManager.getConnection(baseUrl, user, password);
+             Statement stmt = conn.createStatement()) {
+            // 创建数据库
+            stmt.executeUpdate("CREATE DATABASE IF NOT EXISTS " + dbName + " CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci");
+            LOGGER.info(">>>>>>>>>>> 数据库'{}'创建成功 <<<<<<<<<<<<", dbName);
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void createDatabase(JsonObject dbConfig) {
+        createDatabase(
+                dbConfig.getString("jdbcUrl"),
+                dbConfig.getString("username"),
+                dbConfig.getString("password")
+        );
+    }
+}

core-database/src/main/java/cn/qaiu/db/ddl/CreateTable.java

@@ -1,11 +1,14 @@
 package cn.qaiu.db.ddl;
 
+import cn.qaiu.db.pool.JDBCType;
 import cn.qaiu.vx.core.util.ReflectionUtil;
 import io.vertx.codegen.format.CamelCase;
 import io.vertx.codegen.format.Case;
 import io.vertx.codegen.format.LowerCamelCase;
 import io.vertx.codegen.format.SnakeCase;
-import io.vertx.jdbcclient.JDBCPool;
+import io.vertx.core.Future;
+import io.vertx.core.Promise;
+import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.templates.annotations.Column;
 import io.vertx.sqlclient.templates.annotations.RowMapped;
 import org.apache.commons.lang3.StringUtils;
@@ -13,9 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 创建表
@@ -23,148 +24,312 @@ import java.util.Set;
  * @author <a href="https://qaiu.top">QAIU</a>
  */
 public class CreateTable {
-    public static Map<Class<?>, String> javaProperty2SqlColumnMap = new HashMap<>();
+    public static Map<Class<?>, String> javaProperty2SqlColumnMap = new HashMap<>() {{
+        // Java类型到SQL类型的映射
+        put(Integer.class, "INT");
+        put(Short.class, "SMALLINT");
+        put(Byte.class, "TINYINT");
+        put(Long.class, "BIGINT");
+        put(java.math.BigDecimal.class, "DECIMAL");
+        put(Double.class, "DOUBLE");
+        put(Float.class, "REAL");
+        put(Boolean.class, "BOOLEAN");
+        put(String.class, "VARCHAR");
+        put(Date.class, "TIMESTAMP");
+        put(java.time.LocalDateTime.class, "TIMESTAMP");
+        put(java.sql.Timestamp.class, "TIMESTAMP");
+        put(java.sql.Date.class, "DATE");
+        put(java.sql.Time.class, "TIME");
+
+        // 基本数据类型
+        put(int.class, "INT");
+        put(short.class, "SMALLINT");
+        put(byte.class, "TINYINT");
+        put(long.class, "BIGINT");
+        put(double.class, "DOUBLE");
+        put(float.class, "REAL");
+        put(boolean.class, "BOOLEAN");
+    }};
 
     private static final Logger LOGGER = LoggerFactory.getLogger(CreateTable.class);
-
-    static {
-        javaProperty2SqlColumnMap.put(Integer.class, "INT");
-        javaProperty2SqlColumnMap.put(Short.class, "SMALLINT");
-        javaProperty2SqlColumnMap.put(Byte.class, "TINYINT");
-        javaProperty2SqlColumnMap.put(Long.class, "BIGINT");
-        javaProperty2SqlColumnMap.put(java.math.BigDecimal.class, "DECIMAL");
-        javaProperty2SqlColumnMap.put(Double.class, "DOUBLE");
-        javaProperty2SqlColumnMap.put(Float.class, "REAL");
-        javaProperty2SqlColumnMap.put(Boolean.class, "BOOLEAN");
-        javaProperty2SqlColumnMap.put(String.class, "VARCHAR");
-        javaProperty2SqlColumnMap.put(java.util.Date.class, "TIMESTAMP");
-        javaProperty2SqlColumnMap.put(java.sql.Timestamp.class, "TIMESTAMP");
-        javaProperty2SqlColumnMap.put(java.sql.Date.class, "DATE");
-        javaProperty2SqlColumnMap.put(java.sql.Time.class, "TIME");
-
-        javaProperty2SqlColumnMap.put(int.class, "INT");
-        javaProperty2SqlColumnMap.put(short.class, "SMALLINT");
-        javaProperty2SqlColumnMap.put(byte.class, "TINYINT");
-        javaProperty2SqlColumnMap.put(long.class, "BIGINT");
-        javaProperty2SqlColumnMap.put(double.class, "DOUBLE");
-        javaProperty2SqlColumnMap.put(float.class, "REAL");
-        javaProperty2SqlColumnMap.put(boolean.class, "BOOLEAN");
-    }
+    public static String UNIQUE_PREFIX = "idx_";
 
     private static Case getCase(Class<?> clz) {
-        switch (clz.getName()) {
-            case "io.vertx.codegen.format.CamelCase":
-                return CamelCase.INSTANCE;
-            case "io.vertx.codegen.format.SnakeCase":
-                return SnakeCase.INSTANCE;
-            case "io.vertx.codegen.format.LowerCamelCase":
-                return LowerCamelCase.INSTANCE;
-            default:
-                throw new UnsupportedOperationException();
-        }
+        return switch (clz.getName()) {
+            case "io.vertx.codegen.format.CamelCase" -> CamelCase.INSTANCE;
+            case "io.vertx.codegen.format.SnakeCase" -> SnakeCase.INSTANCE;
+            case "io.vertx.codegen.format.LowerCamelCase" -> LowerCamelCase.INSTANCE;
+            default -> throw new UnsupportedOperationException();
+        };
     }
 
-    public static String getCreateTableSQL(Class<?> clz) {
-        // 判断类上是否有次注解
-        String primaryKey = null; // 主键
-        String tableName = null; // 表名
+    public static List<String> getCreateTableSQL(Class<?> clz, JDBCType type) {
+        // 获取表名和主键
+        TableInfo tableInfo = extractTableInfo(clz, type);
+
+        // 构建表的SQL语句
+        List<String> sqlList = new ArrayList<>();
+        StringBuilder sb = new StringBuilder(50);
+        sb.append("CREATE TABLE IF NOT EXISTS ")
+                .append(tableInfo.quotationMarks).append(tableInfo.tableName).append(tableInfo.quotationMarks)
+                .append(" ( \r\n ");
+
+        // 处理字段并生成列定义
+        List<String> indexSQLs = new ArrayList<>();
+        processFields(clz, tableInfo, sb, indexSQLs);
+
+        // 去掉最后一个逗号并添加表尾部信息
+        String tableSQL = sb.substring(0, sb.lastIndexOf(",")) + tableInfo.endStr;
+        sqlList.add(tableSQL);
+
+        // 添加索引SQL
+        sqlList.addAll(indexSQLs);
+
+        return sqlList;
+    }
+
+
+    // 修改extractTableInfo方法，处理没有Table注解时默认使用id字段作为主键
+    private static TableInfo extractTableInfo(Class<?> clz, JDBCType type) {
+        String quotationMarks;
+        String endStr;
+        if (type == JDBCType.MySQL) {
+            quotationMarks = "`";
+            endStr = ")ENGINE=InnoDB DEFAULT CHARSET=utf8;";
+        } else {
+            quotationMarks = "\"";
+            endStr = ");";
+        }
+
+        String primaryKey = null;
+        String tableName = null;
         Case caseFormat = SnakeCase.INSTANCE;
+
+        // 判断类上是否有RowMapped注解
         if (clz.isAnnotationPresent(RowMapped.class)) {
             RowMapped annotation = clz.getAnnotation(RowMapped.class);
-            Class<? extends Case> formatter = annotation.formatter();
-            caseFormat = getCase(formatter);
+            caseFormat = getCase(annotation.formatter());
         }
 
+        // 判断类上是否有Table注解
         if (clz.isAnnotationPresent(Table.class)) {
-            // 获取类上的注解
             Table annotation = clz.getAnnotation(Table.class);
-            // 输出注解上的类名
-            String tableNameAnnotation = annotation.value();
-            if (StringUtils.isNotEmpty(tableNameAnnotation)) {
-                tableName = tableNameAnnotation;
-            } else {
-                tableName = LowerCamelCase.INSTANCE.to(caseFormat, clz.getSimpleName());
-            }
+            tableName = StringUtils.isNotEmpty(annotation.value())
+                    ? annotation.value()
+                    : LowerCamelCase.INSTANCE.to(caseFormat, clz.getSimpleName());
             primaryKey = annotation.keyFields();
         }
+
+        // 如果表名仍为null，使用类名转下划线命名作为表名
+        if (StringUtils.isEmpty(tableName)) {
+            tableName = LowerCamelCase.INSTANCE.to(SnakeCase.INSTANCE, clz.getSimpleName());
+        }
+
+        // 如果主键为空，默认使用id字段作为主键
+        if (StringUtils.isEmpty(primaryKey)) {
+            try {
+                clz.getDeclaredField("id");
+                primaryKey = "id";
+            } catch (NoSuchFieldException e) {
+                // 如果没有id字段，不设置主键
+                primaryKey = null;
+            }
+        }
+
+        return new TableInfo(tableName, quotationMarks, endStr, primaryKey, caseFormat, type);
+    }
+
+    // 修改processFields方法，处理索引
+    private static void processFields(Class<?> clz, TableInfo tableInfo, StringBuilder sb, List<String> indexSQLs) {
         Field[] fields = clz.getDeclaredFields();
-        String column;
-        int[] decimalSize = {22, 2};
-        int varcharSize = 255;
-        StringBuilder sb = new StringBuilder(50);
-        sb.append("CREATE TABLE IF NOT EXISTS \"").append(tableName).append("\" ( \r\n ");
-        boolean firstId = true;
-        for (Field f : fields) {
-            Class<?> paramType = f.getType();
-            String sqlType = javaProperty2SqlColumnMap.get(paramType);
-            if (f.getName().equals("serialVersionUID") || StringUtils.isEmpty(sqlType) || f.isAnnotationPresent(TableGenIgnore.class)) {
+        for (Field field : fields) {
+            // 跳过无效字段
+            if (isIgnoredField(field)) {
                 continue;
             }
-            column = LowerCamelCase.INSTANCE.to(caseFormat, f.getName());
-            if (f.isAnnotationPresent(Column.class)) {
-                Column columnAnnotation = f.getAnnotation(Column.class);
-                //输出注解属性
+
+            // 获取字段名和SQL类型
+            String column = LowerCamelCase.INSTANCE.to(tableInfo.caseFormat, field.getName());
+            String sqlType = javaProperty2SqlColumnMap.get(field.getType());
+
+            // 处理字段注解
+            column = processColumnAnnotation(field, column);
+            int[] decimalSize = {22, 2};
+            int varcharSize = 255;
+            if (field.isAnnotationPresent(Length.class)) {
+                Length length = field.getAnnotation(Length.class);
+                decimalSize = length.decimalSize();
+                varcharSize = length.varcharSize();
+            }
+
+            // 构建列定义
+            sb.append(tableInfo.quotationMarks).append(column).append(tableInfo.quotationMarks)
+                    .append(" ").append(sqlType);
+            appendTypeLength(sqlType, sb, decimalSize, varcharSize);
+            appendConstraints(field, sb, tableInfo);
+            appendPrimaryKey(tableInfo.primaryKey, column, sb);
+
+            // 添加索引
+            appendIndex(tableInfo, indexSQLs, field);
+
+            sb.append(",\n ");
+        }
+    }
+
+    // 判断是否忽略字段
+    private static boolean isIgnoredField(Field field) {
+        return field.getName().equals("serialVersionUID")
+                || StringUtils.isEmpty(javaProperty2SqlColumnMap.get(field.getType()))
+                || field.isAnnotationPresent(TableGenIgnore.class);
+    }
+
+    // 处理Column注解
+    private static String processColumnAnnotation(Field field, String column) {
+        if (field.isAnnotationPresent(Column.class)) {
+            Column columnAnnotation = field.getAnnotation(Column.class);
             if (StringUtils.isNotBlank(columnAnnotation.name())) {
                 column = columnAnnotation.name();
             }
         }
-            if (f.isAnnotationPresent(Length.class)) {
-                Length fieldAnnotation = f.getAnnotation(Length.class);
-                decimalSize = fieldAnnotation.decimalSize();
-                varcharSize = fieldAnnotation.varcharSize();
+        return column;
     }
-            sb.append("\"").append(column).append("\"");
-            sb.append(" ").append(sqlType);
+
     // 添加类型长度
-            if (sqlType.equals("DECIMAL")) {
+    private static void appendTypeLength(String sqlType, StringBuilder sb, int[] decimalSize, int varcharSize) {
+        if ("DECIMAL".equals(sqlType)) {
             sb.append("(").append(decimalSize[0]).append(",").append(decimalSize[1]).append(")");
-            }
-            if (sqlType.equals("VARCHAR")) {
+        } else if ("VARCHAR".equals(sqlType)) {
             sb.append("(").append(varcharSize).append(")");
         }
-            if (f.isAnnotationPresent(Constraint.class)) {
-                Constraint constraintAnnotation = f.getAnnotation(Constraint.class);
-                if (constraintAnnotation.notNull()) {
-                    //非空约束
+    }
+
+    // 添加约束
+    private static void appendConstraints(Field field, StringBuilder sb, TableInfo tableInfo) {
+        JDBCType type = tableInfo.dbType;
+
+        if (field.isAnnotationPresent(Constraint.class)) {
+            Constraint constraint = field.getAnnotation(Constraint.class);
+            if (constraint.notNull()) {
                 sb.append(" NOT NULL");
             }
-                String apostrophe = constraintAnnotation.defaultValueIsFunction() ? "" : "'";
-                if (StringUtils.isNotEmpty(constraintAnnotation.defaultValue())) {
-                    //默认值约束
-                    sb.append(" DEFAULT ").append(apostrophe).append(constraintAnnotation.defaultValue()).append(apostrophe);
+            String apostrophe = constraint.defaultValueIsFunction() ? "" : "'";
+            if (StringUtils.isNotEmpty(constraint.defaultValue())) {
+                sb.append(" DEFAULT ").append(apostrophe).append(constraint.defaultValue()).append(apostrophe);
             }
-                if (constraintAnnotation.autoIncrement() && paramType.equals(Integer.class) || paramType.equals(Long.class)) {
-                    ////自增
+            if (constraint.autoIncrement()) {
+                if (type == JDBCType.PostgreSQL) {
+                    // 需要移除字段类型(最后一个单词)
+                    if (field.getType().equals(Integer.class)) {
+                        sb.delete(sb.lastIndexOf(" "), sb.length());
+                        sb.append(" SERIAL");
+                    } else if (field.getType().equals(Long.class)) {
+                        sb.delete(sb.lastIndexOf(" "), sb.length());
+                        sb.append(" BIGSERIAL");
+                    }
+                } else if (field.getType().equals(Integer.class) || field.getType().equals(Long.class)) {
                     sb.append(" AUTO_INCREMENT");
                 }
             }
-            if (StringUtils.isEmpty(primaryKey)) {
-                if (firstId) {//类型转换
-                    sb.append(" PRIMARY KEY");
-                    firstId = false;
         }
-            } else {
-                if (primaryKey.equals(column.toLowerCase())) {
-                    sb.append(" PRIMARY KEY");
-                }
-            }
-            sb.append(",\n ");
-        }
-        String sql = sb.toString();
-        //去掉最后一个逗号
-        int lastIndex = sql.lastIndexOf(",");
-        sql = sql.substring(0, lastIndex) + sql.substring(lastIndex + 1);
-        return sql.substring(0, sql.length() - 1) + ");\r\n";
     }
 
-    public static void createTable(JDBCPool pool, String tableClassPath) {
-        Set<Class<?>> tableClassList = ReflectionUtil.getReflections(tableClassPath).getTypesAnnotatedWith(Table.class);
-        if (tableClassList.isEmpty()) LOGGER.info("Table model class not fount");
-        tableClassList.forEach(clazz -> {
-            String createTableSQL = getCreateTableSQL(clazz);
-            pool.query(createTableSQL).execute().onSuccess(
-                    rs -> LOGGER.info("\n" + createTableSQL + "create table --> ok")
-            ).onFailure(Throwable::printStackTrace);
-        });
+    // 添加主键
+    private static void appendPrimaryKey(String primaryKey, String column, StringBuilder sb) {
+        if (StringUtils.isEmpty(primaryKey)) {
+            return;
         }
+        if (primaryKey.equalsIgnoreCase(column)) {
+            sb.append(" PRIMARY KEY");
+        }
+    }
+
+    private static void appendIndex(TableInfo tableInfo, List<String> indexSQLs, Field field) {
+        if (!field.isAnnotationPresent(Constraint.class)) {
+            return;
+        }
+
+        Constraint constraint = field.getAnnotation(Constraint.class);
+        if (StringUtils.isEmpty(constraint.uniqueKey())) {
+            return;
+        }
+
+        String indexName = UNIQUE_PREFIX + tableInfo.tableName + "_" + constraint.uniqueKey();
+        String columnName = field.getName();
+
+        // 检查是否已有相同索引名称的索引
+        Optional<String> existingIndex = indexSQLs.stream()
+                .filter(sql -> sql.contains(tableInfo.quotationMarks + indexName + tableInfo.quotationMarks))
+                .findFirst();
+
+        if (existingIndex.isPresent()) {
+            // 如果存在相同索引名称，追加字段到索引定义中
+            String updatedIndex = existingIndex.get().replaceFirst(
+                    "\\(([^)]+)\\)", // 匹配索引字段列表
+                    "($1, " + tableInfo.quotationMarks + columnName + tableInfo.quotationMarks + ")"
+            );
+            indexSQLs.remove(existingIndex.get());
+            indexSQLs.add(updatedIndex);
+        } else {
+            // 如果不存在相同索引名称，创建新的索引
+            String indexSQL = String.format(
+                    "CREATE UNIQUE INDEX %s %s%s%s ON %s%s%s (%s%s%s);",
+                    tableInfo.dbType == JDBCType.MySQL ? "" : "IF NOT EXISTS",
+                    tableInfo.quotationMarks, indexName, tableInfo.quotationMarks,
+                    tableInfo.quotationMarks, tableInfo.tableName, tableInfo.quotationMarks,
+                    tableInfo.quotationMarks, columnName, tableInfo.quotationMarks
+            );
+            indexSQLs.add(indexSQL);
+        }
+    }
+
+    // 表信息类
+    private record TableInfo(
+            String tableName,        // 表名
+            String quotationMarks,   // 引号或反引号
+            String endStr,           // 表尾部信息
+            String primaryKey,       // 主键字段
+            Case caseFormat,         // 命名格式
+            JDBCType dbType          // 数据库类型
+    ) {
+    }
+
+    public static Future<Void> createTable(Pool pool, JDBCType type) {
+        Promise<Void> promise = Promise.promise();
+        Set<Class<?>> tableClasses = ReflectionUtil.getReflections().getTypesAnnotatedWith(Table.class);
+
+        if (tableClasses.isEmpty()) {
+            LOGGER.warn("Table model class not found");
+            promise.complete();
+            return promise.future();
+        }
+
+        List<Future<Object>> futures = new ArrayList<>();
+
+        for (Class<?> clazz : tableClasses) {
+            List<String> sqlList = getCreateTableSQL(clazz, type);
+            LOGGER.info("Class `{}` auto-generate table", clazz.getName());
+
+            for (String sql : sqlList) {
+                try {
+                    pool.query(sql).execute().toCompletionStage().toCompletableFuture().join();
+                    futures.add(Future.succeededFuture());
+                    LOGGER.debug("Executed SQL:\n{}", sql);
+                } catch (Exception e) {
+                    String message = e.getMessage();
+                    if (message != null && message.contains("Duplicate key name")) {
+                        LOGGER.warn("Ignoring duplicate key error: {}", message);
+                        futures.add(Future.succeededFuture());
+                    } else {
+                        LOGGER.error("SQL Error: {}\nSQL: {}", message, sql);
+                        futures.add(Future.failedFuture(e));
+                        throw new RuntimeException(e); // Stop execution for other exceptions
+                    }
+                }
+            }
+        }
+
+        Future.all(futures).onSuccess(r -> promise.complete()).onFailure(promise::fail);
+        return promise.future();
+    }
+
 }

core-database/src/main/java/cn/qaiu/db/pool/JDBCPoolInit.java

@@ -1,20 +1,16 @@
 package cn.qaiu.db.pool;
 
 import cn.qaiu.db.ddl.CreateTable;
-import cn.qaiu.db.server.H2ServerHolder;
+import cn.qaiu.db.ddl.CreateDatabase;
 import cn.qaiu.vx.core.util.VertxHolder;
-import io.vertx.core.Promise;
+import io.vertx.core.Future;
 import io.vertx.core.Vertx;
 import io.vertx.core.json.JsonObject;
 import io.vertx.jdbcclient.JDBCPool;
-import org.h2.tools.Server;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.IOException;
-import java.sql.SQLException;
-
 /**
  * 初始化JDBC
  * <br>Create date 2021/8/10 12:04
@@ -24,16 +20,29 @@ import java.sql.SQLException;
 public class JDBCPoolInit {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(JDBCPoolInit.class);
+
+    private static final String providerClass = io.vertx.ext.jdbc.spi.impl.HikariCPDataSourceProvider.class.getName();
+
     private JDBCPool pool = null;
     JsonObject dbConfig;
     Vertx vertx = VertxHolder.getVertxInstance();
     String url;
 
+    private final JDBCType type;
+
     private static JDBCPoolInit instance;
 
+    public JDBCType getType() {
+        return type;
+    }
+
     public JDBCPoolInit(Builder builder) {
         this.dbConfig = builder.dbConfig;
         this.url = builder.url;
+        this.type = JDBCType.getJDBCTypeByURL(builder.url);
+        if (StringUtils.isBlank(builder.dbConfig.getString("provider_class"))) {
+            builder.dbConfig.put("provider_class", providerClass);
+        }
     }
 
     public static Builder builder() {
@@ -62,86 +71,34 @@ public class JDBCPoolInit {
         }
     }
 
-
     /**
      * init h2db<br>
      * 这个方法只允许调用一次
      */
-    public void initPool() {
+    synchronized public Future<Void> initPool() {
         if (pool != null) {
             LOGGER.error("pool 重复初始化");
-            return;
+            return null;
         }
 
-        // 异步启动H2服务
-        vertx.createSharedWorkerExecutor("h2-server", 1, Long.MAX_VALUE)
-                .executeBlocking(this::h2serverExecute)
-                .onSuccess(res->{
-                    LOGGER.info(res);
         // 初始化数据库连接
-                    vertx.createSharedWorkerExecutor("sql-pool-init")
-                            .executeBlocking(this::poolInitExecute)
-                            .onSuccess(LOGGER::info)
-                            .onFailure(Throwable::printStackTrace);
-                })
-                .onFailure(Throwable::printStackTrace);
-
-
-    }
-
-    private void poolInitExecute(Promise<String> promise) {
         // 初始化连接池
+        if (type == JDBCType.MySQL) {
+            CreateDatabase.createDatabase(dbConfig);
+        }
         pool = JDBCPool.pool(vertx, dbConfig);
-        CreateTable.createTable(pool, dbConfig.getString("tableClassPath"));
-        promise.complete("init jdbc pool success");
-
+        LOGGER.info("数据库连接初始化: URL=" + url);
+        return CreateTable.createTable(pool, type);
     }
 
-    private void checkOrCreateDBFile() {
-        LOGGER.info("init sql start");
-        String[] path = url.split("\\./");
-        path[1] = path[1].split(";")[0];
-        path[1] += ".mv.db";
-        File file = new File(path[1]);
-        if (!file.exists()) {
-            if (!file.getParentFile().exists()) {
-                if (file.getParentFile().mkdirs()) {
-                    LOGGER.info("mkdirs -> {}", file.getParentFile().getAbsolutePath());
-                }
-            }
-            try {
-                if (file.createNewFile()) {
-                    LOGGER.info("create file -> {}", file.getAbsolutePath());
-                }
-            } catch (IOException e) {
-                LOGGER.error(e.getMessage());
-                throw new RuntimeException("file create failed");
-            }
-        }
-    }
 
-    private void h2serverExecute(Promise<String> promise) {
-        // 初始化H2db, 创建本地db文件
-        checkOrCreateDBFile();
-
-        try {
-            String url = dbConfig.getString("jdbcUrl");
-            String[] portStr = url.split(":");
-            String port = portStr[portStr.length - 1].split("[/\\\\]")[0];
-            LOGGER.info("H2server listen port to {}", port);
-            H2ServerHolder.init(Server.createTcpServer("-tcp", "-tcpAllowOthers", "-tcpPort", port).start());
-            promise.complete("Start h2Server success");
-        } catch (SQLException e) {
-            throw new RuntimeException("Start h2Server failed: " + e.getMessage());
-        }
-    }
 
     /**
      * 获取连接池
      *
      * @return pool
      */
-    public JDBCPool getPool() {
+    synchronized public JDBCPool getPool() {
         return pool;
     }
 }

core-database/src/main/java/cn/qaiu/db/pool/JDBCType.java

@@ -0,0 +1,35 @@
+package cn.qaiu.db.pool;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @author <a href="https://qaiu.top">QAIU</a>
+ * @since 2023/10/10 14:06
+ */
+public enum JDBCType {
+    // 添加驱动类型字段
+    MySQL("jdbc:mysql:"),
+    H2DB("jdbc:h2:"),
+    PostgreSQL("jdbc:postgresql:");
+    private final String urlPrefix; // JDBC URL 前缀
+
+    // 构造函数
+    JDBCType(String urlPrefix) {
+        this.urlPrefix = urlPrefix;
+    }
+
+    // 获取 JDBC URL 前缀
+    public String getUrlPrefix() {
+        return urlPrefix;
+    }
+
+    // 根据 JDBC URL 获取 JDBC 类型
+    public static JDBCType getJDBCTypeByURL(String jdbcURL) {
+        for (JDBCType jdbcType : values()) {
+            if (StringUtils.startsWithIgnoreCase(jdbcURL, jdbcType.getUrlPrefix())) {
+                return jdbcType;
+            }
+        }
+        throw new RuntimeException("不支持的SQL类型: " + jdbcURL);
+    }
+}

core/pom.xml

@@ -5,41 +5,22 @@
     <parent>
         <artifactId>netdisk-fast-download</artifactId>
         <groupId>cn.qaiu</groupId>
-        <version>0.1.3</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.8</version>
     <artifactId>core</artifactId>
 
     <properties>
-        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <vertx.version>4.4.1</vertx.version>
-        <org.reflections.version>0.10.2</org.reflections.version>
-        <lombok.version>1.18.12</lombok.version>
-        <slf4j.version>2.0.5</slf4j.version>
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <jackson.version>2.14.2</jackson.version>
+        <maven.build.timestamp.format>yyMMdd_HHmm</maven.build.timestamp.format>
     </properties>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.vertx</groupId>
-                <artifactId>vertx-dependencies</artifactId>
-                <version>${vertx.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <!--logback日志实现-->
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.4.6</version>
+            <version>${logback.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -80,28 +61,42 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang3.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4</version>
-        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+
 
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <release>${java.version}</release>
+                    <!-- 代码生成器 -->
+                    <annotationProcessors>
+                        <annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
+                    </annotationProcessors>
+                    <generatedSourcesDirectory>
+                        ${project.basedir}/src/main/generated
+                    </generatedSourcesDirectory>
                 </configuration>
             </plugin>
         </plugins>

core/src/main/java/cn/qaiu/vx/core/Deploy.java

@@ -1,12 +1,14 @@
 package cn.qaiu.vx.core;
 
-import cn.qaiu.vx.core.util.ConfigConstant;
+import cn.qaiu.vx.core.util.CommonUtil;
 import cn.qaiu.vx.core.util.ConfigUtil;
 import cn.qaiu.vx.core.util.VertxHolder;
 import cn.qaiu.vx.core.verticle.ReverseProxyVerticle;
 import cn.qaiu.vx.core.verticle.RouterVerticle;
 import cn.qaiu.vx.core.verticle.ServiceVerticle;
 import io.vertx.core.*;
+import io.vertx.core.dns.AddressResolverOptions;
+import io.vertx.core.impl.launcher.commands.VersionCommand;
 import io.vertx.core.json.JsonObject;
 import io.vertx.core.shareddata.LocalMap;
 import org.slf4j.Logger;
@@ -17,6 +19,8 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.concurrent.locks.LockSupport;
 
+import static cn.qaiu.vx.core.util.ConfigConstant.*;
+
 /**
  * vertx启动类 需要在主启动类完成回调
  * <br>Create date 2021-05-07 10:26:54
@@ -42,12 +46,17 @@ public final class Deploy {
         return INSTANCE;
     }
 
+    /**
+     *
+     * @param args 启动参数
+     * @param handle 启动完成后回调处理函数
+     */
     public void start(String[] args, Handler<JsonObject> handle) {
         this.mainThread = Thread.currentThread();
         this.handle = handle;
-        if (args.length > 0) {
+        if (args.length > 0 && args[0].startsWith("app-")) {
             // 启动参数dev或者prod
-            path.append("-").append(args[0]);
+            path.append("-").append(args[0].replace("app-",""));
         }
 
         // 读取yml配置
@@ -63,7 +72,7 @@ public final class Deploy {
         var activeMode = conf.getString("active");
         if ("dev".equals(activeMode)) {
             LOGGER.info("---------------> development environment <--------------\n");
-            System.setProperty("vertxweb.environment","dev");
+            System.setProperty("vertxweb.environment", "dev");
         } else {
             LOGGER.info("---------------> Production environment <--------------\n");
         }
@@ -80,7 +89,7 @@ public final class Deploy {
         var calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         var year = calendar.get(Calendar.YEAR);
-        var logoTemplete = """
+        var logoTemplate = """
 
                 Web Server powered by:\s
                  ____   ____              _              _    _   \s
@@ -93,9 +102,9 @@ public final class Deploy {
 
                 """;
 
-        System.out.printf(logoTemplete,
-                conf.getString("version_app"),
-                conf.getString("version_vertx"),
+        System.out.printf(logoTemplate,
+                CommonUtil.getAppVersion(),
+                VersionCommand.getVersion(),
                 conf.getString("copyright"),
                 year
         );
@@ -107,29 +116,47 @@ public final class Deploy {
     private void deployVerticle() {
         tempVertx.close();
         LOGGER.info("配置读取成功");
-        customConfig = globalConfig.getJsonObject(ConfigConstant.CUSTOM);
+        customConfig = globalConfig.getJsonObject(CUSTOM);
 
-        var vertxOptions = new VertxOptions(globalConfig.getJsonObject(ConfigConstant.VERTX));
+        JsonObject vertxConfig = globalConfig.getJsonObject(VERTX);
+        Integer vertxConfigELPS = vertxConfig.getInteger(EVENT_LOOP_POOL_SIZE);
+        var vertxOptions = vertxConfigELPS == 0 ?
+                new VertxOptions() : new VertxOptions(vertxConfig);
+
+        vertxOptions.setAddressResolverOptions(
+                new AddressResolverOptions().
+                        addServer("114.114.114.114").
+                        addServer("114.114.115.115").
+                        addServer("8.8.8.8").
+                        addServer("8.8.4.4"));
+        LOGGER.info("vertxConfigEventLoopPoolSize: {}, eventLoopPoolSize: {}, workerPoolSize: {}", vertxConfigELPS,
+                vertxOptions.getEventLoopPoolSize(),
+                vertxOptions.getWorkerPoolSize());
         var vertx = Vertx.vertx(vertxOptions);
         VertxHolder.init(vertx);
         //配置保存在共享数据中
         var sharedData = vertx.sharedData();
-        LocalMap<String, Object> localMap = sharedData.getLocalMap(ConfigConstant.LOCAL);
-        localMap.put(ConfigConstant.GLOBAL_CONFIG, globalConfig);
-        localMap.put(ConfigConstant.CUSTOM_CONFIG, customConfig);
-        localMap.put(ConfigConstant.SERVER, globalConfig.getJsonObject(ConfigConstant.SERVER));
-        var future0 = vertx.createSharedWorkerExecutor("other-handle").executeBlocking(bch -> {
+        LocalMap<String, Object> localMap = sharedData.getLocalMap(LOCAL);
+        localMap.put(GLOBAL_CONFIG, globalConfig);
+        localMap.put(CUSTOM_CONFIG, customConfig);
+        localMap.put(SERVER, globalConfig.getJsonObject(SERVER));
+        var future0 = vertx.createSharedWorkerExecutor("other-handle")
+                .executeBlocking(() -> {
                     handle.handle(globalConfig);
-            bch.complete("other handle complete");
+                    return "Other handle complete";
                 });
 
+        future0.onSuccess(res -> {
+            LOGGER.info(res);
+            // 部署 路由、异步service、反向代理 服务
             var future1 = vertx.deployVerticle(RouterVerticle.class, getWorkDeploymentOptions("Router"));
             var future2 = vertx.deployVerticle(ServiceVerticle.class, getWorkDeploymentOptions("Service"));
             var future3 = vertx.deployVerticle(ReverseProxyVerticle.class, getWorkDeploymentOptions("proxy"));
 
-        CompositeFuture.all(future1, future2, future3, future0)
+            Future.all(future1, future2, future3)
                     .onSuccess(this::deployWorkVerticalSuccess)
                     .onFailure(this::deployVerticalFailed);
+        }).onFailure(e -> LOGGER.error("Other handle error", e));
     }
 
     /**
@@ -160,13 +187,13 @@ public final class Deploy {
      * @return Deployment Options
      */
     private DeploymentOptions getWorkDeploymentOptions(String name) {
-        return getWorkDeploymentOptions(name, customConfig.getInteger(ConfigConstant.ASYNC_SERVICE_INSTANCES));
+        return getWorkDeploymentOptions(name, customConfig.getInteger(ASYNC_SERVICE_INSTANCES));
     }
 
     private DeploymentOptions getWorkDeploymentOptions(String name, int ins) {
         return new DeploymentOptions()
                 .setWorkerPoolName(name)
-                .setWorker(true)
+                .setThreadingModel(ThreadingModel.WORKER)
                 .setInstances(ins);
     }
 

core/src/main/java/cn/qaiu/vx/core/annotaions/HandleSortFilter.java

@@ -0,0 +1,15 @@
+package cn.qaiu.vx.core.annotaions;
+
+import java.lang.annotation.*;
+
+@Documented
+@Inherited
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface HandleSortFilter {
+    /**
+     * 注册顺序，数字越大越先注册<br>
+     * 值<0时会过滤掉该处理器
+     */
+    int value() default 0;
+}

core/src/main/java/cn/qaiu/vx/core/annotaions/InterceptorConfig.java

@@ -0,0 +1,23 @@
+package cn.qaiu.vx.core.annotaions;
+
+import java.lang.annotation.*;
+
+/**
+ * 拦截器配置注解
+ * 正则匹配拦截途径
+ *
+ * @author <a href="https://qaiu.top">QAIU</a>
+ */
+@Documented
+@Inherited
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface InterceptorConfig {
+
+    String pattern() default "";
+
+    /**
+     * 注册顺序，数字越大越先注册
+     */
+    int order() default 0;
+}

core/src/main/java/cn/qaiu/vx/core/base/BaseHttpApi.java

@@ -1,9 +1,16 @@
 package cn.qaiu.vx.core.base;
 
+import cn.qaiu.vx.core.interceptor.AfterInterceptor;
+import cn.qaiu.vx.core.model.JsonResult;
+import cn.qaiu.vx.core.util.CommonUtil;
+import cn.qaiu.vx.core.util.ReflectionUtil;
 import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.RoutingContext;
+import org.reflections.Reflections;
 
-import static io.vertx.core.http.HttpHeaders.CONTENT_TYPE;
+import java.util.Set;
+
+import static cn.qaiu.vx.core.util.ResponseUtil.*;
 
 /**
  * 统一响应处理
@@ -13,22 +20,43 @@ import static io.vertx.core.http.HttpHeaders.CONTENT_TYPE;
  */
 public interface BaseHttpApi {
 
-    default void fireJsonResponse(RoutingContext ctx, JsonObject jsonResult) {
-        ctx.response().putHeader(CONTENT_TYPE, "application/json; charset=utf-8")
-                .setStatusCode(200)
-                .end(jsonResult.encode());
+    // 需要扫描注册的Router路径
+    Reflections reflections = ReflectionUtil.getReflections();
+
+    default void doFireJsonObjectResponse(RoutingContext ctx, JsonObject jsonObject) {
+        if (!ctx.response().ended()) {
+            fireJsonObjectResponse(ctx, jsonObject);
+        }
+        handleAfterInterceptor(ctx, jsonObject);
     }
 
-    default <T> void fireJsonResponse(RoutingContext ctx, T jsonResult) {
-        JsonObject jsonObject = JsonObject.mapFrom(jsonResult);
-        fireJsonResponse(ctx, jsonObject);
+
+    default <T> void doFireJsonResultResponse(RoutingContext ctx, JsonResult<T> jsonResult) {
+        if (!ctx.response().ended()) {
+            fireJsonResultResponse(ctx, jsonResult);
+        }
+        handleAfterInterceptor(ctx, jsonResult.toJsonObject());
     }
 
-    default void fireTextResponse(RoutingContext ctx, String text) {
-        ctx.response().putHeader("content-type", "text/html; charset=utf-8").end(text);
+
+    default Set<AfterInterceptor> getAfterInterceptor() {
+
+        Set<Class<? extends AfterInterceptor>> afterInterceptorClassSet =
+                reflections.getSubTypesOf(AfterInterceptor.class);
+        if (afterInterceptorClassSet == null) {
+            return null;
+        }
+        return CommonUtil.sortClassSet(afterInterceptorClassSet);
     }
 
-    default void sendError(int statusCode, RoutingContext ctx) {
-        ctx.response().setStatusCode(statusCode).end();
+    default void handleAfterInterceptor(RoutingContext ctx, JsonObject jsonObject) {
+        Set<AfterInterceptor> afterInterceptor = getAfterInterceptor();
+        if (afterInterceptor != null) {
+            afterInterceptor.forEach(ai -> ai.handle(ctx, jsonObject));
         }
+        if (!ctx.response().ended()) {
+            fireTextResponse(ctx, "handleAfterInterceptor: response not end");
+        }
+    }
+
 }

core/src/main/java/cn/qaiu/vx/core/handlerfactory/RouterHandlerFactory.java

@@ -5,9 +5,10 @@ import cn.qaiu.vx.core.annotaions.RouteHandler;
 import cn.qaiu.vx.core.annotaions.RouteMapping;
 import cn.qaiu.vx.core.annotaions.SockRouteMapper;
 import cn.qaiu.vx.core.base.BaseHttpApi;
-import cn.qaiu.vx.core.enums.MIMEType;
+import cn.qaiu.vx.core.interceptor.BeforeInterceptor;
 import cn.qaiu.vx.core.model.JsonResult;
 import cn.qaiu.vx.core.util.*;
+import io.netty.handler.codec.http.HttpHeaderValues;
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
 import io.vertx.core.MultiMap;
@@ -19,25 +20,29 @@ import io.vertx.core.json.JsonObject;
 import io.vertx.ext.web.Route;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.RoutingContext;
-import io.vertx.ext.web.handler.BodyHandler;
-import io.vertx.ext.web.handler.CorsHandler;
+import io.vertx.ext.web.handler.*;
 import io.vertx.ext.web.handler.sockjs.SockJSHandler;
 import io.vertx.ext.web.handler.sockjs.SockJSHandlerOptions;
+import io.vertx.ext.web.sstore.LocalSessionStore;
+import io.vertx.ext.web.sstore.SessionStore;
 import javassist.CtClass;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.reflections.Reflections;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static cn.qaiu.vx.core.util.ConfigConstant.ROUTE_TIME_OUT;
+import static cn.qaiu.vx.core.verticle.ReverseProxyVerticle.REROUTE_PATH_PREFIX;
 import static io.vertx.core.http.HttpHeaders.*;
+import static java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME;
 
 /**
  * 路由映射, 参数绑定
@@ -56,15 +61,11 @@ public class RouterHandlerFactory implements BaseHttpApi {
         add(HttpMethod.DELETE);
         add(HttpMethod.HEAD);
     }};
-    // 需要扫描注册的Router路径
-    private static volatile Reflections reflections;
 
     private final String gatewayPrefix;
 
-    public RouterHandlerFactory(String routerScanAddress, String gatewayPrefix) {
-        Objects.requireNonNull(routerScanAddress, "The router package address scan is empty.");
+    public RouterHandlerFactory(String gatewayPrefix) {
         Objects.requireNonNull(gatewayPrefix, "The gateway prefix is empty.");
-        reflections = ReflectionUtil.getReflections(routerScanAddress);
         this.gatewayPrefix = gatewayPrefix;
     }
 
@@ -72,22 +73,47 @@ public class RouterHandlerFactory implements BaseHttpApi {
      * 开始扫描并注册handler
      */
     public Router createRouter() {
-        Router router = Router.router(VertxHolder.getVertxInstance());
-        router.route().handler(ctx -> {
+        // 主路由
+        Router mainRouter = Router.router(VertxHolder.getVertxInstance());
+        mainRouter.route().handler(ctx -> {
+            String realPath = ctx.request().uri();;
+            if (realPath.startsWith(REROUTE_PATH_PREFIX)) {
+                // vertx web proxy暂不支持rewrite, 所以这里进行手动替换, 请求地址中的请求path前缀替换为originPath
+                String rePath = realPath.substring(REROUTE_PATH_PREFIX.length());
+                ctx.reroute(rePath);
+                return;
+            }
+
             LOGGER.debug("The HTTP service request address information ===>path:{}, uri:{}, method:{}",
                     ctx.request().path(), ctx.request().absoluteURI(), ctx.request().method());
             ctx.response().headers().add(ACCESS_CONTROL_ALLOW_ORIGIN, "*");
+            ctx.response().headers().add(DATE, LocalDateTime.now().format(ISO_LOCAL_DATE_TIME));
             ctx.response().headers().add(ACCESS_CONTROL_ALLOW_METHODS, "POST, GET, OPTIONS, PUT, DELETE, HEAD");
-            ctx.response().headers().add(ACCESS_CONTROL_ALLOW_HEADERS, "X-PINGOTHER, Origin,Content-Type, Accept, X-Requested-With, Dev, Authorization, Version, Token");
+            ctx.response().headers().add(ACCESS_CONTROL_ALLOW_HEADERS, "X-PINGOTHER, Origin,Content-Type, Accept, " +
+                    "X-Requested-With, Dev, Authorization, Version, Token");
             ctx.response().headers().add(ACCESS_CONTROL_MAX_AGE, "1728000");
             ctx.next();
         });
         // 添加跨域的方法
-        router.route().handler(CorsHandler.create().addRelativeOrigin(".*").allowCredentials(true).allowedMethods(httpMethods));
+        mainRouter.route().handler(CorsHandler.create().addRelativeOrigin(".*").allowCredentials(true).allowedMethods(httpMethods));
 
         // 配置文件上传路径
-        router.route().handler(BodyHandler.create().setUploadsDirectory("uploads"));
+        mainRouter.route().handler(BodyHandler.create().setUploadsDirectory("uploads"));
 
+        // 配置Session管理 - 用于演练场登录状态持久化
+        // 30天过期时间（毫秒）
+        SessionStore sessionStore = LocalSessionStore.create(VertxHolder.getVertxInstance());
+        SessionHandler sessionHandler = SessionHandler.create(sessionStore)
+                .setSessionTimeout(30L * 24 * 60 * 60 * 1000) // 30天
+                .setSessionCookieName("SESSIONID") // Cookie名称
+                .setCookieHttpOnlyFlag(true) // 防止XSS攻击
+                .setCookieSecureFlag(false); // 非HTTPS环境设置为false
+        mainRouter.route().handler(sessionHandler);
+
+        // 拦截器
+        Set<Handler<RoutingContext>> interceptorSet = getInterceptorSet();
+        Route route0 = mainRouter.route("/*");
+        interceptorSet.forEach(route0::handler);
 
         try {
             Set<Class<?>> handlers = reflections.getTypesAnnotatedWith(RouteHandler.class);
@@ -101,7 +127,7 @@ public class RouterHandlerFactory implements BaseHttpApi {
             for (Class<?> handler : sortedHandlers) {
                 try {
                     // 注册请求处理方法
-                    registerNewHandler(router, handler);
+                    registerNewHandler(mainRouter, handler);
                 } catch (Throwable e) {
                     LOGGER.error("Error register {}, Error details：", handler, e.getCause());
 
@@ -111,11 +137,12 @@ public class RouterHandlerFactory implements BaseHttpApi {
             LOGGER.error("Manually Register Handler Fail, Error details：" + e.getMessage());
         }
         // 错误请求处理
-        router.errorHandler(405, ctx -> fireJsonResponse(ctx, JsonResult
+        mainRouter.errorHandler(405, ctx -> doFireJsonResultResponse(ctx, JsonResult
                 .error("Method Not Allowed", 405)));
-        router.errorHandler(404, ctx -> ctx.response().setStatusCode(404).setChunked(true)
+        mainRouter.errorHandler(404, ctx -> ctx.response().setStatusCode(404).setChunked(true)
                 .end("Internal server error: 404 not found"));
-        return router;
+
+        return mainRouter;
     }
 
     /**
@@ -139,15 +166,13 @@ public class RouterHandlerFactory implements BaseHttpApi {
                 method -> method.isAnnotationPresent(SockRouteMapper.class)
         ).toList());
 
-        // 拦截器
-        Handler<RoutingContext> interceptor = getInterceptor();
         // 依次注册处理方法
         for (Method method : methodList) {
             if (method.isAnnotationPresent(RouteMapping.class)) {
                 // 普通路由
                 RouteMapping mapping = method.getAnnotation(RouteMapping.class);
                 HttpMethod routeMethod = HttpMethod.valueOf(mapping.method().name());
-                String routeUrl = getRouteUrl(method.getName(), mapping.value());
+                String routeUrl = getRouteUrl(mapping.value());
                 String url = root.concat(routeUrl);
                 // 匹配方法
                 Route route = router.route(routeMethod, url);
@@ -157,17 +182,23 @@ public class RouterHandlerFactory implements BaseHttpApi {
                     route.consumes(mineType);
                 }
 
-                // 先执行拦截方法, 再进入业务请求
-                route.handler(interceptor);
+                // 设置默认超时
+                route.handler(TimeoutHandler.create(SharedDataUtil.getCustomConfig().getInteger(ROUTE_TIME_OUT)));
+                route.handler(ResponseTimeHandler.create());
                 route.handler(ctx -> handlerMethod(instance, method, ctx)).failureHandler(ctx -> {
                     if (ctx.response().ended()) return;
+                    // 超时处理器状态码503
+                    if (ctx.statusCode() == 503 || ctx.failure() == null) {
+                        doFireJsonResultResponse(ctx, JsonResult.error("未知异常, 请联系管理员", 500));
+                    } else {
                         ctx.failure().printStackTrace();
-                    fireJsonResponse(ctx, JsonResult.error(ctx.failure().getMessage(), 500));
+                        doFireJsonResultResponse(ctx, JsonResult.error(ctx.failure().getMessage(), 500));
+                    }
                 });
             } else if (method.isAnnotationPresent(SockRouteMapper.class)) {
                 // websocket 基于sockJs
                 SockRouteMapper mapping = method.getAnnotation(SockRouteMapper.class);
-                String routeUrl = getRouteUrl(method.getName(), mapping.value());
+                String routeUrl = getRouteUrl(mapping.value());
                 String url = root.concat(routeUrl);
                 LOGGER.info("Register New Websocket Handler -> {}", url);
                 SockJSHandlerOptions options = new SockJSHandlerOptions()
@@ -194,13 +225,12 @@ public class RouterHandlerFactory implements BaseHttpApi {
     /**
      * 获取并处理路由URL分隔符
      *
-     * @param methodName 路由method
      * @return String
      */
-    private String getRouteUrl(String methodName, String mapperValue) {
+    private String getRouteUrl(String mapperValue) {
         String routeUrl;
-        if (mapperValue.startsWith("/:") || "/".equals(mapperValue)) {
-            routeUrl = (methodName + mapperValue);
+        if ("/".equals(mapperValue)) {
+            routeUrl = mapperValue;
         } else if (mapperValue.startsWith("/")) {
             routeUrl = mapperValue.substring(1);
         } else {
@@ -213,15 +243,10 @@ public class RouterHandlerFactory implements BaseHttpApi {
      * 配置拦截
      *
      * @return Handler
-     * @throws Throwable Throwable
      */
-    private Handler<RoutingContext> getInterceptor() throws Throwable {
+    private Set<Handler<RoutingContext>> getInterceptorSet() {
         // 配置拦截
-        Class<?> interceptorClass = Class.forName(SharedDataUtil.getValueForCustomConfig("interceptorClassPath"));
-        Object handleInstance = ReflectionUtil.newWithNoParam(interceptorClass);
-        Method doHandle = interceptorClass.getMethod("doHandle");
-        // 反射调用
-        return CastUtil.cast(ReflectionUtil.invoke(doHandle, handleInstance));
+        return getBeforeInterceptor().stream().map(BeforeInterceptor::doHandle).collect(Collectors.toSet());
     }
 
     /**
@@ -243,7 +268,7 @@ public class RouterHandlerFactory implements BaseHttpApi {
         if (handler.isAnnotationPresent(RouteHandler.class)) {
             RouteHandler routeHandler = handler.getAnnotation(RouteHandler.class);
             String value = routeHandler.value();
-            root += ("/".equals(value) ? "" : value);
+            root += (value.startsWith("/") ? value.substring(1) : value);
         }
         if (!root.endsWith("/")) {
             root = root + "/";
@@ -286,37 +311,15 @@ public class RouterHandlerFactory implements BaseHttpApi {
             });
         }
 
-        final MultiMap queryParams = ctx.queryParams();
-        if ("POST".equals(ctx.request().method().name())) {
-            queryParams.addAll(ctx.request().params());
-        }
-
         JsonArray entityPackagesReg = SharedDataUtil.getJsonArrayForCustomConfig("entityPackagesReg");
-        // 绑定get或post请求头的请求参数
-        methodParametersTemp.forEach((k, v) -> {
-            if (ReflectionUtil.isBasicType(v.getRight())) {
-                String fmt = getFmt(v.getLeft(), v.getRight());
-                String value = queryParams.get(k);
-                parameterValueList.put(k, ReflectionUtil.conversion(v.getRight(), value, fmt));
-            } else if (RoutingContext.class.getName().equals(v.getRight().getName())) {
-                parameterValueList.put(k, ctx);
-            } else if (HttpServerRequest.class.getName().equals(v.getRight().getName())) {
-                parameterValueList.put(k, ctx.request());
-            } else if (HttpServerResponse.class.getName().equals(v.getRight().getName())) {
-                parameterValueList.put(k, ctx.response());
-            } else if (CommonUtil.matchRegList(entityPackagesReg.getList(), v.getRight().getName())) {
-                // 绑定实体类
-                try {
-                    Class<?> aClass = Class.forName(v.getRight().getName());
-                    Object entity = ParamUtil.multiMapToEntity(queryParams, aClass);
-                    parameterValueList.put(k, entity);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        });
+
+        final MultiMap queryParams = ctx.queryParams();
         // 解析body-json参数
-        if ("application/json".equals(ctx.parsedHeaders().contentType().value()) && ctx.body().asJsonObject() != null) {
+        // 只处理POST/PUT/PATCH等有body的请求方法，避免GET请求读取body导致"Request has already been read"错误
+        String httpMethod = ctx.request().method().name();
+        if (("POST".equals(httpMethod) || "PUT".equals(httpMethod) || "PATCH".equals(httpMethod))
+                && HttpHeaderValues.APPLICATION_JSON.toString().equals(ctx.parsedHeaders().contentType().value())
+                && ctx.body() != null && ctx.body().asJsonObject() != null) {
             JsonObject body = ctx.body().asJsonObject();
             if (body != null) {
                 methodParametersTemp.forEach((k, v) -> {
@@ -336,26 +339,67 @@ public class RouterHandlerFactory implements BaseHttpApi {
                     }
                 });
             }
+        } else if (("POST".equals(httpMethod) || "PUT".equals(httpMethod) || "PATCH".equals(httpMethod))
+                && ctx.body() != null) {
+            queryParams.addAll(ParamUtil.paramsToMap(ctx.body().asString()));
         }
+
+        // 解析其他参数
+        if ("POST".equals(ctx.request().method().name())) {
+            queryParams.addAll(ctx.request().params());
+        }
+        // 绑定get或post请求头的请求参数
+        methodParametersTemp.forEach((k, v) -> {
+            if (ReflectionUtil.isBasicType(v.getRight())) {
+                String fmt = getFmt(v.getLeft(), v.getRight());
+                String value = queryParams.get(k);
+                parameterValueList.put(k, ReflectionUtil.conversion(v.getRight(), value, fmt));
+            } else if (RoutingContext.class.getName().equals(v.getRight().getName())) {
+                parameterValueList.put(k, ctx);
+            } else if (HttpServerRequest.class.getName().equals(v.getRight().getName())) {
+                parameterValueList.put(k, ctx.request());
+            } else if (HttpServerResponse.class.getName().equals(v.getRight().getName())) {
+                parameterValueList.put(k, ctx.response());
+            } else if (parameterValueList.get(k) == null
+                    && CommonUtil.matchRegList(entityPackagesReg.getList(), v.getRight().getName())) {
+                // 绑定实体类
+                try {
+                    Class<?> aClass = Class.forName(v.getRight().getName());
+                    Object entity = ParamUtil.multiMapToEntity(queryParams, aClass);
+                    parameterValueList.put(k, entity);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
         // 调用handle 获取响应对象
         Object[] parameterValueArray = parameterValueList.values().toArray(new Object[0]);
         try {
             // 反射调用
             Object data = ReflectionUtil.invokeWithArguments(method, instance, parameterValueArray);
             if (data != null) {
+
                 if (data instanceof JsonResult) {
-                    fireJsonResponse(ctx, data);
+                    doFireJsonResultResponse(ctx, (JsonResult<?>) data);
+                }
+                if (data instanceof JsonObject) {
+                    doFireJsonObjectResponse(ctx, ((JsonObject) data));
                 } else if (data instanceof Future) { // 处理异步响应
                     ((Future<?>) data).onSuccess(res -> {
-                        if (res instanceof JsonObject) {
-                            fireJsonResponse(ctx, res);
-                        } else if (res != null){
-                            fireJsonResponse(ctx, JsonResult.data(res));
+                        if (res instanceof JsonResult) {
+                            doFireJsonResultResponse(ctx, (JsonResult<?>) res);
                         }
-                    }).onFailure(e -> fireJsonResponse(ctx, JsonResult.error(e.getMessage())));
+                        if (res instanceof JsonObject) {
+                            doFireJsonObjectResponse(ctx, ((JsonObject) res));
+                        } else if (res != null) {
+                            doFireJsonResultResponse(ctx, JsonResult.data(res));
                         } else {
-                    ctx.response().headers().set(CONTENT_TYPE, MIMEType.TEXT_HTML.getValue());
-                    ctx.end(data.toString());
+                            handleAfterInterceptor(ctx, null);
+                        }
+
+                    }).onFailure(e -> doFireJsonResultResponse(ctx, JsonResult.error(e.getMessage())));
+                } else {
+                    doFireJsonResultResponse(ctx, JsonResult.data(data));
                 }
             }
         } catch (Throwable e) {
@@ -363,12 +407,12 @@ public class RouterHandlerFactory implements BaseHttpApi {
             String err = e.getMessage();
             if (e.getCause() != null) {
                 if (e.getCause() instanceof InvocationTargetException) {
-                    err = ((InvocationTargetException)e.getCause()).getTargetException().getMessage();
+                    err = ((InvocationTargetException) e.getCause()).getTargetException().getMessage();
                 } else {
                     err = e.getCause().getMessage();
                 }
             }
-            fireJsonResponse(ctx, JsonResult.error(err));
+            doFireJsonResultResponse(ctx, JsonResult.error(err));
         }
     }
 
@@ -386,4 +430,13 @@ public class RouterHandlerFactory implements BaseHttpApi {
         }
         return fmt;
     }
+
+    private Set<BeforeInterceptor> getBeforeInterceptor() {
+        Set<Class<? extends BeforeInterceptor>> interceptorClassSet =
+                reflections.getSubTypesOf(BeforeInterceptor.class);
+        if (interceptorClassSet == null) {
+            return new HashSet<>();
+        }
+        return CommonUtil.sortClassSet(interceptorClassSet);
+    }
 }

core/src/main/java/cn/qaiu/vx/core/interceptor/AfterInterceptor.java

@@ -0,0 +1,15 @@
+package cn.qaiu.vx.core.interceptor;
+
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
+
+/**
+ * 后置拦截器接口
+ *
+ * @author <a href="https://qaiu.top">QAIU</a>
+ */
+public interface AfterInterceptor {
+
+    void handle(RoutingContext ctx, JsonObject responseData);
+
+}

core/src/main/java/cn/qaiu/vx/core/interceptor/BeforeInterceptor.java

@@ -0,0 +1,41 @@
+package cn.qaiu.vx.core.interceptor;
+
+import io.vertx.core.Handler;
+import io.vertx.ext.web.RoutingContext;
+
+import static cn.qaiu.vx.core.util.ResponseUtil.sendError;
+
+/**
+ * 前置拦截器接口
+ *
+ * @author <a href="https://qaiu.top">QAIU</a>
+ */
+public interface BeforeInterceptor extends Handler<RoutingContext> {
+    String IS_NEXT = "RoutingContextIsNext";
+
+    default Handler<RoutingContext> doHandle() {
+
+        return ctx -> {
+            // 加同步锁
+            synchronized (BeforeInterceptor.class) {
+                ctx.put(IS_NEXT, false);
+                BeforeInterceptor.this.handle(ctx);
+                if (!(Boolean) ctx.get(IS_NEXT) && !ctx.response().ended()) {
+                    sendError(ctx, 403);
+                }
+            }
+        };
+    }
+
+    default void doNext(RoutingContext context) {
+        // 设置上下文状态为可以继续执行
+        // 添加同步锁保障多线程下执行时序
+        synchronized (BeforeInterceptor.class) {
+            context.put(IS_NEXT, true);
+            context.next();
+        }
+    }
+
+    void handle(RoutingContext context);
+
+}

core/src/main/java/cn/qaiu/vx/core/interceptor/Interceptor.java

@@ -1,19 +0,0 @@
-package cn.qaiu.vx.core.interceptor;
-
-import io.vertx.core.Handler;
-import io.vertx.ext.web.RoutingContext;
-
-/**
- * 拦截器接口
- * <br>Create date 2021-05-06 09:20:37
- *
- * @author <a href="https://qaiu.top">QAIU</a>
- */
-public interface Interceptor {
-
-    default Handler<RoutingContext> doHandle() {
-        return this::handle;
-    }
-
-    void handle(RoutingContext context);
-}

core/src/main/java/cn/qaiu/vx/core/model/JsonResult.java

@@ -1,8 +1,12 @@
 package cn.qaiu.vx.core.model;
 
 
+import cn.qaiu.vx.core.util.CastUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.vertx.core.json.JsonObject;
 import org.apache.commons.lang3.StringUtils;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -13,6 +17,7 @@ import java.io.Serializable;
  */
 public class JsonResult<T> implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1L;
 
     private static final int SUCCESS_CODE = 200;
@@ -25,12 +30,10 @@ public class JsonResult<T> implements Serializable {
 
     private int code = SUCCESS_CODE;//状态码
 
-    private String msg = SUCCESS_MESSAGE;//消息
+    private String msg = SUCCESS_MESSAGE; //消息
 
     private boolean success = true; //是否成功
 
-    private int count;
-
     private T data;
 
     private long timestamp = System.currentTimeMillis(); //时间戳
@@ -49,20 +52,6 @@ public class JsonResult<T> implements Serializable {
         this.success = success;
     }
 
-    public JsonResult(int code, String msg, boolean success, T data, int count) {
-        this(code, msg, success, data);
-        this.count = count;
-    }
-
-    public int getCount() {
-        return count;
-    }
-
-    public JsonResult<T> setCount(int count) {
-        this.count = count;
-        return this;
-    }
-
     public int getCode() {
         return code;
     }
@@ -131,20 +120,9 @@ public class JsonResult<T> implements Serializable {
         return new JsonResult<>(SUCCESS_CODE, msg, true, data);
     }
 
-    // 响应成功消息和数据实体
-    public static <T> JsonResult<T> data(String msg, T data, int count) {
-        if (StringUtils.isEmpty(msg)) msg = SUCCESS_MESSAGE;
-        return new JsonResult<>(SUCCESS_CODE, msg, true, data, count);
-    }
-
     // 响应数据实体
     public static <T> JsonResult<T> data(T data) {
-        return new JsonResult<>(SUCCESS_CODE, SUCCESS_MESSAGE, true, data, 0);
-    }
-
-    // 响应数据实体
-    public static <T> JsonResult<T> data(T data, int count) {
-        return new JsonResult<>(SUCCESS_CODE, SUCCESS_MESSAGE, true, data, count);
+        return new JsonResult<>(SUCCESS_CODE, SUCCESS_MESSAGE, true, data);
     }
 
     // 响应成功消息
@@ -157,4 +135,16 @@ public class JsonResult<T> implements Serializable {
     public static <T> JsonResult<T> success() {
         return new JsonResult<>(SUCCESS_CODE, SUCCESS_MESSAGE, true, null);
     }
+
+    // 转为json对象
+    public JsonObject toJsonObject() {
+        return JsonObject.mapFrom(this);
+    }
+
+    private static final ObjectMapper mapper = new ObjectMapper();
+
+    // 转为json对象
+    public static JsonResult<?> toJsonResult(JsonObject json) {
+        return CastUtil.cast(json.mapTo(JsonResult.class));
+    }
 }

core/src/main/java/cn/qaiu/vx/core/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * ModuleGen cn.qaiu.vx.core
+ */
+@ModuleGen(name = "vertx-http-proxy", groupPackage = "cn.qaiu.vx.core", useFutures = true)
+package cn.qaiu.vx.core;
+
+import io.vertx.codegen.annotations.ModuleGen;

core/src/main/java/cn/qaiu/vx/core/util/AsyncServiceUtil.java

@@ -5,7 +5,7 @@ import io.vertx.serviceproxy.ServiceProxyBuilder;
 
 /**
  * @author Xu Haidong
- * @date 2018/8/15
+ * Create at 2018/8/15
  */
 public final class AsyncServiceUtil {
 

core/src/main/java/cn/qaiu/vx/core/util/CommonUtil.java

@@ -1,9 +1,8 @@
 package cn.qaiu.vx.core.util;
 
+import cn.qaiu.vx.core.annotaions.HandleSortFilter;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonObject;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.Converter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,6 +14,9 @@ import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * CommonUtil
@@ -70,10 +72,11 @@ public class CommonUtil {
         } catch (UnknownHostException e) {
             return false;
         }
-        try(Socket ignored =  new Socket(Address, port)) {
+        try (Socket ignored = new Socket(Address, port)) {
             //建立一个Socket连接
             flag = true;
-        } catch (IOException ignoredException) {}
+        } catch (IOException ignoredException) {
+        }
         return flag;
     }
 
@@ -95,23 +98,6 @@ public class CommonUtil {
         return data;
     }
 
-    /**
-     * 注册枚举转换器
-     *
-     * @param enums 枚举类
-     */
-    @SafeVarargs
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    public static void enumConvert(Class<? extends Enum>... enums) {
-        for (Class<? extends Enum> anEnum : enums) {
-            ConvertUtils.register(new Converter() {
-                public Object convert(Class type, Object value) {
-                    return Enum.valueOf(anEnum, (String) value);
-                }
-            }, anEnum);
-        }
-    }
-
     /**
      * 处理其他配置
      *
@@ -126,4 +112,49 @@ public class CommonUtil {
         LocalConstant.put(configName, map);
         LOGGER.info("读取配置{}成功", configName);
     }
+
+    public static <T> Set<T> sortClassSet(Set<Class<? extends T>> set) {
+        return set.stream().filter(c1 -> {
+            HandleSortFilter s1 = c1.getAnnotation(HandleSortFilter.class);
+            if (s1 != null) {
+                return s1.value() > 0;
+            } else {
+                return true;
+            }
+        }).sorted((c1, c2) -> {
+            HandleSortFilter s1 = c1.getAnnotation(HandleSortFilter.class);
+            HandleSortFilter s2 = c2.getAnnotation(HandleSortFilter.class);
+            int n1 = 0, n2 = 0;
+            if (s1 != null) {
+                n1 = s1.value();
+            }
+            if (s2 != null) {
+                n2 = s2.value();
+            }
+            return n1 - n2;
+        }).map(c -> {
+            try {
+                return ReflectionUtil.newWithNoParam(c);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }).collect(Collectors.toSet());
+    }
+
+    private static String appVersion;
+
+    public static String getAppVersion() {
+        if (null == appVersion) {
+            Properties properties = new Properties();
+            try {
+                properties.load(CommonUtil.class.getClassLoader().getResourceAsStream("app.properties"));
+                if (!properties.isEmpty()) {
+                    appVersion = properties.getProperty("app.version") + "build" + properties.getProperty("build");
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return appVersion;
+    }
 }

core/src/main/java/cn/qaiu/vx/core/util/ConfigConstant.java

@@ -3,9 +3,21 @@ package cn.qaiu.vx.core.util;
 public interface ConfigConstant {
     String CUSTOM = "custom";
     String VERTX = "vertx";
+    String EVENT_LOOP_POOL_SIZE = "eventLoopPoolSize";
     String LOCAL = "local";
     String SERVER = "server";
+    String CACHE = "cache";
+
+    String PROXY_SERVER = "proxy-server";
+
+    String PROXY = "proxy";
+
+    String AUTHS = "auths";
     String GLOBAL_CONFIG = "globalConfig";
     String CUSTOM_CONFIG = "customConfig";
     String ASYNC_SERVICE_INSTANCES = "asyncServiceInstances";
+    String IGNORES_REG="ignoresReg";
+    String BASE_LOCATIONS="baseLocations";
+
+    String ROUTE_TIME_OUT="routeTimeOut";
 }

core/src/main/java/cn/qaiu/vx/core/util/JacksonConfig.java

@@ -0,0 +1,46 @@
+package cn.qaiu.vx.core.util;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import io.vertx.core.json.jackson.DatabindCodec;
+import org.slf4j.LoggerFactory;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author <a href="https://qaiu.top">QAIU</a>
+ * Create at 2023/10/14 9:07
+ */
+public class JacksonConfig {
+
+    static {
+        // 通过该方法对mapper对象进行设置，所有序列化的对象都将按改规则进行系列化
+        // Include.Include.ALWAYS 默认
+        // Include.NON_DEFAULT 属性为默认值不序列化
+        // Include.NON_EMPTY 属性为 空（""） 或者为 NULL 都不序列化，则返回的json是没有这个字段的。这样对移动端会更省流量
+        // Include.NON_NULL 属性为NULL 不序列化,就是为null的字段不参加序列化
+        // objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        ObjectMapper objectMapper = DatabindCodec.mapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+        JavaTimeModule javaTimeModule = new JavaTimeModule();
+        javaTimeModule.addDeserializer(LocalDateTime.class,
+                new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        javaTimeModule.addDeserializer(LocalDate.class,
+                new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+        javaTimeModule.addDeserializer(LocalTime.class,
+                new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss")));
+        objectMapper.registerModule(javaTimeModule);
+        LoggerFactory.getLogger(JacksonConfig.class).info("Global JacksonConfig complete.");
+    }
+
+    public static void nothing() {}
+
+}

core/src/main/java/cn/qaiu/vx/core/util/ParamUtil.java

@@ -1,11 +1,10 @@
 package cn.qaiu.vx.core.util;
 
 import io.vertx.core.MultiMap;
-import org.apache.commons.beanutils.BeanUtils;
+import io.vertx.core.json.JsonObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -18,28 +17,37 @@ import java.util.Map;
 public final class ParamUtil {
     private static final Logger LOGGER = LoggerFactory.getLogger(ParamUtil.class);
 
-    public static Map<String, String> multiMapToMap(MultiMap multiMap) {
+    public static Map<String, Object> multiMapToMap(MultiMap multiMap) {
         if (multiMap == null) return null;
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         for (Map.Entry<String, String> entry : multiMap.entries()) {
             map.put(entry.getKey(), entry.getValue());
         }
         return map;
     }
 
-    public static <T> T multiMapToEntity(MultiMap multiMap,Class<T> tClass) throws NoSuchMethodException {
-        Map<String,String> map = multiMapToMap(multiMap);
-        T obj = null;
-        try {
-            obj = tClass.getDeclaredConstructor().newInstance();
-            BeanUtils.populate(obj,map);
-        } catch (InstantiationException | IllegalAccessException e) {
-            e.printStackTrace();
-            LOGGER.error("实例化异常");
-        } catch (InvocationTargetException e2) {
-            e2.printStackTrace();
-            LOGGER.error("map2bean转换异常");
+    public static <T> T multiMapToEntity(MultiMap multiMap, Class<T> tClass) {
+        Map<String, Object> map = multiMapToMap(multiMap);
+        if (map == null) {
+            return null;
         }
-        return obj;
+        return new JsonObject(map).mapTo(tClass);
     }
+
+    public static MultiMap paramsToMap(String paramString) {
+        MultiMap entries = MultiMap.caseInsensitiveMultiMap();
+        if (paramString == null) return entries;
+        String[] params = paramString.split("&");
+        if (params.length == 0) return entries;
+        for (String param : params) {
+            String[] kv = param.split("=");
+            if (kv.length == 2) {
+                entries.set(kv[0], kv[1]);
+            } else {
+                entries.set(kv[0], "");
+            }
+        }
+        return entries;
+    }
+
 }

core/src/main/java/cn/qaiu/vx/core/util/ReflectionUtil.java

@@ -5,12 +5,13 @@ import javassist.bytecode.AccessFlag;
 import javassist.bytecode.CodeAttribute;
 import javassist.bytecode.LocalVariableAttribute;
 import javassist.bytecode.MethodInfo;
-import org.apache.commons.beanutils.ConversionException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.reflections.Reflections;
-import org.reflections.scanners.*;
+import org.reflections.scanners.MemberUsageScanner;
+import org.reflections.scanners.MethodParameterNamesScanner;
+import org.reflections.scanners.Scanners;
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
 import org.reflections.util.FilterBuilder;
@@ -24,6 +25,8 @@ import java.net.URL;
 import java.text.ParseException;
 import java.util.*;
 
+import static cn.qaiu.vx.core.util.ConfigConstant.BASE_LOCATIONS;
+
 /**
  * 基于org.reflection和javassist的反射工具包
  * 通过包扫描实现路由地址的注解映射
@@ -33,6 +36,16 @@ import java.util.*;
  */
 public final class ReflectionUtil {
 
+
+    /**
+     * 以默认配置的基础包路径获取反射器
+     *
+     * @return Reflections object
+     */
+    public static Reflections getReflections() {
+        return getReflections(SharedDataUtil.getStringForCustomConfig(BASE_LOCATIONS));
+    }
+
     /**
      * 获取反射器
      *
@@ -48,6 +61,7 @@ public final class ReflectionUtil {
         } else {
             packageAddressList = Collections.singletonList(packageAddress);
         }
+
         return getReflections(packageAddressList);
     }
 
@@ -70,11 +84,12 @@ public final class ReflectionUtil {
         // 发现注解api层 没有继承父类时 这里反射一直有问题(Scanner SubTypesScanner was not configured)
         // 因此这里需要手动配置各种Scanner扫描器 -- https://blog.csdn.net/qq_29499107/article/details/106889781
         configurationBuilder.setScanners(
-                new SubTypesScanner(false), //允许getAllTypes获取所有Object的子类, 不设置为false则 getAllTypes 会报错.默认为true.
+                Scanners.SubTypes.filterResultsBy(s -> true), //允许getAllTypes获取所有Object的子类, 不设置为false则 getAllTypes
+                // 会报错.默认为true.
                 new MethodParameterNamesScanner(), //设置方法参数名称 扫描器,否则调用getConstructorParamNames 会报错
-                new MethodAnnotationsScanner(), //设置方法注解 扫描器, 否则getConstructorsAnnotatedWith,getMethodsAnnotatedWith 会报错
-                new MemberUsageScanner(),  //设置 member 扫描器,否则 getMethodUsage 会报错, 不推荐使用,有可能会报错 Caused by: java.lang.ClassCastException: javassist.bytecode.InterfaceMethodrefInfo cannot be cast to javassist.bytecode.MethodrefInfo
-                new TypeAnnotationsScanner() //设置类注解 扫描器 ,否则 getTypesAnnotatedWith 会报错
+                Scanners.MethodsAnnotated, //设置方法注解 扫描器, 否则getConstructorsAnnotatedWith,getMethodsAnnotatedWith 会报错
+                new MemberUsageScanner(),  //设置 member 扫描器,否则 getMethodUsage 会报错
+                Scanners.TypesAnnotated //设置类注解 扫描器 ,否则 getTypesAnnotatedWith 会报错
         );
 
         configurationBuilder.filterInputsBy(filterBuilder);
@@ -98,7 +113,8 @@ public final class ReflectionUtil {
             MethodInfo methodInfo = cm.getMethodInfo();
             CtClass[] parameterTypes = cm.getParameterTypes();
             CodeAttribute codeAttribute = methodInfo.getCodeAttribute();
-            LocalVariableAttribute attr = (LocalVariableAttribute) codeAttribute.getAttribute(LocalVariableAttribute.tag);
+            LocalVariableAttribute attr =
+                    (LocalVariableAttribute) codeAttribute.getAttribute(LocalVariableAttribute.tag);
 
             boolean flag = true;
             boolean flag2 = cm.getModifiers() - 1 != AccessFlag.STATIC;
@@ -110,7 +126,8 @@ public final class ReflectionUtil {
                     continue;
                 }
                 flag = false;
-                paramMap.put(attr.variableName(j + (flag2 ? 1 : 0)), Pair.of(parameterAnnotations[j - k], parameterTypes[j - k]));
+                paramMap.put(attr.variableName(j + (flag2 ? 1 : 0)), Pair.of(parameterAnnotations[j - k],
+                        parameterTypes[j - k]));
             }
         } catch (NotFoundException e) {
             e.printStackTrace();
@@ -169,10 +186,10 @@ public final class ReflectionUtil {
                     return DateUtils.parseDate(value, fmt);
                 } catch (ParseException e) {
                     e.printStackTrace();
-                    throw new ConversionException("无法将格式化日期");
+                    throw new RuntimeException("无法将格式化日期");
                 }
             default:
-                throw new ConversionException("无法将String类型" + value + "转为[" + name + "]");
+                throw new RuntimeException("无法将String类型" + value + "转为[" + name + "]");
         }
     }
 
@@ -184,7 +201,7 @@ public final class ReflectionUtil {
      * @return Array
      */
     public static Object conversionArray(CtClass ctClass, String value) {
-        if (!isBasicTypeArray(ctClass)) throw new ConversionException("无法解析数组");
+        if (!isBasicTypeArray(ctClass)) throw new RuntimeException("无法解析数组");
         String[] strArr = value.split(",");
         List<Object> obj = new ArrayList<>();
         Arrays.stream(strArr).forEach(v -> obj.add(conversion(ctClass, v, null)));
@@ -214,7 +231,8 @@ public final class ReflectionUtil {
         if (ctClass.isPrimitive() || "java.util.Date".equals(ctClass.getName())) {
             return true;
         }
-        return ctClass.getName().matches("^java\\.lang\\.((Boolean)|(Character)|(Byte)|(Short)|(Integer)|(Long)|(Float)|(Double)|(String))$");
+        return ctClass.getName().matches("^java\\.lang\\.((Boolean)|(Character)|(Byte)|(Short)|(Integer)|(Long)|" +
+                "(Float)|(Double)|(String))$");
     }
 
     /**
@@ -238,7 +256,8 @@ public final class ReflectionUtil {
      * @throws InstantiationException    InstantiationException
      * @throws IllegalAccessException    IllegalAccessException
      */
-    public static <T> T newWithNoParam(Class<T> handler) throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
+    public static <T> T newWithNoParam(Class<T> handler) throws NoSuchMethodException, InvocationTargetException,
+            InstantiationException, IllegalAccessException {
         return handler.getConstructor().newInstance();
     }
 

core/src/main/java/cn/qaiu/vx/core/util/ResponseUtil.java

@@ -0,0 +1,51 @@
+package cn.qaiu.vx.core.util;
+
+import cn.qaiu.vx.core.model.JsonResult;
+import io.vertx.core.Promise;
+import io.vertx.core.http.HttpHeaders;
+import io.vertx.core.http.HttpServerResponse;
+import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
+
+import static io.vertx.core.http.HttpHeaders.CONTENT_TYPE;
+
+public class ResponseUtil {
+
+    public static void redirect(HttpServerResponse response, String url) {
+        response.putHeader(CONTENT_TYPE, "text/html; charset=utf-8")
+                .putHeader(HttpHeaders.LOCATION, url).setStatusCode(302).end();
+    }
+
+    public static void redirect(HttpServerResponse response, String url, Promise<?> promise) {
+        redirect(response, url);
+        promise.complete();
+    }
+
+    public static void fireJsonObjectResponse(RoutingContext ctx, JsonObject jsonObject) {
+        ctx.response().putHeader(CONTENT_TYPE, "application/json; charset=utf-8")
+                .setStatusCode(200)
+                .end(jsonObject.encode());
+    }
+
+    public static void fireJsonObjectResponse(HttpServerResponse ctx, JsonObject jsonObject) {
+        ctx.putHeader(CONTENT_TYPE, "application/json; charset=utf-8")
+                .setStatusCode(200)
+                .end(jsonObject.encode());
+    }
+
+    public static <T> void fireJsonResultResponse(RoutingContext ctx, JsonResult<T> jsonResult) {
+        fireJsonObjectResponse(ctx, jsonResult.toJsonObject());
+    }
+
+    public static <T> void fireJsonResultResponse(HttpServerResponse ctx, JsonResult<T> jsonResult) {
+        fireJsonObjectResponse(ctx, jsonResult.toJsonObject());
+    }
+
+    public static void fireTextResponse(RoutingContext ctx, String text) {
+        ctx.response().putHeader(CONTENT_TYPE, "text/html; charset=utf-8").end(text);
+    }
+
+    public static void sendError(RoutingContext ctx, int statusCode) {
+        ctx.response().setStatusCode(statusCode).end();
+    }
+}

core/src/main/java/cn/qaiu/vx/core/util/SharedDataUtil.java

@@ -32,11 +32,11 @@ public class SharedDataUtil {
         return (JsonObject) localMap.get(key);
     }
 
-    public static JsonObject getJsonObjectForCustomConfig(String key) {
-        return getJsonConfig("customConfig").getJsonObject(key);
+    public static JsonObject getCustomConfig() {
+        return getJsonConfig("customConfig");
     }
 
-    public static String getJsonStringForCustomConfig(String key) {
+    public static String getStringForCustomConfig(String key) {
         return getJsonConfig("customConfig").getString(key);
     }
 

core/src/main/java/cn/qaiu/vx/core/verticle/HttpProxyVerticle.java

@@ -0,0 +1,184 @@
+package cn.qaiu.vx.core.verticle;
+
+import io.vertx.core.AbstractVerticle;
+import io.vertx.core.Vertx;
+import io.vertx.core.VertxOptions;
+import io.vertx.core.dns.AddressResolverOptions;
+import io.vertx.core.http.*;
+import io.vertx.core.net.NetClient;
+import io.vertx.core.net.NetClientOptions;
+import io.vertx.core.net.NetSocket;
+import io.vertx.core.net.ProxyOptions;
+
+import java.util.Base64;
+
+/**
+ *
+ */
+public class HttpProxyVerticle extends AbstractVerticle {
+
+    private HttpClient httpClient;
+    private NetClient netClient;
+
+    @Override
+    public void start() {
+        ProxyOptions proxyOptions = new ProxyOptions().setHost("127.0.0.1").setPort(7890);
+        // 初始化 HTTP 客户端，用于向目标服务器发送 HTTP 请求
+        HttpClientOptions httpClientOptions = new HttpClientOptions();
+        httpClient = vertx.createHttpClient(httpClientOptions.setProxyOptions(proxyOptions));
+
+        // 创建并启动 HTTP 代理服务器，监听指定端口
+        HttpServer server = vertx.createHttpServer(new HttpServerOptions().setClientAuth(ClientAuth.REQUIRED));
+        server.requestHandler(this::handleClientRequest);
+
+        // 初始化 NetClient，用于在 CONNECT 请求中建立 TCP 连接隧道
+        netClient = vertx.createNetClient(new NetClientOptions()
+                .setProxyOptions(proxyOptions)
+                .setConnectTimeout(15000)
+                .setTrustAll(true));
+
+        // 启动 HTTP 代理服务器
+        server.listen(7891, ar -> {
+            if (ar.succeeded()) {
+                System.out.println("HTTP Proxy server started on port 7891");
+            } else {
+                System.err.println("Failed to start HTTP Proxy server: " + ar.cause());
+            }
+        });
+    }
+
+    // 处理 HTTP CONNECT 请求，用于代理 HTTPS 流量
+    private void handleConnectRequest(HttpServerRequest clientRequest) {
+        String[] uriParts = clientRequest.uri().split(":");
+        if (uriParts.length != 2) {
+            clientRequest.response().setStatusCode(400).end("Bad Request: Invalid URI format");
+            return;
+        }
+
+        // 解析目标主机和端口
+        String targetHost = uriParts[0];
+        int targetPort;
+        try {
+            targetPort = Integer.parseInt(uriParts[1]);
+        } catch (NumberFormatException e) {
+            clientRequest.response().setStatusCode(400).end("Bad Request: Invalid port");
+            return;
+        }
+        clientRequest.pause();
+        // 通过 NetClient 连接目标服务器并创建隧道
+        netClient.connect(targetPort, targetHost, connectionAttempt -> {
+            if (connectionAttempt.succeeded()) {
+                NetSocket targetSocket = connectionAttempt.result();
+
+                // 升级客户端连接到 NetSocket 并实现双向数据流
+                clientRequest.toNetSocket().onComplete(clientSocketAttempt -> {
+                    if (clientSocketAttempt.succeeded()) {
+                        NetSocket clientSocket = clientSocketAttempt.result();
+
+                        // 设置双向数据流转发
+                        clientSocket.handler(targetSocket::write);
+                        targetSocket.handler(clientSocket::write);
+
+                        // 关闭其中一方时关闭另一方
+                        clientSocket.closeHandler(v -> targetSocket.close());
+                        targetSocket.closeHandler(v -> clientSocket.close());
+                    } else {
+                        System.err.println("Failed to upgrade client connection to socket: " + clientSocketAttempt.cause().getMessage());
+                        targetSocket.close();
+                        clientRequest.response().setStatusCode(500).end("Internal Server Error");
+                    }
+                });
+            } else {
+                System.err.println("Failed to connect to target: " + connectionAttempt.cause().getMessage());
+                clientRequest.response().setStatusCode(502).end("Bad Gateway: Unable to connect to target");
+            }
+        });
+    }
+
+    // 处理客户端的 HTTP 请求
+    private void handleClientRequest(HttpServerRequest clientRequest) {
+        String s = clientRequest.headers().get("Proxy-Authorization");
+        if (s == null) {
+            clientRequest.response().setStatusCode(403).end();
+            return;
+        }
+        String[] split = new String(Base64.getDecoder().decode(s.replace("Basic ", ""))).split(":");
+        if (split.length > 1) {
+            System.out.println(split[0]);
+            System.out.println(split[1]);
+            // TODO
+        }
+
+
+        if (clientRequest.method() == HttpMethod.CONNECT) {
+            // 处理 CONNECT 请求
+            handleConnectRequest(clientRequest);
+        } else {
+            // 处理普通的 HTTP 请求
+            handleHttpRequest(clientRequest);
+        }
+    }
+
+    // 处理 HTTP 请求，转发至目标服务器并返回响应
+    private void handleHttpRequest(HttpServerRequest clientRequest) {
+        // 获取目标主机
+        String hostHeader = clientRequest.getHeader("Host");
+        if (hostHeader == null) {
+            clientRequest.response().setStatusCode(400).end("Host header is missing");
+            return;
+        }
+
+        String targetHost = hostHeader.split(":")[0];
+        int targetPort = 80; // 默认为 HTTP 的端口
+        clientRequest.pause(); // 暂停客户端请求的读取，避免数据丢失
+
+        httpClient.request(clientRequest.method(), targetPort, targetHost, clientRequest.uri())
+                .onSuccess(request -> {
+                    clientRequest.resume(); // 恢复客户端请求的读取
+
+                    // 逐个设置请求头
+                    clientRequest.headers().forEach(header -> request.putHeader(header.getKey(), header.getValue()));
+
+                    // 将客户端请求的 body 转发给目标服务器
+                    clientRequest.bodyHandler(body -> request.send(body, ar -> {
+                        if (ar.succeeded()) {
+                            var response = ar.result();
+                            clientRequest.response().setStatusCode(response.statusCode());
+                            clientRequest.response().headers().setAll(response.headers());
+                            response.body().onSuccess(b-> clientRequest.response().end(b));
+                        } else {
+                            clientRequest.response().setStatusCode(502).end("Bad Gateway: Unable to reach target");
+                        }
+                    }));
+                })
+                .onFailure(err -> {
+                    err.printStackTrace();
+                    clientRequest.response().setStatusCode(502).end("Bad Gateway: Request failed");
+                });
+    }
+
+    @Override
+    public void stop() {
+        // 停止 HTTP 客户端以释放资源
+        if (httpClient != null) {
+            httpClient.close();
+        }
+    }
+
+    /**
+     * TODO add Deploy
+     * @param args
+     */
+    public static void main(String[] args) {
+        // 配置 DNS 解析器，使用多个 DNS 服务器来提升解析速度
+        Vertx vertx = Vertx.vertx(new VertxOptions()
+                .setAddressResolverOptions(new AddressResolverOptions()
+                        .addServer("114.114.114.114")
+                        .addServer("114.114.115.115")
+                        .addServer("8.8.8.8")
+                        .addServer("8.8.4.4")));
+
+        // 部署 Verticle 并启动动态 HTTP 代理服务器
+        vertx.deployVerticle(new HttpProxyVerticle());
+    }
+}

core/src/main/java/cn/qaiu/vx/core/verticle/ReverseProxyVerticle.java

@@ -6,13 +6,13 @@ import io.vertx.core.Future;
 import io.vertx.core.Promise;
 import io.vertx.core.http.HttpClient;
 import io.vertx.core.http.HttpServer;
-import io.vertx.core.http.WebSocket;
+import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
+import io.vertx.core.net.PemKeyCertOptions;
+import io.vertx.ext.web.Route;
 import io.vertx.ext.web.Router;
 import io.vertx.ext.web.handler.StaticHandler;
-import io.vertx.ext.web.handler.sockjs.SockJSHandler;
-import io.vertx.ext.web.handler.sockjs.SockJSHandlerOptions;
 import io.vertx.ext.web.proxy.handler.ProxyHandler;
 import io.vertx.httpproxy.HttpProxy;
 import org.apache.commons.lang3.StringUtils;
@@ -40,14 +40,17 @@ public class ReverseProxyVerticle extends AbstractVerticle {
             .getJsonConfig(ConfigConstant.GLOBAL_CONFIG)
             .getString("proxyConf");
     private static final Future<JsonObject> CONFIG = ConfigUtil.readYamlConfig(PATH_PROXY_CONFIG);
-    private static final String DEFAULT_PATH_404 = "webroot/err/404.html";
+    private static final String DEFAULT_PATH_404 = "webroot/err/page404.html";
 
     private static String serverName = "Vert.x-proxy-server"; //Server name in Http response header
 
+    public static String REROUTE_PATH_PREFIX = "/__rrvpspp"; //re_route_vert_proxy_server_path_prefix 硬编码
+
 
     @Override
-    public void start(Promise<Void> startPromise) throws Exception {
+    public void start(Promise<Void> startPromise) {
         CONFIG.onSuccess(this::handleProxyConfList);
+//        createFileListener
         startPromise.complete();
     }
 
@@ -74,22 +77,24 @@ public class ReverseProxyVerticle extends AbstractVerticle {
      * @param proxyConf 代理配置
      */
     private void handleProxyConf(JsonObject proxyConf) {
-        // 404 path
-        if (proxyConf.containsKey("404")) {
+        // page404 path
+        if (proxyConf.containsKey(
+
+                "page404")) {
             System.getProperty("user.dir");
-            String path = proxyConf.getString("404");
+            String path = proxyConf.getString("page404");
             if (StringUtils.isEmpty(path)) {
-                proxyConf.put("404", DEFAULT_PATH_404);
+                proxyConf.put("page404", DEFAULT_PATH_404);
             } else {
                 if (!path.startsWith("/")) {
                     path = "/" + path;
                 }
                 if (!new File(System.getProperty("user.dir") + path).exists()) {
-                    proxyConf.put("404", DEFAULT_PATH_404);
+                    proxyConf.put("page404", DEFAULT_PATH_404);
                 }
             }
         } else {
-            proxyConf.put("404", DEFAULT_PATH_404);
+            proxyConf.put("page404", DEFAULT_PATH_404);
         }
 
         final HttpClient httpClient = VertxHolder.getVertxInstance().createHttpClient();
@@ -111,17 +116,10 @@ public class ReverseProxyVerticle extends AbstractVerticle {
             handleStatic(proxyConf.getJsonObject("static"), proxyRouter);
         }
 
-        // static server
-        if (proxyConf.containsKey("sock")) {
-            handleSock(proxyConf.getJsonArray("sock"), httpClient, proxyRouter);
-        }
+        // Send page404 page
+        proxyRouter.errorHandler(404, ctx -> ctx.response().sendFile(proxyConf.getString("page404")));
 
-        // Send 404 page
-        proxyRouter.errorHandler(404, ctx -> {
-            ctx.response().sendFile(proxyConf.getString("404"));
-        });
-
-        HttpServer server = vertx.createHttpServer();
+        HttpServer server = getHttpsServer(proxyConf);
         server.requestHandler(proxyRouter);
 
         Integer port = proxyConf.getInteger("listen");
@@ -129,6 +127,40 @@ public class ReverseProxyVerticle extends AbstractVerticle {
         server.listen(port);
     }
 
+    private HttpServer getHttpsServer(JsonObject proxyConf) {
+        HttpServerOptions httpServerOptions = new HttpServerOptions()
+        .setCompressionSupported(true);
+
+        if (proxyConf.containsKey("ssl")) {
+            JsonObject sslConfig = proxyConf.getJsonObject("ssl");
+
+            URL sslUrl = this.getClass().getClassLoader().getResource("");
+            if (sslUrl == null) {
+                throw new RuntimeException("SSL url not exist...");
+            }
+            if (sslConfig.containsKey("enable") && sslConfig.getBoolean("enable")) {
+                String sslCertificatePath = sslUrl.getPath() + sslConfig.getString("ssl_certificate");
+                String sslCertificateKeyPath = sslUrl.getPath() + sslConfig.getString("ssl_certificate_key");
+                LOGGER.info("enable ssl config. ");
+                httpServerOptions
+                        .setSsl(true)
+                        .setKeyCertOptions(
+                                new PemKeyCertOptions()
+                                        .setKeyPath(sslCertificateKeyPath)
+                                        .setCertPath(sslCertificatePath)
+                        ).addEnabledSecureTransportProtocol(sslConfig.getString("ssl_protocols"));
+                String sslCiphers = sslConfig.getString("ssl_ciphers");
+                if (sslCiphers != null && !sslCiphers.isEmpty()) {
+                    for (String s : sslCiphers.split(":")) {
+                        httpServerOptions.addEnabledCipherSuite(s);
+                    }
+                }
+            }
+
+        }
+        return vertx.createHttpServer(httpServerOptions);
+    }
+
     /**
      * 处理静态资源配置
      *
@@ -145,10 +177,14 @@ public class ReverseProxyVerticle extends AbstractVerticle {
             ctx.next();
         });
 
-        final StaticHandler staticHandler = StaticHandler.create();
+
+        StaticHandler staticHandler;
         if (staticConf.containsKey("root")) {
-            staticHandler.setWebRoot(staticConf.getString("root"));
+            staticHandler = StaticHandler.create(staticConf.getString("root"));
+        } else {
+            staticHandler = StaticHandler.create();
         }
+        
         if (staticConf.containsKey("directory-listing")) {
             staticHandler.setDirectoryListing(staticConf.getBoolean("directory-listing"));
         } else if (staticConf.containsKey("index")) {
@@ -178,7 +214,7 @@ public class ReverseProxyVerticle extends AbstractVerticle {
                     port = 80;
                 }
                 String originPath = url.getPath();
-                LOGGER.debug("Conf(path, originPath, host, port) ----> {},{},{},{}", path, originPath, host, port);
+                LOGGER.info("path {}, originPath {}, to {}:{}", path, originPath, host, port);
 
                 // 注意这里不能origin多个代理地址, 一个实例只能代理一个origin
                 final HttpProxy httpProxy = HttpProxy.reverseProxy(httpClient);
@@ -189,14 +225,21 @@ public class ReverseProxyVerticle extends AbstractVerticle {
 
                 // 代理目标路径为空 就像nginx一样路径穿透 (相对路径)
                 if (StringUtils.isEmpty(originPath) || path.equals(originPath)) {
-                    proxyRouter.route(path + "*").handler(ProxyHandler.create(httpProxy));
+                    Route route = path.startsWith("~") ? proxyRouter.routeWithRegex(path.substring(1))
+                            : proxyRouter.route(path);
+                    route.handler(ProxyHandler.create(httpProxy));
                 } else {
-                    proxyRouter.route(originPath + "*").handler(ProxyHandler.create(httpProxy));
-                    proxyRouter.route(path + "*").handler(ctx -> {
-                        String realPath = ctx.request().path();
-                        if (realPath.startsWith(path)) {
+                    // 配置 /api/, / => 请求 /api/test 代理后 /test
+                    // 配置 /api/, /xxx => 请求 /api/test 代理后 /xxx/test
+                    final String path0 = path;
+                    final String originPath0 = REROUTE_PATH_PREFIX + originPath;
+
+                    proxyRouter.route(originPath0 + "*").handler(ProxyHandler.create(httpProxy));
+                    proxyRouter.route(path0 + "*").handler(ctx -> {
+                        String realPath = ctx.request().uri();
+                        if (realPath.startsWith(path0)) {
                             // vertx web proxy暂不支持rewrite, 所以这里进行手动替换, 请求地址中的请求path前缀替换为originPath
-                            String rePath = realPath.replaceAll("^" + path, originPath);
+                            String rePath = realPath.replaceAll("^" + path0, originPath0);
                             ctx.reroute(rePath);
                         } else {
                             ctx.next();
@@ -210,54 +253,4 @@ public class ReverseProxyVerticle extends AbstractVerticle {
 
         });
     }
-
-    /**
-     * 处理websocket
-     *
-     * @param confList    sock配置
-     * @param httpClient  客户端
-     * @param proxyRouter 代理路由
-     */
-    private void handleSock(JsonArray confList, HttpClient httpClient, Router proxyRouter) {
-        // 代理规则
-        confList.stream().map(e -> (JsonObject) e).forEach(conf -> {
-
-            String origin = conf.getString("origin");
-            String path = conf.getString("path");
-            LOGGER.info("websocket proxy: {}, {}",origin,path);
-
-            SockJSHandlerOptions options = new SockJSHandlerOptions()
-                    .setHeartbeatInterval(2000)
-                    .setRegisterWriteHandler(true);
-
-            SockJSHandler sockJSHandler = SockJSHandler.create(VertxHolder.getVertxInstance(), options);
-            if (!path.startsWith("/")) {
-                path = "/" + path;
-            }
-
-
-            Router route = sockJSHandler.socketHandler(sock -> {
-                sock.handler(buffer -> {
-                    Future<WebSocket> webSocketFuture = httpClient.webSocket(8086,"127.0.0.1",sock.uri());
-                    webSocketFuture.onSuccess(s -> {
-                        System.out.println(buffer.toString());
-                        s.write(buffer).onSuccess(v -> {
-                            s.handler(w->{
-                                System.out.println("--------"+w.toString());
-                            });
-                        });
-                    });
-                });
-                sock.endHandler(v -> {
-
-                });
-                sock.closeHandler(v -> {
-
-                });
-            });
-            proxyRouter.mountSubRouter("/real/serverApi/test", route);
-        });
-
-
-    }
 }

core/src/main/java/cn/qaiu/vx/core/verticle/RouterVerticle.java

@@ -2,6 +2,7 @@ package cn.qaiu.vx.core.verticle;
 
 import cn.qaiu.vx.core.handlerfactory.RouterHandlerFactory;
 import cn.qaiu.vx.core.util.CommonUtil;
+import cn.qaiu.vx.core.util.JacksonConfig;
 import cn.qaiu.vx.core.util.SharedDataUtil;
 import io.vertx.core.AbstractVerticle;
 import io.vertx.core.Promise;
@@ -23,7 +24,6 @@ public class RouterVerticle extends AbstractVerticle {
 
     private static final int port = SharedDataUtil.getValueForServerConfig("port");
     private static final Router router = new RouterHandlerFactory(
-            SharedDataUtil.getJsonStringForCustomConfig("routerLocations"),
             SharedDataUtil.getJsonStringForServerConfig("contextPath")).createRouter();
 
     private static final JsonObject globalConfig = SharedDataUtil.getJsonConfig("globalConfig");
@@ -31,6 +31,8 @@ public class RouterVerticle extends AbstractVerticle {
     private HttpServer