From 8b84d281e778bbac7f884e985bc5e046a5071b9b Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Wed, 20 Dec 2023 17:05:45 +0800
Subject: [PATCH 1/8] .
---
.../docs/01.使用教程/02.使用须知/01.管理后台.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/01.管理后台.md b/neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/01.管理后台.md
index b5ddf3a4..6e5a2b34 100644
--- a/neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/01.管理后台.md
+++ b/neutrino-proxy-vuepress/docs/01.使用教程/02.使用须知/01.管理后台.md
@@ -44,4 +44,4 @@ article: false
- 登录日志:管理后端登录、退出登录的日志
- 客户端连接日志:客户端连接、断开的日志
-
\ No newline at end of file
+
From bf6b1767b3c7c1d0e2f636e524216a2b04529713 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 19 Feb 2024 18:19:44 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E7=AB=AFdocker=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E6=8C=87?=
=?UTF-8?q?=E5=AE=9A=E5=8F=82=E6=95=B0=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
neutrino-proxy-client/src/main/resources/app-copy.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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时开启才有效)
From c427213dfb67e3e5ae253e39c7f021c9e5f123e5 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Fri, 15 Mar 2024 18:31:31 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=A7=A3?=
=?UTF-8?q?=E5=86=B3native=E4=B8=8B=E6=B8=85=E7=90=86=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../server/base/NeutrinoServerRuntimeNativeRegistrar.java | 3 +++
1 file changed, 3 insertions(+)
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);
From da173f200585fa5f63a6ca4ec4cfa382d369d4d8 Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Tue, 9 Apr 2024 12:00:36 +0800
Subject: [PATCH 4/8] =?UTF-8?q?Revert=20"=E8=A7=A3=E5=86=B3=E5=90=8E?=
=?UTF-8?q?=E5=8F=B0=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E7=9A=84=E5=B7=B2?=
=?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
neutrino-proxy-admin/src/components/FBATable/index.vue | 2 +-
neutrino-proxy-admin/src/views/system/jobManager.vue | 2 +-
neutrino-proxy-admin/src/views/system/portGroup.vue | 2 +-
neutrino-proxy-admin/src/views/system/portPool.vue | 2 +-
neutrino-proxy-admin/src/views/system/securityGroup.vue | 4 ++--
neutrino-proxy-admin/src/views/system/securityRule.vue | 2 +-
neutrino-proxy-admin/src/views/system/user.vue | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
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 @@
Oz!-?0t#SwNV9323u0He5fL0<|jtk?$$-78jV60C9A
z6TIY4vv74L<&;Uxch+ 0s1Bmd>+uIEWzUg=3
zT6%;KDYQKTh;fL)yF5|oqt4zaD?K|a5Vf1wZiHiKUtd>CR6wAgnagPe7)a*M=dN_+
zHP(k18KCz26%P7#B5HdD`23K8)+NxxE5O5NhY1)?wL`6AYHz%oe>EZt5(&`xokylU
zc{KA2@bLA)fZ_XzlsbL^K0n0 N7ZRu Ewp`tkLQYgLXg8};|WmUGQN1_4@gt5Gmw|2JE{
zG|a*00gu|cUlcX^qjntFQzhZxy6AP!aDwM485K|ias969%mj93b`D!zjnHL-k?+Sj
z4knH*CP97I@MV+=55|1AgMr`vvL7`A+A_YKb0O)+2Ei3x+`+h&M&{6buyU-m}uS
zy&5pzk`#LB3qZSnA1+5j+;k2*Qwo1Z9?Y3#tEQKg%$I^I6uU^(Xe^#^vJi8
z)sNm~^)2*L{)xBaSe}ICid~z%L%SmMjlyOM`KBcgTQoSQkC8zatSMH`Xu>qA*2dl>
zrd5jPZcUweh@G=BHrpl>`5ZmjdZF02By2XTKtuAIr)SBR5%co|z`N=!cG(6+04x{b
zZ;&N;8~Nw>BpR^qv4%Spa+~oS@cEoaKe+lDKEkd@0B$>U*KhWBJ~|)YB6It5!mFwY
z>x#j3&J*eb8gc9dfOlynr$_xn)b`1lkHIwl4sQ`5rRe~C{gCIE?cBncuGf#-X{WhW
z*5t95?(|k}S%;-_Z%5laJw3fG_Ell5BmDVO-lY@4ha_I4OgEGbl2Bg}4s9_>%?>wA
zMy=jyyj`vC^=y=iwcj#YqU^deZ=V37>hW?w2eZO#_&3mN7*0hm-{h;~R)Zp!9-3F$IW;`KjulQO=+>+6uHp|E#Fr3m<>jWVeSN1sbnW
z8vMjvcM>wv64FXm;PyLtWmS2lL(cp3#{AA}jg0pW!RK@LG=A<7U
0;_c-e!KG|VmGDrcW#fJ9BL;3MgCD~Y_@g5F(Fa&%fj3K`ZsWo^
zg`t&B#?Q`a&{aF!boYn
ii&k7g6EIStuPivu;G11b456kAJ&KW@fv3RECN+f^vR
z=^xh5b^|0^lY_MILPN)|T@J)h4-SPz_T?W+-Dt#E$AvBdP4fIBuFh=2qom?|*wEyu$7ihPS(e${MgDO#Iq+Fsl5W
z2TskEp7>OSA+zPMlBFyr2(jMaJozs+>Rkd#MQYH93465cxwrV!JF>?byP&&E9vAUZ
z8U73gYoJUg_)L(fq|uiSwrGeWwh|>=2rg_a8a)9V$pJ0}P?|t2gN
希望继续完善界面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
-
-
+
+
From fe9dc467964cc2bc0173b2d0766460f36c97f0ba Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 6 May 2024 17:26:41 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=98=E7=BD=91?=
=?UTF-8?q?=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
neutrino-proxy-vuepress/package.json | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
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/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"
},
From c7c7afa8af9f14fba3726886754207e8bb805fef Mon Sep 17 00:00:00 2001
From: aoshiguchen <1052045476@qq.com>
Date: Mon, 6 May 2024 17:35:20 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0README?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 2c3aef28..1e8f5641 100644
--- a/README.md
+++ b/README.md
@@ -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、名称由来