From a08d8fd83b8e5c899cc279ee84ef46a1f9099592 Mon Sep 17 00:00:00 2001
From: panjunjie <46790855@qq.com>
Date: Mon, 11 Aug 2025 11:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20java-mall-app-shop-admin/J?=
 =?UTF-8?q?enkinsfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

部署脚本修改
---
 java-mall-app-shop-admin/Jenkinsfile | 46 ++--------------------------
 1 file changed, 3 insertions(+), 43 deletions(-)

diff --git a/java-mall-app-shop-admin/Jenkinsfile b/java-mall-app-shop-admin/Jenkinsfile
index 2ac0094..7be0900 100644
--- a/java-mall-app-shop-admin/Jenkinsfile
+++ b/java-mall-app-shop-admin/Jenkinsfile
@@ -8,10 +8,6 @@ pipeline {
     environment {
         // 主项目部署路径
         DEPLOY_DIR = '/data/nginx/www/fafamall/demo'
-        // UniApp项目子目录
-        UNIAPP_SUB_DIR = 'merchapp/java-mall-app-shop-admin'
-        // UniApp打包输出目录（相对子目录的路径）
-        UNIAPP_DIST_RELATIVE = 'dist/build/h5'
     }
     
     stages {
@@ -26,6 +22,7 @@ pipeline {
         stage('安装主项目依赖') {
             steps {
                 sh '''
+                cd java-mall-app-shop-admin
                 rm -rf node_modules package-lock.json
                 npm config set registry https://registry.npmmirror.com
                 npm install
@@ -35,7 +32,7 @@ pipeline {
         
         stage('构建主项目') {
             steps {
-                sh 'npm run build'
+                sh 'npm run build:h5'
             }
         }
         
@@ -44,48 +41,11 @@ pipeline {
                 sh '''
                     mkdir -p ${DEPLOY_DIR}
                     rm -rf ${DEPLOY_DIR}/*
-                    cp -r dist/* ${DEPLOY_DIR}/
+                    cp -r dist/build/h5/* ${DEPLOY_DIR}/
                 '''
             }
         }
         
-        // UniApp项目打包（在子目录中执行）
-        stage('UniApp项目打包') {
-            steps {
-                sh '''
-                    echo "进入UniApp项目目录: ${UNIAPP_SUB_DIR}"
-                    cd ${UNIAPP_SUB_DIR} || {
-                        echo "错误：UniApp项目目录 ${UNIAPP_SUB_DIR} 不存在！"
-                        exit 1
-                    }
-                    
-                    # 显示当前目录以确认
-                    pwd
-                    
-                    # 清理旧依赖
-                    rm -rf node_modules package-lock.json
-                    
-                    # 安装依赖
-                    npm config set registry https://registry.npmmirror.com
-                    npm install
-                    
-                    # 执行打包（H5平台，可根据需要修改为其他平台）
-                    npm run build:h5
-                    
-                    # 验证打包结果
-                    if [ ! -d "${UNIAPP_DIST_RELATIVE}" ]; then
-                        echo "错误：UniApp打包失败，未找到输出目录！"
-                        exit 1
-                    fi
-                    
-                    # 如需部署UniApp产物，可添加以下命令
-                    # UNIAPP_DEPLOY_DIR="/data/nginx/www/uniapp-admin"
-                    # mkdir -p ${UNIAPP_DEPLOY_DIR}
-                    # rm -rf ${UNIAPP_DEPLOY_DIR}/*
-                    # cp -r ${UNIAPP_DIST_RELATIVE}/* ${UNIAPP_DEPLOY_DIR}/
-                '''
-            }
-        }
     }
     
     post {