danial/kami_frontend
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

更新Drone配置文件中的Docker仓库地址，并修复API文档中订单有效期参数的必填状态

Browse Source
This commit is contained in:
danial
2025-07-21 19:58:12 +08:00
parent 3fe6351abc
commit 5dd57e18d6
2 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
.drone.yml
View File

@@ -1,49 +1,45 @@
---
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
DOCKER_PASSWORD:
from_secret: docker_password
commands:
- docker login git.kkknametrans.buzz -u $DOCKER_LOGIN -p $DOCKER_TOKEN
- docker build -t git.kkknametrans.buzz/danial/kami_frontend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0
- docker tag git.kkknametrans.buzz/danial/kami_frontend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.kkknametrans.buzz/danial/kami_frontend_${DRONE_BRANCH}:latest
- docker push git.kkknametrans.buzz/danial/kami_frontend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
- docker push git.kkknametrans.buzz/danial/kami_frontend_${DRONE_BRANCH}:latest
- docker logout git.kkknametrans.buzz
- name: deploy to docker compose
environment:
DOCKER_LOGIN:
from_secret: docker_login
DOCKER_TOKEN:
from_secret: docker_token
DOCKER_PASSWORD:
from_secret: docker_password
commands:
- docker login git.kkknametrans.buzz -u $DOCKER_LOGIN -p $DOCKER_TOKEN
- BRANCH=${DRONE_BRANCH} VERSION=${DRONE_BUILD_NUMBER} docker compose -f /data/kami/docker-compose.yaml --profile frontend up -d
- docker logout git.kkknametrans.buzz
trigger:
branch:
- develop
- production
when:
event:
- push
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_frontend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} -f deploy/Dockerfile . --build-arg USE_PROXY=0
- docker tag git.oceanpay.cc/danial/kami_frontend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER} git.oceanpay.cc/danial/kami_frontend_${DRONE_BRANCH}:latest
- docker push git.oceanpay.cc/danial/kami_frontend_${DRONE_BRANCH}:${DRONE_BUILD_NUMBER}
- docker push git.oceanpay.cc/danial/kami_frontend_${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 frontend up -d
- docker logout git.oceanpay.cc
trigger:
branch:
- develop
- production
when:
event:
- push

2
src/assets/markdown/api.md
View File

@@ -279,7 +279,7 @@ func main() {
| 参数名称 | 类型 | 是否必须 | 描述 | 示例 |
| ----------- | ------ | -------- | ------------------ | --------------------------------------------------- |
| orderNo | string | 是 | 订单号 | 20190520123456789 |
| orderPeriod | int | 否 | 订单有效期（小时） | 24 |
| orderPeriod | int | 是 | 订单有效期（小时） | 24 |
| orderPrice | float | 是 | 订单价格 | 100.12 |
| notifyUrl | string | 是 | 回调地址 | https://baidu.com/notify?sign=xxx |
| payKey | string | 是 | 商户秘钥 | |