From b14d43ce70c6652e7cccebab2d7cc4cba986798e Mon Sep 17 00:00:00 2001
From: ReaJason <reajason1225@gmail.com>
Date: Fri, 20 Dec 2024 02:33:37 +0800
Subject: [PATCH] ci: bun run failed

---
 .github/workflows/build.yaml                  |  9 +++++++--
 .../boot/controller/ViewController.java       |  2 +-
 .../javaweb/boot/dto/GenerateRequest.java     | 20 +++++++++----------
 web/copy-build.sh                             |  3 ++-
 web/package.json                              |  5 ++++-
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fd18d8cc..26ab686a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -5,6 +5,7 @@ on:
     paths-ignore:
       - 'docs/**'
       - '**.md'
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -29,8 +30,10 @@ jobs:
       - uses: oven-sh/setup-bun@v2
         with:
           bun-version: latest
+      - name: Bun Install
+        run: cd web && bun install --frozen-lockfile
       - name: Build Web
-        run: cd web && bun install --frozen-lockfile && bun build && bash copy-build.sh
+        run: cd web && bun run build && bash copy-build.sh
       - name: Build with Gradle
         run: ./gradlew :boot:bootjar
       - name: Upload Jar
@@ -43,6 +46,8 @@ jobs:
     needs: [ build ]
     runs-on: ubuntu-latest
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
       - name: Download Jar
         uses: actions/download-artifact@v4
         with:
@@ -60,7 +65,7 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          context: boot/
+          context: boot
           platforms: linux/amd64,linux/arm64
           push: true
           tags: reajason/memshell-party:latest
diff --git a/boot/src/main/java/com/reajason/javaweb/boot/controller/ViewController.java b/boot/src/main/java/com/reajason/javaweb/boot/controller/ViewController.java
index 8a9e2e2a..bb93b51c 100644
--- a/boot/src/main/java/com/reajason/javaweb/boot/controller/ViewController.java
+++ b/boot/src/main/java/com/reajason/javaweb/boot/controller/ViewController.java
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 @Controller
 public class ViewController {
     @GetMapping("/")
-    public String index() {
+    public String index(){
         return "index";
     }
 }
diff --git a/boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java b/boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java
index c26dae17..33de134e 100644
--- a/boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java
+++ b/boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java
@@ -15,6 +15,16 @@ public class GenerateRequest {
     private InjectorConfig injectorConfig;
     private Packer.INSTANCE packer;
 
+    @Data
+    static class ShellToolConfigDTO {
+        private String shellClassName;
+        private String godzillaPass;
+        private String godzillaKey;
+        private String godzillaHeaderName;
+        private String godzillaHeaderValue;
+        private String commandParamName;
+    }
+
     public ShellToolConfig parseShellToolConfig() {
         if (shellConfig.getShellTool().equals(ShellTool.Godzilla)) {
             return GodzillaConfig.builder()
@@ -33,14 +43,4 @@ public class GenerateRequest {
         }
         throw new UnsupportedOperationException("unknown shell tool " + shellConfig.getShellTool());
     }
-
-    @Data
-    static class ShellToolConfigDTO {
-        private String shellClassName;
-        private String godzillaPass;
-        private String godzillaKey;
-        private String godzillaHeaderName;
-        private String godzillaHeaderValue;
-        private String commandParamName;
-    }
 }
\ No newline at end of file
diff --git a/web/copy-build.sh b/web/copy-build.sh
index 6855b412..5acb56db 100755
--- a/web/copy-build.sh
+++ b/web/copy-build.sh
@@ -5,4 +5,5 @@ mkdir -p ../boot/src/main/resources/static/assets/
 cp dist/vite.svg ../boot/src/main/resources/static/
 cp -R dist/assets/* ../boot/src/main/resources/static/assets/
 
-cp dist/index.html ../boot/src/main/resources/templates
\ No newline at end of file
+mkdir -p ../boot/src/main/resources/templates
+cp dist/index.html ../boot/src/main/resources/templates/index.html
\ No newline at end of file
diff --git a/web/package.json b/web/package.json
index 85d80478..2b54665d 100644
--- a/web/package.json
+++ b/web/package.json
@@ -52,5 +52,8 @@
     "tailwind-merge": "^2.5.5",
     "tailwindcss-animate": "^1.0.7",
     "zod": "^3.24.1"
-  }
+  },
+  "trustedDependencies": [
+    "@biomejs/biome"
+  ]
 }