From ce16b3396c7feea3ead270a06bee997ee8c94e7d Mon Sep 17 00:00:00 2001
From: zguiy <1415466602@qq.com>
Date: Sat, 5 Jul 2025 20:30:46 +0800
Subject: [PATCH] 1331333

---
 .drone copy 2.yml | 91 +++++++++++++++++++++++++++++++++++++++++++++++
 .drone.yml        | 30 ++++------------
 2 files changed, 98 insertions(+), 23 deletions(-)
 create mode 100644 .drone copy 2.yml

diff --git a/.drone copy 2.yml b/.drone copy 2.yml
new file mode 100644
index 0000000..d18728a
--- /dev/null
+++ b/.drone copy 2.yml	
@@ -0,0 +1,91 @@
+kind: pipeline # 定义一个管道
+type: docker # 当前管道的类型
+name: test # 当前管道的名称
+
+steps:
+
+  # 第一步：构建项目
+  - name: 构建项目
+    image: node:18-alpine
+    commands:
+      - npm install
+      - npm run build
+    volumes:
+      - name: node_modules_cache
+        path: /drone/src/node_modules
+
+  # 第二步：上传静态资源到腾讯云COS (使用另一个插件)
+  - name: 静态资源上传到cos
+    image: ccr.ccs.tencentyun.com/xiaoqidun/gocos
+    settings:
+      secret_id:
+        from_secret: cos_secret_id
+      secret_key:
+        from_secret: cos_secret_key
+      bucket_url: https://files-1302416092.cos.ap-shanghai.myqcloud.com
+      source: dist
+      target: /test
+      strip_prefix: dist
+
+  # 第三步：部署到服务器
+  - name: 清除服务器缓存
+    image: appleboy/drone-ssh
+    settings:
+      host:
+        from_secret: server_host
+      username:
+        from_secret: server_username  
+      password:
+        from_secret: server_password
+      # 或者使用SSH密钥
+      # key:
+      #   from_secret: server_ssh_key
+      port: 22
+      script:
+        - rm -rf /www/wwwroot/show.zguiy.com/*
+        - mkdir -p /www/wwwroot/show.zguiy.com/
+        - chmod 755 /www/wwwroot/show.zguiy.com/
+    when:
+      branch: 
+        - main
+        - master
+        - dev
+
+  # 第四步：上传构建文件
+  - name: 上传构建文件
+    image: appleboy/drone-scp
+    settings:
+      host:
+        from_secret: server_host
+      username:
+        from_secret: server_username
+      password:
+        from_secret: server_password
+      # 或者使用SSH密钥
+      # key:
+      #   from_secret: server_ssh_key
+      port: 22
+      source: dist/*
+      target: /www/wwwroot/show.zguiy.com/
+      strip_components: 1
+    when:
+      branch:
+        - main
+        - master  
+        - dev
+
+# 定义数据卷用于缓存node_modules
+volumes:
+  - name: node_modules_cache
+    host:
+      path: /tmp/drone_cache/node_modules
+
+# 触发条件
+trigger:
+  branch:
+    - main
+    - master
+    - dev
+  event:
+    - push
+    - pull_request
diff --git a/.drone.yml b/.drone.yml
index d18728a..b722bd1 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,20 +1,16 @@
-kind: pipeline # 定义一个管道
-type: docker # 当前管道的类型
-name: test # 当前管道的名称
+kind: pipeline
+type: docker
+name: test
 
 steps:
 
-  # 第一步：构建项目
   - name: 构建项目
     image: node:18-alpine
     commands:
-      - npm install
+      - rm -rf node_modules
+      - npm ci
       - npm run build
-    volumes:
-      - name: node_modules_cache
-        path: /drone/src/node_modules
 
-  # 第二步：上传静态资源到腾讯云COS (使用另一个插件)
   - name: 静态资源上传到cos
     image: ccr.ccs.tencentyun.com/xiaoqidun/gocos
     settings:
@@ -27,7 +23,6 @@ steps:
       target: /test
       strip_prefix: dist
 
-  # 第三步：部署到服务器
   - name: 清除服务器缓存
     image: appleboy/drone-ssh
     settings:
@@ -37,9 +32,6 @@ steps:
         from_secret: server_username  
       password:
         from_secret: server_password
-      # 或者使用SSH密钥
-      # key:
-      #   from_secret: server_ssh_key
       port: 22
       script:
         - rm -rf /www/wwwroot/show.zguiy.com/*
@@ -51,7 +43,6 @@ steps:
         - master
         - dev
 
-  # 第四步：上传构建文件
   - name: 上传构建文件
     image: appleboy/drone-scp
     settings:
@@ -61,9 +52,6 @@ steps:
         from_secret: server_username
       password:
         from_secret: server_password
-      # 或者使用SSH密钥
-      # key:
-      #   from_secret: server_ssh_key
       port: 22
       source: dist/*
       target: /www/wwwroot/show.zguiy.com/
@@ -74,13 +62,9 @@ steps:
         - master  
         - dev
 
-# 定义数据卷用于缓存node_modules
-volumes:
-  - name: node_modules_cache
-    host:
-      path: /tmp/drone_cache/node_modules
+# 移除 node_modules 缓存挂载
+# volumes: 已删除
 
-# 触发条件
 trigger:
   branch:
     - main