升级solon版本.

.github/workflows/linux_mac_native.yml

@@ -1,7 +1,7 @@
 name: Build linux and mac native image
 
 on:
-  workflow_dispatch: 
+  workflow_dispatch:
   push:
     tags:
       - 'v*'
@@ -12,7 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         # see: https://docs.github.com/zh/actions/using-jobs/choosing-the-runner-for-a-job
-        os: ['ubuntu-20.04', 'macos-12']
+#        os: ['ubuntu-20.04', 'macos-12']
+        os: ['ubuntu-20.04']
     name: build - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     # https://github.com/softprops/action-gh-release/issues/236#issuecomment-1150530128
@@ -81,4 +82,4 @@ jobs:
           neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
           neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
         prerelease: true
-        token: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -58,10 +58,10 @@ public class DBInitialize implements EventListener<AppLoadEndEvent> {
 
 	@Init
 	public void init() throws Throwable {
-        // aot 阶段，不初始化数据库
+//        // aot 阶段，不初始化数据库
-        if (NativeDetector.isAotRuntime()) {
+//        if (NativeDetector.isAotRuntime()) {
-            return;
+//            return;
-        }
+//        }
 		Assert.notNull(dbConfig.getType(), "neutrino.data.db.type不能为空!");
 		dbTypeEnum = DbTypeEnum.of(dbConfig.getType());
 		Assert.notNull(dbTypeEnum, "neutrino.data.db.type取值异常!");

pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.5.12-SNAPSHOT</version>
+        <version>2.5.12-M1</version>
         <relativePath />
     </parent>
 

scripts/unix/client_build.sh

@@ -11,15 +11,20 @@ clientDeployDir=$deployDir"/client"
 #切到项目根目录
 cd ../..
 #初始化文件夹
-#if [ ! -d "$deployDir" ];then
-#  mkdir $deployDir
-#fi
-#if [ ! -d "$clientDeployDir" ];then
-#  mkdir $clientDeployDir
-#fi
 mkdir -p $clientDeployDir
 rm -rf $clientDeployDir/neutrino-proxy-client.jar
+rm -rf $clientDeployDir/neutrino-proxy-client-jar
+rm -rf $clientDeployDir/neutrino-proxy-client-jar.zip
+
 #客户端打包
 mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true
 # 拷贝到deploy目录下
 cp ./neutrino-proxy-client/target/neutrino-proxy-client.jar $clientDeployDir/neutrino-proxy-client.jar
+
+#打zip包，用于发版
+cd $clientDeployDir
+mkdir neutrino-proxy-client-jar
+cp ../../neutrino-proxy-client/target/neutrino-proxy-client.jar ./neutrino-proxy-client-jar/neutrino-proxy-client.jar
+cp ../../neutrino-proxy-client/src/main/resources/app.yml ./neutrino-proxy-client-jar/app.yml
+zip -r neutrino-proxy-client-jar.zip ./neutrino-proxy-client-jar
+rm -rf $clientDeployDir/neutrino-proxy-client-jar

scripts/unix/client_native_build.sh

@@ -7,6 +7,7 @@ export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
 deployDir="deploy"
 clientDeployDir=$deployDir"/client"
+machine=macos
 
 #切到项目根目录
 cd ../..
@@ -16,6 +17,10 @@ mkdir -p $clientDeployDir
 # 删除原来的编译文件
 rm -rf $clientDeployDir/neutrino-proxy-client.jar
 rm -rf $clientDeployDir/neutrino-proxy-client
+rm -rf $clientDeployDir/neutrino-proxy-client-jar
+rm -rf $clientDeployDir/neutrino-proxy-client-jar.zip
+rm -rf $clientDeployDir/neutrino-proxy-client-${machine}-native
+rm -rf $clientDeployDir/neutrino-proxy-client-${machine}-native.zip
 
 #客户端打包
 mvn clean install -U -pl neutrino-proxy-client -am -Dmaven.test.skip=true
@@ -23,7 +28,25 @@ cd neutrino-proxy-client
 mvn clean native:compile -P native -DskipTests
 cd ..
 
+# 给执行权限
+chmod +x ./neutrino-proxy-client/target/neutrino-proxy-client
+
 # 拷贝到deploy目录下
 cp ./neutrino-proxy-client/target/neutrino-proxy-client.jar $clientDeployDir/neutrino-proxy-client.jar
 cp ./neutrino-proxy-client/target/neutrino-proxy-client $clientDeployDir/neutrino-proxy-client
 
+#打zip包，用于发版
+cd $clientDeployDir
+## jar
+mkdir neutrino-proxy-client-jar
+cp ../../neutrino-proxy-client/target/neutrino-proxy-client.jar ./neutrino-proxy-client-jar/neutrino-proxy-client.jar
+cp ../../neutrino-proxy-client/src/main/resources/app.yml ./neutrino-proxy-client-jar/app.yml
+zip -r neutrino-proxy-client-jar.zip ./neutrino-proxy-client-jar
+rm -rf ./neutrino-proxy-client-jar
+
+## native
+mkdir neutrino-proxy-client-${machine}-native
+cp ../../neutrino-proxy-client/target/neutrino-proxy-client ./neutrino-proxy-client-${machine}-native/neutrino-proxy-client
+cp ../../neutrino-proxy-client/src/main/resources/app.yml ./neutrino-proxy-client-${machine}-native/app.yml
+zip -r neutrino-proxy-client-${machine}-native.zip ./neutrino-proxy-client-${machine}-native
+rm -rf ./neutrino-proxy-client-${machine}-native

scripts/unix/server_build.sh

@@ -11,16 +11,20 @@ serverDeployDir=$deployDir"/server"
 #切到项目根目录
 cd ../..
 #初始化文件夹
-#if [ ! -d "$deployDir" ];then
-#  mkdir $deployDir
-#fi
-#if [ ! -d "$serverDeployDir" ];then
-#  mkdir $serverDeployDir
-#fi
 mkdir -p $serverDeployDir
 rm -rf $serverDeployDir/neutrino-proxy-server.jar
+rm -rf $serverDeployDir/neutrino-proxy-server-jar
+rm -rf $serverDeployDir/neutrino-proxy-server-jar.zip
 
 #服务端打包
 mvn clean install -U -pl neutrino-proxy-server -am -Dmaven.test.skip=true
 # 拷贝到deploy目录下
 cp ./neutrino-proxy-server/target/neutrino-proxy-server.jar $serverDeployDir/neutrino-proxy-server.jar
+
+#打zip包，用于发版
+cd $serverDeployDir
+mkdir neutrino-proxy-server-jar
+cp ../../neutrino-proxy-server/target/neutrino-proxy-server.jar ./neutrino-proxy-server-jar/neutrino-proxy-server.jar
+cp ../../neutrino-proxy-server/src/main/resources/app.yml ./neutrino-proxy-server-jar/app.yml
+zip -r neutrino-proxy-server-jar.zip ./neutrino-proxy-server-jar
+rm -rf $serverDeployDir/neutrino-proxy-server-jar

scripts/unix/server_native_build.sh

@@ -7,6 +7,7 @@ export PATH=:$PATH:$JAVA_HOME/bin:$MAVEN_HOME/bin
 
 deployDir="deploy"
 serverDeployDir=$deployDir"/server"
+machine=macos
 
 #切到项目根目录
 cd ../..
@@ -16,6 +17,10 @@ mkdir -p $serverDeployDir
 # 删除原来的编译文件
 rm -rf $serverDeployDir/neutrino-proxy-server.jar
 rm -rf $serverDeployDir/neutrino-proxy-server
+rm -rf $serverDeployDir/neutrino-proxy-server-jar
+rm -rf $serverDeployDir/neutrino-proxy-server-jar.zip
+rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native
+rm -rf $serverDeployDir/neutrino-proxy-server-${machine}-native.zip
 
 # 不需要每次都重新编译一次前端代码，如果前端代码有变更，编译前需要手动执行`admin_build_docker.sh`
 ##前端页面打包
@@ -32,7 +37,25 @@ cd neutrino-proxy-server
 mvn clean native:compile -P native -DskipTests
 cd ..
 
+# 给执行权限
+chmod +x ./neutrino-proxy-server/target/neutrino-proxy-server
+
 # 拷贝到deploy目录下
 cp ./neutrino-proxy-server/target/neutrino-proxy-server.jar $serverDeployDir/neutrino-proxy-server.jar
 cp ./neutrino-proxy-server/target/neutrino-proxy-server $serverDeployDir/neutrino-proxy-server
 
+#打zip包，用于发版
+cd $serverDeployDir
+## jar
+mkdir neutrino-proxy-server-jar
+cp ../../neutrino-proxy-server/target/neutrino-proxy-server.jar ./neutrino-proxy-server-jar/neutrino-proxy-server.jar
+cp ../../neutrino-proxy-server/src/main/resources/app.yml ./neutrino-proxy-server-jar/app.yml
+zip -r neutrino-proxy-server-jar.zip ./neutrino-proxy-server-jar
+rm -rf ./neutrino-proxy-server-jar
+
+## native
+mkdir neutrino-proxy-server-${machine}-native
+cp ../../neutrino-proxy-server/target/neutrino-proxy-server ./neutrino-proxy-server-${machine}-native/neutrino-proxy-server
+cp ../../neutrino-proxy-server/src/main/resources/app.yml ./neutrino-proxy-server-${machine}-native/app.yml
+zip -r neutrino-proxy-server-${machine}-native.zip ./neutrino-proxy-server-${machine}-native
+rm -rf ./neutrino-proxy-server-${machine}-native