From bfe2032f99588a231c29356ebd3f201bfd30a070 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 21 Aug 2024 11:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 84 ++++++++++++------- .../src/main/resources/templates/login.ftl | 2 +- 2 files changed, 57 insertions(+), 29 deletions(-) diff --git a/.drone.yml b/.drone.yml index 14604f28e..5a080214b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -86,9 +86,9 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 # - chmod +x ./run.sh # 更改为可执行脚本 # - ./run.sh || echo "yudao-gateway build failed" # 运行脚本打包应用镜像并运行 - - cd /ludu/maven/build/yudao-module-system/ - - chmod +x ./run.sh # 更改为可执行脚本 - - ./run.sh || echo "yudao-module-system build failed" # 运行脚本打包应用镜像并运行 +# - cd /ludu/maven/build/yudao-module-system/ +# - chmod +x ./run.sh # 更改为可执行脚本 +# - ./run.sh || echo "yudao-module-system build failed" # 运行脚本打包应用镜像并运行 # - cd /ludu/maven/build/yudao-module-infra/ # - chmod +x ./run.sh # 更改为可执行脚本 @@ -104,59 +104,87 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - cd /ludu/maven/build/ludu-module-ticketing/ - chmod +x ./run.sh # 更改为可执行脚本 - - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 + - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 - cd /ludu/maven/build/ludu-module-parking/ - chmod +x ./run.sh # 更改为可执行脚本 - - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 + - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行 - echo "start copy" - - scp -r /ludu/maven/build/yudao-gateway root@120.46.37.243:/ludu/maven/build + - 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" # - echo "start copy" # - scp -r /ludu/maven/build/ludu-module-ticketing root@120.46.37.243:/ludu/maven/build # - echo "ticket done" # - scp -r /ludu/maven/build/ludu-module-parking root@120.46.37.243:/ludu/maven/build # - echo "park done" - - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build - - echo "datecenter done" - - - name: build-other-service +# - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build +# - echo "datecenter done" + - +# - name: build-other-service +# +# image: appleboy/drone-ssh # SSH工具镜像 +# +# settings: +# +# host: 120.46.37.243 # 远程连接地址 +# +# username: root # 远程连接账号 +# +# password: +# +# from_secret: ssh_password2 # 从Secret中读取SSH密码 +# +# port: 22 # 远程连接端口 +# +# command_timeout: 5m # 远程执行命令超时时间 +# +# script: +# - cd /ludu/maven/build/yudao-gateway/ +# - chmod +x ./run.sh # 更改为可执行脚本 +# - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 +# +## - cd /ludu/maven/build/ludu-module-ticketing/ +## - chmod +x ./run.sh # 更改为可执行脚本 +## - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 +# +## - cd /ludu/maven/build/ludu-module-parking/ +## - chmod +x ./run.sh # 更改为可执行脚本 +## - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行 +# +# - cd /ludu/maven/build/ludu-module-datacenter/ +# - chmod +x ./run.sh # 更改为可执行脚本 +# - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 + - name: build-gatewayAndSystem-service + image: appleboy/drone-ssh # SSH工具镜像 - + settings: - - host: 120.46.37.243 # 远程连接地址 - + + host: 121.36.203.133 # 远程连接地址 + username: root # 远程连接账号 - + password: - - from_secret: ssh_password2 # 从Secret中读取SSH密码 + + from_secret: ssh_password3 # 从Secret中读取SSH密码 port: 22 # 远程连接端口 command_timeout: 5m # 远程执行命令超时时间 - + script: - cd /ludu/maven/build/yudao-gateway/ - chmod +x ./run.sh # 更改为可执行脚本 - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 -# - cd /ludu/maven/build/ludu-module-ticketing/ -# - chmod +x ./run.sh # 更改为可执行脚本 -# - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行 - -# - cd /ludu/maven/build/ludu-module-parking/ -# - chmod +x ./run.sh # 更改为可执行脚本 -# - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行 - - - cd /ludu/maven/build/ludu-module-datacenter/ + - cd /ludu/maven/build/yudao-module-system/ - chmod +x ./run.sh # 更改为可执行脚本 - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行 - volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-build 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 3c01abf72..3219cf283 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 @@ -49,7 +49,7 @@ const clientId = 'ludu-job-admin'; // 可以改写成，你的 clientId const redirectUri = encodeURIComponent('http://127.0.0.1:9090/xxl-job-admin/toLogin'); // 注意，需要使用 encodeURIComponent 编码地址 const responseType = 'code'; // 1）授权码模式，对应 code；2）简化模式，对应 token - window.location.href = 'http://127.0.0.1:80/sso?client_id=' + clientId + window.location.href = 'http://127.0.0.1/admin/sso?client_id=' + clientId + '&redirect_uri=' + redirectUri + '&response_type=' + responseType; }