diff --git a/.gitignore b/.gitignore index cfef0ef9..3761a8e3 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ hs_err_pid* **/memo/** +neutrino-proxy-vuepress/deploy neutrino-proxy-vuepress/deploy.sh .NEUTRINO_PROXY_CLIENT_ID logs diff --git a/README.md b/README.md index 72e1d819..1e8f5641 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@

star fork - - + + 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、名称由来 diff --git a/neutrino-proxy-admin/src/components/FBATable/index.vue b/neutrino-proxy-admin/src/components/FBATable/index.vue index b9907fd4..c53de15e 100644 --- a/neutrino-proxy-admin/src/components/FBATable/index.vue +++ b/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" diff --git a/neutrino-proxy-admin/src/views/system/jobManager.vue b/neutrino-proxy-admin/src/views/system/jobManager.vue index d1854138..0233714e 100644 --- a/neutrino-proxy-admin/src/views/system/jobManager.vue +++ b/neutrino-proxy-admin/src/views/system/jobManager.vue @@ -51,7 +51,7 @@

-
diff --git a/neutrino-proxy-admin/src/views/system/portGroup.vue b/neutrino-proxy-admin/src/views/system/portGroup.vue index 74c7fe62..47e32f33 100644 --- a/neutrino-proxy-admin/src/views/system/portGroup.vue +++ b/neutrino-proxy-admin/src/views/system/portGroup.vue @@ -58,7 +58,7 @@
diff --git a/neutrino-proxy-admin/src/views/system/portPool.vue b/neutrino-proxy-admin/src/views/system/portPool.vue index 014a6973..61b3b9b5 100644 --- a/neutrino-proxy-admin/src/views/system/portPool.vue +++ b/neutrino-proxy-admin/src/views/system/portPool.vue @@ -55,7 +55,7 @@
-
diff --git a/neutrino-proxy-admin/src/views/system/securityGroup.vue b/neutrino-proxy-admin/src/views/system/securityGroup.vue index 0a8156f4..370ca0a2 100644 --- a/neutrino-proxy-admin/src/views/system/securityGroup.vue +++ b/neutrino-proxy-admin/src/views/system/securityGroup.vue @@ -80,7 +80,7 @@
@@ -176,7 +176,7 @@
diff --git a/neutrino-proxy-admin/src/views/system/securityRule.vue b/neutrino-proxy-admin/src/views/system/securityRule.vue index dbc77901..b4d7e36f 100644 --- a/neutrino-proxy-admin/src/views/system/securityRule.vue +++ b/neutrino-proxy-admin/src/views/system/securityRule.vue @@ -81,7 +81,7 @@
diff --git a/neutrino-proxy-admin/src/views/system/user.vue b/neutrino-proxy-admin/src/views/system/user.vue index 2b195210..a9250f61 100644 --- a/neutrino-proxy-admin/src/views/system/user.vue +++ b/neutrino-proxy-admin/src/views/system/user.vue @@ -50,7 +50,7 @@
-
diff --git a/neutrino-proxy-client/src/main/resources/app-copy.yml b/neutrino-proxy-client/src/main/resources/app-copy.yml index e3c6a8cc..8979fc28 100644 --- a/neutrino-proxy-client/src/main/resources/app-copy.yml +++ b/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时开启才有效) diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java index 91440ee1..19306ba2 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/NeutrinoServerRuntimeNativeRegistrar.java +++ b/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); diff --git a/neutrino-proxy-vuepress/docs/.vuepress/public/img/sponsor/zyplayer-doc.jpg b/neutrino-proxy-vuepress/docs/.vuepress/public/img/sponsor/zyplayer-doc.jpg new file mode 100755 index 00000000..379224c1 Binary files /dev/null and b/neutrino-proxy-vuepress/docs/.vuepress/public/img/sponsor/zyplayer-doc.jpg differ diff --git a/neutrino-proxy-vuepress/docs/.vuepress/public/img/sponsor/zyplayer-doc.png b/neutrino-proxy-vuepress/docs/.vuepress/public/img/sponsor/zyplayer-doc.png new file mode 100755 index 00000000..ba6ef621 Binary files /dev/null and b/neutrino-proxy-vuepress/docs/.vuepress/public/img/sponsor/zyplayer-doc.png differ diff --git a/neutrino-proxy-vuepress/docs/03.支持我们/99.赞赏公示/99.2024年.md b/neutrino-proxy-vuepress/docs/03.支持我们/99.赞赏公示/99.2024年.md new file mode 100644 index 00000000..19c7e125 --- /dev/null +++ b/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。
不知道有没有几乎通用的方案 | +| 2024-03-22 |微信红包|20|不允| 请你吃外卖 | +| 2024-03-12 |微信红包|50|喜鸽小宝| +| 2024-02-12 |微信红包|50|喜鸽小宝| +| 2024-02-02 |微信红包|38.88|不请自来君| +| 2024-01-24 |Gitee捐助|30|唐吉诃德| 感谢您的开源项目！是一个不错的项目！
希望继续完善界面UI的设计。 | +| 2024-01-20 |微信红包|shiyongsway|8.88| +| 2024-01-17 |微信红包|50|喜鸽小宝| | diff --git a/neutrino-proxy-vuepress/docs/index.md b/neutrino-proxy-vuepress/docs/index.md index 00cb34dd..202ce2b8 100644 --- a/neutrino-proxy-vuepress/docs/index.md +++ b/neutrino-proxy-vuepress/docs/index.md @@ -148,11 +148,15 @@ postList: none
-

喜鸽小宝

一个爱好写代码的同学。

+

喜鸽小宝

一个爱好写代码的同学。
 

 -

去不图床

杜老师说旗下付费图片外链平台。

+

去不图床

杜老师说旗下付费图片外链平台。
 

+ + + +

zyplayer-doc

私有化部署的企业级文档管理与知识库AI问答平台。
diff --git a/neutrino-proxy-vuepress/package.json b/neutrino-proxy-vuepress/package.json index 3c36a424..5cb6bba4 100644 --- a/neutrino-proxy-vuepress/package.json +++ b/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" },