Merge remote-tracking branch 'origin/dev' into dev

.gitignore

@@ -54,6 +54,7 @@ hs_err_pid*
 
 **/memo/**
 
+neutrino-proxy-vuepress/deploy
 neutrino-proxy-vuepress/deploy.sh
 .NEUTRINO_PROXY_CLIENT_ID
 logs

README.md

@@ -4,8 +4,8 @@
 <p align="center">
   <a href='https://gitee.com/dromara/neutrino-proxy/stargazers'><img src='https://gitee.com/dromara/neutrino-proxy/badge/star.svg?theme=dark' alt='star'></img></a>
 <a href='https://gitee.com/dromara/neutrino-proxy/members'><img src='https://gitee.com/dromara/neutrino-proxy/badge/fork.svg?theme=dark' alt='fork'></img></a>
-<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk17-downloads.html">
-    <img src="https://img.shields.io/badge/JDK-17+-red.svg" />
+<a target="_blank" href="https://www.oracle.com/java/technologies/javase/javase-jdk21-downloads.html">
+    <img src="https://img.shields.io/badge/JDK-21+-red.svg" />
 </a>
 <a href="./LICENSE">
     <img src="https://img.shields.io/badge/license-MIT-red" alt="license MIT">
@@ -18,6 +18,7 @@
 - 遵循MIT许可，因此您可以对它进行复制、修改、传播并用于任何个人或商业行为。
 - 官网地址1：https://neutrino-proxy.dromara.org
 - 官网地址2：https://dromara.gitee.io/neutrino-proxy
+- 官网地址3：https://neutrino-proxy-docs.asgc.fun
 - 快速上手请[点击这里](https://dromara.gitee.io/neutrino-proxy/pages/793dcb)
 
 # 2、名称由来

neutrino-proxy-admin/src/components/FBATable/index.vue

@@ -50,7 +50,7 @@
         :hide-on-single-pageInfo="false"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :current-pageInfo="PaginationData.currentPage"
+        :current-page="PaginationData.currentPage"
         :pageInfo-sizes="[10, 20, 50, 100]"
         :pageInfo-size="PaginationData.pageSize"
         layout="total, sizes, prev, pager, next, jumper"

neutrino-proxy-admin/src/views/system/jobManager.vue

@@ -51,7 +51,7 @@
       </el-table-column>
     </el-table>
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/system/portGroup.vue

@@ -58,7 +58,7 @@
 
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                     :current-pageInfo.sync="listQuery.current"
+                     :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size"
                      layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>

neutrino-proxy-admin/src/views/system/portPool.vue

@@ -55,7 +55,7 @@
     </el-table>
 
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/system/securityGroup.vue

@@ -80,7 +80,7 @@
 
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                     :current-pageInfo.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
+                     :current-page.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
                      layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>
@@ -176,7 +176,7 @@
 
       <div class="pagination-container">
         <el-pagination background @size-change="handlePortMappingSizeChange" @current-change="handlePortMappingCurrentChange"
-          :current-pageInfo.sync="portMappingListQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="portMappingListQuery.size"
+          :current-page.sync="portMappingListQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="portMappingListQuery.size"
           layout="total, sizes, prev, pager, next, jumper" :total="portMappingTotal">
         </el-pagination>
       </div>

neutrino-proxy-admin/src/views/system/securityRule.vue

@@ -81,7 +81,7 @@
 
     <div class="pagination-container">
       <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                     :current-pageInfo.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
+                     :current-page.sync="listQuery.current" :pageInfo-sizes="[10, 20, 30, 50]" :pageInfo-size="listQuery.size"
                      layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-admin/src/views/system/user.vue

@@ -50,7 +50,7 @@
     </el-table>
 
     <div class="pagination-container">
-      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-pageInfo.sync="listQuery.current"
+      <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="listQuery.current"
                      :pageInfo-sizes="[10,20,30, 50]" :pageInfo-size="listQuery.size" layout="total, sizes, prev, pager, next, jumper" :total="total">
       </el-pagination>
     </div>

neutrino-proxy-client/src/main/resources/app-copy.yml

@@ -11,13 +11,13 @@ neutrino:
       key-store-password: 123456
       jks-path: classpath:/test.jks
       # 服务端IP
-      server-ip: localhost
+      server-ip: ${SERVER_IP:localhost}
       # 服务端端口(对应服务端app.yml中的tunnel.port、tunnel.ssl-port)
-      server-port: 9002
+      server-port: ${SERVER_PORT:9002}
       # 是否启用SSL(注意：该配置必须和server-port对应上)
-      ssl-enable: true
+      ssl-enable: ${SSL_ENABLE:true}
       # 客户端连接唯一凭证
-      license-key:
+      license-key: ${LICENSE_KEY:}
       # 客户端唯一身份标识（可忽略，若不设置首次启动会自动生成）
       client-id:
       # 是否开启隧道传输报文日志(日志级别为debug时开启才有效)

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java

@@ -47,7 +47,10 @@ public class NeutrinoServerRuntimeNativeRegistrar implements RuntimeNativeRegist
         metadata.registerLambdaSerialization(FlowReportMinuteMapper.class);
         metadata.registerLambdaSerialization(FlowReportMonthMapper.class);
         metadata.registerLambdaSerialization(JobInfoMapper.class);
+        metadata.registerLambdaSerialization(JobLogMapper.class);
         metadata.registerLambdaSerialization(PortMappingMapper.class);
+        metadata.registerLambdaSerialization(PortGroupMapper.class);
+        metadata.registerLambdaSerialization(ReportMapper.class);
         metadata.registerLambdaSerialization(PortPoolMapper.class);
         metadata.registerLambdaSerialization(UserLoginRecordMapper.class);
         metadata.registerLambdaSerialization(UserMapper.class);

neutrino-proxy-vuepress/docs/03.支持我们/99.赞赏公示/99.2024年.md

@@ -0,0 +1,20 @@
+---
+title: 2024年
+date: 2024-04-16 19:22:05
+permalink: /pages/acdf0a/
+---
+
+
+| 日期         | 渠道 | 金额   |昵称| 备注                                    |
+|:-----------|:---|:-----|:-|:--------------------------------------|
+| 2024-04-16 |微信转账|100|暮光：城中城|                                       |
+| 2024-04-03 |微信转账|100|仲秀| 大神，非常感谢                               |
+| 2024-03-24 |Gitee捐助|10|include|
+| 2024-03-24 |微信赞赏码|9|宗| 麻烦了，最好能加一个返回公网IP。<br/>不知道有没有几乎通用的方案   |
+| 2024-03-22 |微信红包|20|不允| 请你吃外卖                                 |
+| 2024-03-12 |微信红包|50|喜鸽小宝|
+| 2024-02-12 |微信红包|50|喜鸽小宝|
+| 2024-02-02 |微信红包|38.88|不请自来君|
+| 2024-01-24 |Gitee捐助|30|唐吉诃德| 感谢您的开源项目！是一个不错的项目！<br/>希望继续完善界面UI的设计。 |
+| 2024-01-20 |微信红包|shiyongsway|8.88|
+| 2024-01-17 |微信红包|50|喜鸽小宝|                                       |

neutrino-proxy-vuepress/docs/index.md

@@ -148,11 +148,15 @@ postList: none
     <div class="card-list">
         <a href="https://www.xigexb.com?from=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#102863;--random-color:#102863;color:#FFFFFF;">
             <img src="img/sponsor/xigexiaobao.jpg" class="no-zoom"> 
-            <div><p class="name">喜鸽小宝</p> <p class="desc">一个爱好写代码的同学。</p></div>
+            <div><p class="name">喜鸽小宝</p> <p class="desc">一个爱好写代码的同学。<br/>&nbsp;</p></div>
         </a>
         <a href="https://7bu.top?from=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#c6ddff;--random-color:#c6ddff;color:#000000;">
             <img src="img/sponsor/7bu.ico" class="no-zoom"> 
-            <div><p class="name">去不图床</p> <p class="desc">杜老师说旗下付费图片外链平台。</p></div>
+            <div><p class="name">去不图床</p> <p class="desc">杜老师说旗下付费图片外链平台。<br/>&nbsp;</p></div>
+        </a>
+        <a href="http://doc.zyplayer.com/#/integrate/zyplayer-doc?utm=neutrino-proxy" target="_blank" class="card-item row-3" style="background-color:#486898;--random-color:#c6ddff;color:#FFFFFF;">
+            <img src="img/sponsor/zyplayer-doc.png" class="no-zoom"> 
+            <div><p class="name">zyplayer-doc</p> <p class="desc">私有化部署的企业级文档管理与知识库AI问答平台。</p></div>
         </a>
     </div>
 </div>

neutrino-proxy-vuepress/package.json

@@ -4,8 +4,8 @@
   "scripts": {
     "dev": "vuepress dev docs",
     "build": "vuepress build docs",
-    "buildAndDeploy": "vuepress build docs && bash deploy.sh",
-    "deploy": "bash deploy.sh",
+    "buildAndDeploy": "vuepress build docs && bash deploy/deploy2.sh",
+    "deploy": "bash deploy/deploy2.sh",
     "updateTheme": "yarn remove vuepress-theme-vdoing && rm -rf node_modules && yarn && yarn add vuepress-theme-vdoing -D",
     "editFm": "node utils/editFrontmatter.js"
   },