From 4dd23134e4be306b4f3990b511c4f29e9b061cde Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Wed, 25 Oct 2023 11:23:38 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=96=B0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E3=80=81=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=BC=96=E8=AF=91?= =?UTF-8?q?/=E5=90=AF=E5=8A=A8=E8=84=9A=E6=9C=AC=202=E3=80=81=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=90=AF=E5=8A=A8=E5=8F=82=E6=95=B0=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/neutrinoproxy/client/ProxyClient.java | 12 ++++++------ scripts/unix/admin_build_dev.sh | 6 ++++++ scripts/unix/client_build.sh | 15 ++++++++------- scripts/unix/client_start.sh | 4 ++-- scripts/unix/server_build.sh | 15 ++++++++------- scripts/unix/server_start.sh | 4 ++-- 6 files changed, 32 insertions(+), 24 deletions(-) diff --git a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java index a22a9489..3f5d6628 100644 --- a/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java +++ b/neutrino-proxy-client/src/main/java/org/dromara/neutrinoproxy/client/ProxyClient.java @@ -16,12 +16,12 @@ public class ProxyClient { public static void main(String[] args) { Solon.start(ProxyClient.class, args, app -> { - setAlias("neutrino.proxy.tunnel.serverIp", "serverIp"); - setAlias("neutrino.proxy.tunnel.serverPort", "serverPort"); - setAlias("neutrino.proxy.tunnel.sslEnable", "sslEnable"); - setAlias("neutrino.proxy.tunnel.jksPath", "jksPath"); - setAlias("neutrino.proxy.tunnel.keyStorePassword", "keyStorePassword"); - setAlias("neutrino.proxy.tunnel.licenseKey", "licenseKey"); + setAlias("neutrino.proxy.tunnel.server-ip", "serverIp"); + setAlias("neutrino.proxy.tunnel.server-port", "serverPort"); + setAlias("neutrino.proxy.tunnel.ssl-enable", "sslEnable"); + setAlias("neutrino.proxy.tunnel.jks-path", "jksPath"); + setAlias("neutrino.proxy.tunnel.key-store-password", "keyStorePassword"); + setAlias("neutrino.proxy.tunnel.license-key", "licenseKey"); }); } diff --git a/scripts/unix/admin_build_dev.sh b/scripts/unix/admin_build_dev.sh index 37c3e5eb..55c27091 100644 --- a/scripts/unix/admin_build_dev.sh +++ b/scripts/unix/admin_build_dev.sh @@ -44,3 +44,9 @@ cp -rf ./neutrino-proxy-admin/dist $adminDeployDir/ cp -rf ./neutrino-proxy-admin/dist/ $giteePagesDir cd $serverDeployDir zip -r neutrino-proxy-admin.zip "neutrino-proxy-admin/" + +#拷贝到neutrino-proxy-server项目静态资源目录下 +cd ../.. +rm -rf ./neutrino-proxy-server/src/main/resources/static +mkdir -p neutrino-proxy-server/src/main/resources/static +cp -rf ./neutrino-proxy-admin/dist/ ./neutrino-proxy-server/src/main/resources/static diff --git a/scripts/unix/client_build.sh b/scripts/unix/client_build.sh index 889c19ce..08811217 100644 --- a/scripts/unix/client_build.sh +++ b/scripts/unix/client_build.sh @@ -1,7 +1,7 @@ #!/bin/sh # 中微子代理客户端编译打包脚本，基础参数请自行修改 -export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home +export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin @@ -11,12 +11,13 @@ clientDeployDir=$deployDir"/client" #切到项目根目录 cd ../.. #初始化文件夹 -if [ ! -d "$deployDir" ];then - mkdir $deployDir -fi -if [ ! -d "$clientDeployDir" ];then - mkdir $clientDeployDir -fi +#if [ ! -d "$deployDir" ];then +# mkdir $deployDir +#fi +#if [ ! -d "$clientDeployDir" ];then +# mkdir $clientDeployDir +#fi +mkdir -p $clientDeployDir rm -rf $clientDeployDir/neutrino-proxy-client.jar #客户端打包 mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true diff --git a/scripts/unix/client_start.sh b/scripts/unix/client_start.sh index 81ef6f56..add5d12a 100755 --- a/scripts/unix/client_start.sh +++ b/scripts/unix/client_start.sh @@ -1,8 +1,8 @@ #!/bin/sh # 中微子代理客户端启动脚本，基础参数请自行修改 -JAVA_OPS="-server -Xms256m -Xmx512m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/work/$NAME/heapError/" -export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home +JAVA_OPS="-server -Xms256m -Xmx512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/work/$NAME/heapError/" +export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home export PATH=:$PATH:$JAVA_HOME/bin export CLASSPATH=.:$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar mkdir -p /work/$NAME/heapError/ diff --git a/scripts/unix/server_build.sh b/scripts/unix/server_build.sh index 03193ca1..4f19e66a 100644 --- a/scripts/unix/server_build.sh +++ b/scripts/unix/server_build.sh @@ -1,7 +1,7 @@ #!/bin/sh # 中微子代理服务端编译打包脚本，基础参数请自行修改 -export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home +export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home export MAVEN_HOME=/Users/yangwen/my/service/maven/apache-maven-3.8.1 export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin @@ -11,12 +11,13 @@ serverDeployDir=$deployDir"/server" #切到项目根目录 cd ../.. #初始化文件夹 -if [ ! -d "$deployDir" ];then - mkdir $deployDir -fi -if [ ! -d "$serverDeployDir" ];then - mkdir $serverDeployDir -fi +#if [ ! -d "$deployDir" ];then +# mkdir $deployDir +#fi +#if [ ! -d "$serverDeployDir" ];then +# mkdir $serverDeployDir +#fi +mkdir -p $serverDeployDir rm -rf $serverDeployDir/neutrino-proxy-server.jar #服务端打包 diff --git a/scripts/unix/server_start.sh b/scripts/unix/server_start.sh index 07ad4fcd..14134200 100755 --- a/scripts/unix/server_start.sh +++ b/scripts/unix/server_start.sh @@ -1,8 +1,8 @@ #!/bin/sh # 中微子代理服务端启动脚本，基础参数请自行修改 -JAVA_OPS="-server -Xms256m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=256M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/work/$NAME/heapError/" -export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk1.8.0_151.jdk/Contents/Home +JAVA_OPS="-server -Xms256m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/work/$NAME/heapError/" +export JAVA_HOME=/Users/yangwen/my/service/graalvm/graalvm-community-openjdk-17.0.8+7.1/Contents/Home export PATH=:$PATH:$JAVA_HOME/bin export CLASSPATH=.:$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar mkdir -p /work/$NAME/heapError/