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

---
 .drone.yml                                    | 35 ++++++++++---------
 .../zeroerr/system/api/RemoteUserService.java |  4 +--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index fd14b5a..6896a44 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -24,6 +24,24 @@ steps:
       - cp DockerSH/docker-gateway.sh /drone/build/gateway
       - cp StartSH/start-gateway.sh /drone/build/gateway
 
+  - name: build docker gateway
+    image: plugins/docker
+    volumes:
+      # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
+      - name: maven-build-gateway
+        path: /drone/build/gateway # 将应用打包好的Jar和执行脚本挂载出来
+      - name: docker
+        path: /var/run/docker.sock # 挂载宿主机的docker
+    settings:
+      dockerfile: /drone/build/Dockerfile-gateway   #这里的Dockerfile就是项目根目录里的Dockerfile，必须保证名字和内容无误
+    commands:
+      # 定义在Docker容器中执行的shell命令
+      - cd /drone/build/gateway
+      - chmod +x docker-gateway.sh
+      - sh docker-gateway.sh
+      - docker ps
+
+
   # 2.maven打包auth权限验证
   - name: maven compile auth
     pull: if-not-exists
@@ -45,22 +63,7 @@ steps:
       - cp DockerSH/docker-auth.sh /drone/build/auth
       - cp StartSH/start-auth.sh /drone/build/auth
 
-  - name: build docker gateway
-    image: plugins/docker
-    volumes:
-      # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置
-      - name: maven-build-gateway
-        path: /drone/build/gateway # 将应用打包好的Jar和执行脚本挂载出来
-      - name: docker
-        path: /var/run/docker.sock # 挂载宿主机的docker
-    settings:
-      dockerfile: /drone/build/Dockerfile-gateway   #这里的Dockerfile就是项目根目录里的Dockerfile，必须保证名字和内容无误
-    commands:
-      # 定义在Docker容器中执行的shell命令
-      - cd /drone/build/gateway
-      - chmod +x docker-gateway.sh
-      - sh docker-gateway.sh
-      - docker ps
+
 
   - name: build docker auth
     image: plugins/docker
diff --git a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteUserService.java b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteUserService.java
index ce11fca..a5b97bd 100644
--- a/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteUserService.java
+++ b/zeroerroa-api/zeroerroa-api-system/src/main/java/com/zeroerr/system/api/RemoteUserService.java
@@ -54,6 +54,6 @@ public interface RemoteUserService
 
 
 
-    @GetMapping("/user/selectUserById/{userId}")
-    R<SysUser> selectUserById(@PathVariable("userId") Long userId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+//    @GetMapping("/user/selectUserById/{userId}")
+//    R<SysUser> selectUserById(@PathVariable("userId") Long userId,@RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }