From 26b652bcd07b3901bcbbab407d0a77694516db7c Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Thu, 22 Aug 2024 09:50:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=B8=AD=E5=BF=83=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 31 ++++++++++++------- .../src/main/resources/templates/login.ftl | 4 +-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index 523125469..c26987b3a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -81,18 +81,21 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 script: - echo "start copy" - - scp -r /ludu/maven/build/yudao-gateway root@121.36.203.133:/ludu/maven/build - - echo "gateway done" - - scp -r /ludu/maven/build/yudao-module-system root@121.36.203.133:/ludu/maven/build - - echo "system done" - - scp -r /ludu/maven/build/ludu-module-ticketing root@121.36.203.133:/ludu/maven/build - - echo "ticketing done" - - scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build - - echo "parking done" - - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build - - echo "infra done" - - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build - - echo "job done" + - cd /ludu/maven + - tar -cf ludu-build.tar ./build + - scp ludu-build.tar root@121.36.203.133:/ludu/maven +# - scp -r /ludu/maven/build/yudao-gateway root@121.36.203.133:/ludu/maven/build +# - echo "gateway done" +# - scp -r /ludu/maven/build/yudao-module-system root@121.36.203.133:/ludu/maven/build +# - echo "system done" +# - scp -r /ludu/maven/build/ludu-module-ticketing root@121.36.203.133:/ludu/maven/build +# - echo "ticketing done" +# - scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build +# - echo "parking done" +# - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build +# - echo "infra done" +# - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build +# - echo "job done" # - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build # - echo "system done" @@ -138,6 +141,10 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 command_timeout: 20m # 远程执行命令超时时间 script: + - cd /ludu/maven + - rm -rf ./build + - tar -xf ludu-build.tar -C ./ + - cd /ludu/maven/build/yudao-gateway/ - chmod +x ./run.sh # 更改为可执行脚本 - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl index 8638b9321..9bb65511d 100644 --- a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl +++ b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl @@ -69,9 +69,9 @@ ssoLogin(); } else { // 提交 - const redirectUri = 'http://127.0.0.1:9090/xxl-job-admin/toLogin'; // 需要修改成，你回调的地址，就是在 index.html 拼接的 redirectUri + const redirectUri = 'https://mt.ptzykjgs.com/xxl-job-admin/toLogin'; // 需要修改成，你回调的地址，就是在 index.html 拼接的 redirectUri $.ajax({ - url: "http://127.0.0.1:9090/xxl-job-admin/auth/login-by-code?code=" + code + url: "https://mt.ptzykjgs.com/xxl-job-admin/auth/login-by-code?code=" + code + '&redirectUri=' + redirectUri, method: 'POST', success: function (result) {