329680335e
- 在订单查询接口中新增 hideDuplicateCard 参数支持 - 使用 lancet 库进行参数类型转换以判断是否隐藏重复订单 - 修改前端页面筛选表单，将复选框替换为下拉选择框 - 更新 JavaScript 代码以适配新的筛选控件取值方式 - 调整后端逻辑以正确处理布尔值类型的筛选条件 - 注释掉旧的部署脚本配置避免干扰当前构建流程
46 lines
1.4 KiB
YAML
46 lines
1.4 KiB
YAML
---
|
|
kind: pipeline
|
|
type: ssh
|
|
name: master-machine
|
|
|
|
server:
|
|
host: 38.38.251.113:34156
|
|
user: root
|
|
password:
|
|
from_secret: www_password
|
|
|
|
clone:
|
|
depth: 1
|
|
|
|
steps:
|
|
- name: build new image
|
|
environment:
|
|
DOCKER_LOGIN:
|
|
from_secret: docker_login
|
|
DOCKER_TOKEN:
|
|
from_secret: docker_token
|
|
commands:
|
|
- docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
|
- docker build -t git.oceanpay.cc/danial/kami_boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0
|
|
- docker tag git.oceanpay.cc/danial/kami_boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.oceanpay.cc/danial/kami_boss_${DRONE_BRANCH}:latest
|
|
- docker push git.oceanpay.cc/danial/kami_boss_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
|
|
- docker push git.oceanpay.cc/danial/kami_boss_${DRONE_BRANCH}:latest
|
|
- docker logout git.oceanpay.cc
|
|
# - name: deploy to docker compose
|
|
# environment:
|
|
# DOCKER_LOGIN:
|
|
# from_secret: docker_login
|
|
# DOCKER_TOKEN:
|
|
# from_secret: docker_token
|
|
# commands:
|
|
# - docker login git.oceanpay.cc -u $DOCKER_LOGIN -p $DOCKER_TOKEN
|
|
# - BRANCH=${DRONE_BRANCH} VERSION=${DRONE_BUILD_NUMBER} docker compose -f /data/kami/docker-compose.yaml --profile boss up -d
|
|
# - docker logout git.oceanpay.cc
|
|
trigger:
|
|
branch:
|
|
- develop
|
|
- production
|
|
when:
|
|
event:
|
|
- push
|