root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request '调度中心跳转修改' (#22) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Details

Browse Source 
Reviewed-on: #22
This commit is contained in:
root 2024-08-22 09:50:51 +08:00
commit 68ce8594fe
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.drone.yml
View File

@ -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" # 运行脚本打包应用镜像并运行

4
ludu-job-admin/ludu-job-admin-biz/src/main/resources/templates/login.ftl
View File

@ -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) {