Merge pull request 'xinwei' (#28) from xinwei into master
Reviewed-on: #28
This commit is contained in:
commit
b9e06e15ba
108
.drone.yml
108
.drone.yml
@ -25,35 +25,35 @@ 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
|
||||
#
|
||||
# - 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
|
||||
#
|
||||
# - 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
|
||||
#
|
||||
# - 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
|
||||
#
|
||||
# - 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
|
||||
#
|
||||
# - 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/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
|
||||
#
|
||||
# - 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
|
||||
#
|
||||
# - 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
|
||||
#
|
||||
# - 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
|
||||
#
|
||||
# - 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
|
||||
#
|
||||
# - 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
|
||||
@ -61,41 +61,41 @@ steps: # 定义流水线执行步骤,这些步骤将顺序执行
|
||||
- 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:
|
||||
|
||||
|
||||
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
|
||||
# - 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 "datacenter done"
|
||||
|
||||
|
@ -23,7 +23,7 @@ $(function(){
|
||||
title: I18n.system_tips,
|
||||
content: ('已退出登录!' || I18n.logout_success)
|
||||
});*/
|
||||
window.location.href = "http://127.0.0.1:80/logout"
|
||||
window.location.href = "https://mt.ptzykjgs.com/admin/logout"
|
||||
/*$.post(base_url + "/logout", function(data, status) {
|
||||
if (data.code == "200") {
|
||||
layer.msg( I18n.logout_success );
|
||||
|
@ -98,7 +98,7 @@ spring:
|
||||
xxl:
|
||||
job:
|
||||
admin:
|
||||
addresses: http://crm.fjptzykj.com:9090/xxl-job-admin
|
||||
addresses: https://mt.ptzykjgs.com/xxl-job-admin
|
||||
executor:
|
||||
appname: ${spring.application.name} # 执行器 AppName
|
||||
address:
|
||||
|
@ -97,9 +97,16 @@ spring:
|
||||
--- #################### 定时任务相关配置 ####################
|
||||
xxl:
|
||||
job:
|
||||
enabled: false # 是否开启调度中心,默认为 true 开启
|
||||
admin:
|
||||
addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址
|
||||
addresses: http://127.0.0.1:9090/xxl-job-admin
|
||||
executor:
|
||||
appname: ${spring.application.name} # 执行器 AppName
|
||||
address:
|
||||
ip: # 执行器IP [选填]:默认为空表示自动获取IP,多网卡时可手动设置指定IP,该IP不会绑定Host仅作为通讯实用;地址信息用于 "执行器注册" 和 "调度中心请求并触发任务";
|
||||
port: 0 # ### 执行器端口号 [选填]:小于等于0则自动获取;默认端口为9999,单机部署多个执行器时,注意要配置不同执行器端口;
|
||||
logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
|
||||
logretentiondays: 30 # 执行器日志文件保存天数 [选填] : 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能;
|
||||
accessToken: # 执行器通讯TOKEN
|
||||
|
||||
--- #################### 服务保障相关配置 ####################
|
||||
|
||||
|
@ -103,21 +103,6 @@ spring:
|
||||
listener:
|
||||
missing-topics-fatal: false # 消费监听接口监听的主题不存在时,默认会报错。所以通过设置为 false ,解决报错
|
||||
|
||||
--- #################### 定时任务相关配置 ####################
|
||||
|
||||
xxl:
|
||||
job:
|
||||
admin:
|
||||
addresses: http://127.0.0.1:9090/xxl-job-admin
|
||||
executor:
|
||||
appname: ${spring.application.name} # 执行器 AppName
|
||||
address:
|
||||
ip: # 执行器IP [选填]:默认为空表示自动获取IP,多网卡时可手动设置指定IP,该IP不会绑定Host仅作为通讯实用;地址信息用于 "执行器注册" 和 "调度中心请求并触发任务";
|
||||
port: 0 # ### 执行器端口号 [选填]:小于等于0则自动获取;默认端口为9999,单机部署多个执行器时,注意要配置不同执行器端口;
|
||||
logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
|
||||
logretentiondays: 30 # 执行器日志文件保存天数 [选填] : 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能;
|
||||
accessToken: # 执行器通讯TOKEN
|
||||
|
||||
--- #################### 芋道相关配置 ####################
|
||||
|
||||
yudao:
|
||||
|
Loading…
Reference in New Issue
Block a user