[shell-release]release version 3.1.0

94fzb · Jul 19, 2024 · 25cf751 · 25cf751
1 parent 84d4241
commit 25cf751
Show file tree

Hide file tree

Showing 507 changed files with 38,180 additions and 6,814 deletions.
diff --git a/.github/REAMD.md b/.github/REAMD.md
@@ -0,0 +1,16 @@
+```yaml
+      - name: Cache node modules admin
+        uses: actions/cache@v3
+        with:
+          path: admin-web/src/main/frontend/node_modules
+          key: ${{ runner.os }}-node-admin-${{ hashFiles('admin-web/src/main/frontend/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-admin-
+      - name: Cache node modules blog
+        uses: actions/cache@v3
+        with:
+          path: blog-web/src/main/frontend/node_modules
+          key: ${{ runner.os }}-node-blog-${{ hashFiles('blog-web/src/main/frontend/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node-blog-
+```
diff --git a/.github/workflows/build-preview-packge.yml → ...b/workflows/build-preview-package-jar.yml b/.github/workflows/build-preview-packge.yml → ...b/workflows/build-preview-package-jar.yml
@@ -1,4 +1,4 @@
-name: ZrLog build preview package
+name: build preview jar
 on:
   push:
     branches:

diff --git a/.github/workflows/build-release-packge.yml → ...b/workflows/build-release-package-jar.yml b/.github/workflows/build-release-packge.yml → ...b/workflows/build-release-package-jar.yml
@@ -1,4 +1,4 @@
-name: ZrLog build release package
+name: build release jar
 on:
   push:
     branches:

diff --git a/.github/workflows/macos-amd64-build-preview-native.yml b/.github/workflows/macos-amd64-build-preview-native.yml
@@ -0,0 +1,32 @@
+name: build on macos amd64 preview native
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    name: ZrLog on ${{ matrix.os }} ${{ matrix.architecture }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ macos-13 ]
+        architecture: [ x86_64 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
+          cache: 'maven'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'true'
+
+      - name: Build and upload binary
+        run: |
+          brew install coreutils
+          mkdir -p /tmp/download
+          bash -e bin/build-final-native.sh preview 预览版 /tmp/download unix
+          bash -e bin/upload-bin.sh ${{ secrets.SECRET_ID }} ${{ secrets.SECRET_KEY }} ${{ secrets.BUCKET }} /tmp/download preview
diff --git a/.github/workflows/macos-amd64-build-release-native.yml b/.github/workflows/macos-amd64-build-release-native.yml
@@ -0,0 +1,32 @@
+name: build on macos amd64 release native
+on:
+  push:
+    branches:
+      - release
+jobs:
+  build:
+    name: ZrLog on ${{ matrix.os }} ${{ matrix.architecture }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ macos-13 ]
+        architecture: [ x86_64 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
+          cache: 'maven'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'true'
+
+      - name: Build and upload binary
+        run: |
+          brew install coreutils
+          mkdir -p /tmp/download
+          bash -e bin/build-final-native.sh release 正式版本 /tmp/download unix
+          bash -e bin/upload-bin.sh ${{ secrets.SECRET_ID }} ${{ secrets.SECRET_KEY }} ${{ secrets.BUCKET }} /tmp/download release
diff --git a/.github/workflows/macos-arm64-build-preview-native.yml b/.github/workflows/macos-arm64-build-preview-native.yml
@@ -0,0 +1,32 @@
+name: build on macos arm64 preview native
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    name: ZrLog on ${{ matrix.os }} ${{ matrix.architecture }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ macos-latest ]
+        architecture: [ arm64 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
+          cache: 'maven'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'true'
+
+      - name: Build and upload binary
+        run: |
+          brew install coreutils
+          mkdir -p /tmp/download
+          bash -e bin/build-final-native.sh preview 预览版 /tmp/download unix
+          bash -e bin/upload-bin.sh ${{ secrets.SECRET_ID }} ${{ secrets.SECRET_KEY }} ${{ secrets.BUCKET }} /tmp/download preview
diff --git a/.github/workflows/macos-arm64-build-release-native.yml b/.github/workflows/macos-arm64-build-release-native.yml
@@ -0,0 +1,32 @@
+name: build on macos arm64 release native
+on:
+  push:
+    branches:
+      - release
+jobs:
+  build:
+    name: ZrLog on ${{ matrix.os }} ${{ matrix.architecture }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ macos-latest ]
+        architecture: [ arm64 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
+          cache: 'maven'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'true'
+
+      - name: Build and upload binary
+        run: |
+          brew install coreutils
+          mkdir -p /tmp/download
+          bash -e bin/build-final-native.sh release 正式版本 /tmp/download unix
+          bash -e bin/upload-bin.sh ${{ secrets.SECRET_ID }} ${{ secrets.SECRET_KEY }} ${{ secrets.BUCKET }} /tmp/download release
diff --git a/.github/workflows/ubuntu-amd64-build-preview-native.yml b/.github/workflows/ubuntu-amd64-build-preview-native.yml
@@ -0,0 +1,31 @@
+name: build on Linux amd64 preview native
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    name: ZrLog on ${{ matrix.os }} ${{ matrix.architecture }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ ubuntu-20.04 ]
+        architecture: [ amd64 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
+          cache: 'maven'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'true'
+
+      - name: Build and upload binary
+        run: |
+          mkdir -p /tmp/download
+          bash -e bin/build-final-native.sh preview 预览版 /tmp/download unix
+          bash -e bin/upload-bin.sh ${{ secrets.SECRET_ID }} ${{ secrets.SECRET_KEY }} ${{ secrets.BUCKET }} /tmp/download preview
diff --git a/.github/workflows/ubuntu-amd64-build-release-native.yml b/.github/workflows/ubuntu-amd64-build-release-native.yml
@@ -0,0 +1,31 @@
+name: build on Linux amd64 release native
+on:
+  push:
+    branches:
+      - release
+jobs:
+  build:
+    name: ZrLog on ${{ matrix.os }} ${{ matrix.architecture }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ ubuntu-20.04 ]
+        architecture: [ amd64 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
+          cache: 'maven'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'true'
+
+      - name: Build and upload binary
+        run: |
+          mkdir -p /tmp/download
+          bash -e bin/build-final-native.sh release 正式版本 /tmp/download unix
+          bash -e bin/upload-bin.sh ${{ secrets.SECRET_ID }} ${{ secrets.SECRET_KEY }} ${{ secrets.BUCKET }} /tmp/download release
diff --git a/.github/workflows/windows-amd64-build-preview-native.yml b/.github/workflows/windows-amd64-build-preview-native.yml
@@ -0,0 +1,31 @@
+name: build on Windows amd64 preview native
+on:
+  push:
+    branches:
+      - master
+jobs:
+  build:
+    name: ZrLog on ${{ matrix.os }} ${{ matrix.architecture }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ windows-latest ]
+        architecture: [ x86 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
+          cache: 'maven'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'true'
+
+      - name: Build and upload binary
+        run: |
+          mkdir -p /tmp/download
+          bash -e bin/build-final-native.sh preview 预览版 /tmp/download windows
+          bash -e bin/upload-bin-windows.sh ${{ secrets.SECRET_ID }} ${{ secrets.SECRET_KEY }} ${{ secrets.BUCKET }} /tmp/download preview
diff --git a/.github/workflows/windows-amd64-build-release-native.yml b/.github/workflows/windows-amd64-build-release-native.yml
@@ -0,0 +1,31 @@
+name: build on Windows amd64 release native
+on:
+  push:
+    branches:
+      - release
+jobs:
+  build:
+    name: ZrLog on ${{ matrix.os }} ${{ matrix.architecture }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ windows-latest ]
+        architecture: [ x86 ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: '21'
+          distribution: 'graalvm' # See 'Options' for all available distributions
+          cache: 'maven'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          native-image-job-reports: 'true'
+
+      - name: Build and upload binary
+        run: |
+          mkdir -p /tmp/download
+          bash -e bin/build-final-native.sh release 正式版本 /tmp/download windows
+          bash -e bin/upload-bin-windows.sh ${{ secrets.SECRET_ID }} ${{ secrets.SECRET_KEY }} ${{ secrets.BUCKET }} /tmp/download release
diff --git a/.gitignore b/.gitignore
@@ -14,22 +14,12 @@ logs
 .settings
 target
 hs_err*.log
-web/src/backup
-static/post
-static/temp
-static/_cache
-static/attached
+/static/
 conf/classes
 conf/plugins/*
-static/include/templates/template*
-
-web/include/templates/README.md
-web/include/templates/*.sh
-web/include/templates/.gitignore
 web/log
 web/logs
 rebel.xml
-tomcat.*
 *.jar
 !.mvn/wrapper/maven-wrapper.jar
 *.hprof
@@ -39,18 +29,19 @@ sim.pid
 .DS_Store
 .vscode
 pom.xml.versionsBackup
-/web/include/templates/default-2019/
 web/src/main/zrlog
 web/src/main/lib
-static/install
-static/admin
 conf/update-temp/zrlog.zip
 /blog-web/src/main/frontend/node_modules/
 /admin-web/src/main/frontend/node_modules/
 zrlog.zip
-release
 /data/src/main/resources/build.properties
 node_modules
 *.zip
 temp
-cache
+cache/**
+._.DS_Store
+zrlog.bgv
+/zrlog
+/conf/update-temp/
+1
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -0,0 +1,10 @@
+# This configuration file was automatically generated by Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
+# and commit this file to your remote git repository to share the goodness with others.
+
+# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
+
+tasks:
+  - init: ./mvnw install -DskipTests=false
+
+