From 1c11fb14a5dd5916361e5552d41dbd5178a1849a Mon Sep 17 00:00:00 2001
From: liaowei <532810027@qq.com>
Date: Sun, 1 Sep 2024 14:31:14 +0800
Subject: [PATCH] =?UTF-8?q?drone=20=E6=B5=8B=E8=AF=953?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                | 32 ++++++++------------------------
 zeroerroa-modules/pom.xml |  1 -
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 6896a44..67bbcec 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ name: testxxx
 
 steps:
   # 1.maven打包gateway网关模块
-  - name: maven compile gateway
+  - name: maven compile
     pull: if-not-exists
     # 构建镜像的maven+jdk选择，最好选择满足匹配你的项目版本的;这里的maven是maven3
     image: adoptopenjdk/maven-openjdk8
@@ -12,9 +12,10 @@ steps:
       # maven构建缓存，也就是下面的/home/zeroerr/drone/maven/cache
       - name: maven-cache
         path: /root/.m2
-      # 挂载宿主机的目录；也就是下面的/home/zeroerr/drone/maven/build
       - name: maven-build-gateway
         path: /drone/build/gateway
+      - name: maven-build-auth
+        path: /drone/build/auth
     commands:
       # 开始打包maven工程
       - mvn clean package -Dmaven.test.skip=true
@@ -24,6 +25,11 @@ steps:
       - cp DockerSH/docker-gateway.sh /drone/build/gateway
       - cp StartSH/start-gateway.sh /drone/build/gateway
 
+      - cp zeroerroa-auth/target/*.jar /drone/build/auth
+      - cp Dockerfile/Dockerfile-auth /drone/build/auth
+      - cp DockerSH/docker-auth.sh /drone/build/auth
+      - cp StartSH/start-auth.sh /drone/build/auth
+
   - name: build docker gateway
     image: plugins/docker
     volumes:
@@ -42,28 +48,6 @@ steps:
       - docker ps
 
 
-  # 2.maven打包auth权限验证
-  - name: maven compile auth
-    pull: if-not-exists
-    # 构建镜像的maven+jdk选择，最好选择满足匹配你的项目版本的;这里的maven是maven3
-    image: adoptopenjdk/maven-openjdk8
-    volumes:
-      # maven构建缓存，也就是下面的/home/zeroerr/drone/maven/cache
-      - name: maven-cache
-        path: /root/.m2
-      # 挂载宿主机的目录；也就是下面的/home/zeroerr/drone/maven/build/auth
-      - name: maven-build-auth
-        path: /drone/build/auth
-    commands:
-      # 开始打包maven工程
-      - mvn clean package -Dmaven.test.skip=true
-      # 将打包后的文件复制到宿主机映射目录，由于该项目打包后jar包在zeroerr_oa-admin模块下，所以这里一定要注意，每个项目都不一样。
-      - cp zeroerroa-auth/target/*.jar /drone/build/auth
-      - cp Dockerfile/Dockerfile-auth /drone/build/auth
-      - cp DockerSH/docker-auth.sh /drone/build/auth
-      - cp StartSH/start-auth.sh /drone/build/auth
-
-
 
   - name: build docker auth
     image: plugins/docker
diff --git a/zeroerroa-modules/pom.xml b/zeroerroa-modules/pom.xml
index d38a3b0..f6c8aa6 100644
--- a/zeroerroa-modules/pom.xml
+++ b/zeroerroa-modules/pom.xml
@@ -13,7 +13,6 @@
         <module>zeroerroa-gen</module>
         <module>zeroerroa-job</module>
         <module>zeroerroa-file</module>
-        <module>zeroerroa-recruit</module>
     </modules>
 
     <artifactId>zeroerroa-modules</artifactId>