Merge pull request 'xinwei' (#26) from xinwei into master
Reviewed-on: #26
This commit is contained in:
commit
608557e741
177
.drone.yml
177
.drone.yml
@ -4,6 +4,8 @@ type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
|
||||
|
||||
name: ludu-system-drone # 定义流水线名称
|
||||
|
||||
environment:
|
||||
module: ${module}
|
||||
|
||||
steps: # 定义流水线执行步骤，这些步骤将顺序执行
|
||||
|
||||
@ -25,62 +27,85 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
|
||||
|
||||
- mvn package -Dmaven.test.skip=true # 应用打包命令
|
||||
|
||||
# - mkdir -p /app/build/yudao-gateway/target
|
||||
# - cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target
|
||||
# - cp ./yudao-gateway/Dockerfile /app/build/yudao-gateway
|
||||
# - cp ./yudao-gateway/run.sh /app/build/yudao-gateway
|
||||
- |
|
||||
if echo "$module" | grep -q "gateway" || echo "$module" | grep -q "all"; then
|
||||
echo "gateway start copy to volumes..."
|
||||
# mkdir -p /app/build/yudao-gateway/target
|
||||
# cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target
|
||||
# cp ./yudao-gateway/Dockerfile /app/build/yudao-gateway
|
||||
# cp ./yudao-gateway/run.sh /app/build/yudao-gateway
|
||||
fi
|
||||
|
||||
if echo "$module" | grep -q "system" || echo "$module" | grep -q "all"; then
|
||||
echo "system start copy to volumes..."
|
||||
# mkdir -p /app/build/yudao-module-system/target
|
||||
# cp ./yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /app/build/yudao-module-system/target
|
||||
# cp ./yudao-module-system/yudao-module-system-biz/Dockerfile /app/build/yudao-module-system
|
||||
# cp ./yudao-module-system/yudao-module-system-biz/run.sh /app/build/yudao-module-system
|
||||
fi
|
||||
|
||||
if echo "$module" | grep -q "infra" || echo "$module" | grep -q "all"; then
|
||||
echo "infra start copy to volumes..."
|
||||
# mkdir -p /app/build/yudao-module-infra/target
|
||||
# cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target
|
||||
# cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra
|
||||
# cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra
|
||||
fi
|
||||
|
||||
if echo "$module" | grep -q "job" || echo "$module" | grep -q "all"; then
|
||||
echo "job start copy to volumes..."
|
||||
# mkdir -p /app/build/ludu-job-admin/target
|
||||
# cp ./ludu-job-admin/ludu-job-admin-biz/target/ludu-job-admin-biz.jar /app/build/ludu-job-admin/target
|
||||
# cp ./ludu-job-admin/ludu-job-admin-biz/Dockerfile /app/build/ludu-job-admin
|
||||
# cp ./ludu-job-admin/ludu-job-admin-biz/run.sh /app/build/ludu-job-admin
|
||||
fi
|
||||
|
||||
if echo "$module" | grep -q "ticketing" || echo "$module" | grep -q "all"; then
|
||||
echo "ticketing start copy to volumes..."
|
||||
# mkdir -p /app/build/ludu-module-ticketing/target
|
||||
# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/target/ludu-module-ticketing-biz.jar /app/build/ludu-module-ticketing/target
|
||||
# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile /app/build/ludu-module-ticketing
|
||||
# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/run.sh /app/build/ludu-module-ticketing
|
||||
fi
|
||||
|
||||
if echo "$module" | grep -q "parking" || echo "$module" | grep -q "all"; then
|
||||
echo "parking start copy to volumes..."
|
||||
# mkdir -p /app/build/ludu-module-parking/target
|
||||
# cp ./ludu-module-parking/ludu-module-parking-biz/target/ludu-module-parking-biz.jar /app/build/ludu-module-parking/target
|
||||
# cp ./ludu-module-parking/ludu-module-parking-biz/Dockerfile /app/build/ludu-module-parking
|
||||
# cp ./ludu-module-parking/ludu-module-parking-biz/run.sh /app/build/ludu-module-parking
|
||||
fi
|
||||
|
||||
if echo "$module" | grep -q "datacenter" || echo "$module" | grep -q "all"; then
|
||||
echo "datacenter start copy to volumes..."
|
||||
# mkdir -p /app/build/ludu-module-datacenter/target
|
||||
# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target
|
||||
# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter
|
||||
# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter
|
||||
fi
|
||||
|
||||
|
||||
# - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
|
||||
#
|
||||
# - mkdir -p /app/build/yudao-module-system/target
|
||||
# - cp ./yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /app/build/yudao-module-system/target
|
||||
# - cp ./yudao-module-system/yudao-module-system-biz/Dockerfile /app/build/yudao-module-system
|
||||
# - cp ./yudao-module-system/yudao-module-system-biz/run.sh /app/build/yudao-module-system
|
||||
# image: appleboy/drone-ssh # SSH工具镜像
|
||||
#
|
||||
# - mkdir -p /app/build/yudao-module-infra/target
|
||||
# - cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target
|
||||
# - cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra
|
||||
# - cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra
|
||||
# settings:
|
||||
#
|
||||
# - mkdir -p /app/build/ludu-job-admin/target
|
||||
# - cp ./ludu-job-admin/ludu-job-admin-biz/target/ludu-job-admin-biz.jar /app/build/ludu-job-admin/target
|
||||
# - cp ./ludu-job-admin/ludu-job-admin-biz/Dockerfile /app/build/ludu-job-admin
|
||||
# - cp ./ludu-job-admin/ludu-job-admin-biz/run.sh /app/build/ludu-job-admin
|
||||
# host: 101.43.112.107 # 远程连接地址
|
||||
#
|
||||
# - mkdir -p /app/build/ludu-module-ticketing/target
|
||||
# - cp ./ludu-module-ticketing/ludu-module-ticketing-biz/target/ludu-module-ticketing-biz.jar /app/build/ludu-module-ticketing/target
|
||||
# - cp ./ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile /app/build/ludu-module-ticketing
|
||||
# - cp ./ludu-module-ticketing/ludu-module-ticketing-biz/run.sh /app/build/ludu-module-ticketing
|
||||
# username: root # 远程连接账号
|
||||
#
|
||||
# - mkdir -p /app/build/ludu-module-parking/target
|
||||
# - cp ./ludu-module-parking/ludu-module-parking-biz/target/ludu-module-parking-biz.jar /app/build/ludu-module-parking/target
|
||||
# - cp ./ludu-module-parking/ludu-module-parking-biz/Dockerfile /app/build/ludu-module-parking
|
||||
# - cp ./ludu-module-parking/ludu-module-parking-biz/run.sh /app/build/ludu-module-parking
|
||||
|
||||
- mkdir -p /app/build/ludu-module-datacenter/target
|
||||
- cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target
|
||||
- cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter
|
||||
- cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter
|
||||
|
||||
- name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
|
||||
|
||||
image: appleboy/drone-ssh # SSH工具镜像
|
||||
|
||||
settings:
|
||||
|
||||
host: 101.43.112.107 # 远程连接地址
|
||||
|
||||
username: root # 远程连接账号
|
||||
|
||||
password:
|
||||
|
||||
from_secret: ssh_password # 从Secret中读取SSH密码
|
||||
|
||||
port: 22 # 远程连接端口
|
||||
|
||||
command_timeout: 15m # 远程执行命令超时时间
|
||||
|
||||
script:
|
||||
|
||||
- echo "start copy"
|
||||
# password:
|
||||
#
|
||||
# from_secret: ssh_password # 从Secret中读取SSH密码
|
||||
#
|
||||
# port: 22 # 远程连接端口
|
||||
#
|
||||
# command_timeout: 15m # 远程执行命令超时时间
|
||||
#
|
||||
# script:
|
||||
#
|
||||
# - echo "start copy"
|
||||
# - cd /ludu/maven
|
||||
# - tar -cf ludu-build.tar ./build
|
||||
# - scp ludu-build.tar root@121.36.203.133:/ludu/maven
|
||||
@ -96,32 +121,32 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
|
||||
# - 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 "datacenter done"
|
||||
# - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
|
||||
# - echo "datacenter 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/ludu-module-datacenter/
|
||||
- chmod +x ./run.sh # 更改为可执行脚本
|
||||
- ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
|
||||
# - 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/ludu-module-datacenter/
|
||||
# - chmod +x ./run.sh # 更改为可执行脚本
|
||||
# - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
|
||||
# - name: object-build
|
||||
#
|
||||
# image: appleboy/drone-ssh # SSH工具镜像
|
||||
|
||||
@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets;
|
||||
@Component
|
||||
public class OAuth2Client {
|
||||
|
||||
private static final String BASE_URL = "http://127.0.0.1:48080/admin-api/system/oauth2";
|
||||
private static final String BASE_URL = "https://mt.ptzykjgs.com/admin-api/system/oauth2";
|
||||
|
||||
/**
|
||||
* 租户编号
|
||||
|
||||
@ -21,7 +21,7 @@ import org.springframework.web.client.RestTemplate;
|
||||
@Component
|
||||
public class UserClient {
|
||||
|
||||
private static final String BASE_URL = "http://127.0.0.1:48080/admin-api/system/oauth2/user";
|
||||
private static final String BASE_URL = "https://mt.ptzykjgs.com/admin-api/system/oauth2/user";
|
||||
|
||||
// @Resource // 可优化，注册一个 RestTemplate Bean，然后注入
|
||||
private final RestTemplate restTemplate = new RestTemplate();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user