From 25a82f07c7a7700a322b0af2732091bae61a93ed Mon Sep 17 00:00:00 2001
From: weir <1261174789@qq.com>
Date: Sun, 25 Jul 2021 19:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile                | 2 +-
 yudao-admin-ui/Jenkinsfile | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bf5ad821a..38789a064 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,7 +40,7 @@ pipeline {
                 sh 'if [ ! -d "' + "${env.HOME}" + '/resources" ];then\n' +
                         '  echo "配置文件不存在无需修改"\n' +
                         'else\n' +
-                        '  cp  -rf  /home/pi/resources/*.yaml ' + "${env.APP_NAME}" + '/src/main/resources\n' +
+                        '  cp  -rf  ' + "${env.HOME}" + '/resources/*.yaml ' + "${env.APP_NAME}" + '/src/main/resources\n' +
                         '  echo "配置文件替换"\n' +
                         'fi'
                 sh 'mvn clean package -Dmaven.test.skip=true'
diff --git a/yudao-admin-ui/Jenkinsfile b/yudao-admin-ui/Jenkinsfile
index fec52131e..2736815dc 100644
--- a/yudao-admin-ui/Jenkinsfile
+++ b/yudao-admin-ui/Jenkinsfile
@@ -10,7 +10,8 @@ pipeline {
   }
 
   environment {
-    APP_NAME = 'yudao-admin-ui'
+    APP_NAME = 'yudao-admin'
+    APP_PACKAGE='yudao-admin-ui'
     NGINX_WORKDIR = '/home/pi/mydata/nginx/html/'
   }
 
@@ -24,8 +25,8 @@ pipeline {
 
     stage('构建') {
       steps {
-        sh 'cnpm --prefix '+ "${env.APP_NAME}" +' install'
-        sh 'cnpm --prefix '+ "${env.APP_NAME}" +' run build:prod'
+        sh 'cnpm --prefix '+ "${env.APP_PACKAGE}" +' install'
+        sh 'cnpm --prefix '+ "${env.APP_PACKAGE}" +' run build:prod'
       }
     }