Compare commits
48 Commits
dev
...
b20ae843d6
| Author | SHA1 | Date | |
|---|---|---|---|
| b20ae843d6 | |||
| 90b920b9b4 | |||
| 7c198fac43 | |||
| f231939ae9 | |||
| 914c25e962 | |||
| 4261f8c5f1 | |||
| e90e74ff40 | |||
| d520e95b3b | |||
| 7b5bb9b565 | |||
| e7b1992932 | |||
| aee9a2d9c0 | |||
| f031d84745 | |||
| 94cb709702 | |||
| b2ff663fa8 | |||
| 5c129c35af | |||
| 2d067aae44 | |||
| 0f1fa9c932 | |||
| a8a3bc4ee9 | |||
| 7fc8762bd9 | |||
| d21b06875a | |||
| 65ade0ef3a | |||
| e051d75d21 | |||
| 8daa1d4925 | |||
| 3e920e2873 | |||
| f75d9eef81 | |||
| 0ea8754321 | |||
| b47bc1b35b | |||
| cab4da5b28 | |||
| 7c7d395518 | |||
| 324426ef4a | |||
| d3a8a0425c | |||
| 5c9b248624 | |||
| a7cb1758e2 | |||
| 25e4185183 | |||
| 233824e959 | |||
| 1f7669f033 | |||
| 18b2e7361f | |||
| 2d109b22a0 | |||
| 6256f59fe9 | |||
| 49bbe2a086 | |||
| 929a9e5826 | |||
| a01f94bfb3 | |||
| 5c7a54cfb4 | |||
| b027215afa | |||
| 165149e0c2 | |||
| 373e25cf82 | |||
| ce68556827 | |||
| cb2e68cede |
158
.drone.yml
Normal file
158
.drone.yml
Normal file
@@ -0,0 +1,158 @@
|
|||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: default
|
||||||
|
|
||||||
|
platform:
|
||||||
|
os: linux
|
||||||
|
arch: amd64
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: 测试服-依赖安装&&编译打包
|
||||||
|
pull: if-not-exists
|
||||||
|
image: node:20-alpine
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- test
|
||||||
|
commands:
|
||||||
|
- npm config set registry https://registry.npmmirror.com/
|
||||||
|
- npm install -g pnpm
|
||||||
|
- pnpm install
|
||||||
|
- pnpm build:test
|
||||||
|
- rm -rf dist.tar
|
||||||
|
- rm -rf node_modules
|
||||||
|
- tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile
|
||||||
|
|
||||||
|
- name: 正式服-依赖安装&&编译打包
|
||||||
|
pull: if-not-exists
|
||||||
|
image: node:20-alpine
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
commands:
|
||||||
|
- npm config set registry https://registry.npmmirror.com/
|
||||||
|
- npm install -g pnpm
|
||||||
|
- pnpm install
|
||||||
|
- pnpm build:prod
|
||||||
|
- rm -rf dist.tar
|
||||||
|
- rm -rf node_modules
|
||||||
|
- tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile
|
||||||
|
|
||||||
|
- name: 测试服-产物上传
|
||||||
|
pull: if-not-exists
|
||||||
|
image: appleboy/drone-scp
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- test
|
||||||
|
settings:
|
||||||
|
host:
|
||||||
|
from_secret: HOST_DEV
|
||||||
|
username:
|
||||||
|
from_secret: USER_DEV
|
||||||
|
password:
|
||||||
|
from_secret: PWD_DEV
|
||||||
|
port: 22
|
||||||
|
strip_components: 1
|
||||||
|
target: /www/builder
|
||||||
|
source:
|
||||||
|
- ./dist.tar
|
||||||
|
|
||||||
|
- name: 测试服-部署
|
||||||
|
pull: if-not-exists
|
||||||
|
image: appleboy/drone-ssh
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- test
|
||||||
|
settings:
|
||||||
|
host:
|
||||||
|
from_secret: HOST_DEV
|
||||||
|
username:
|
||||||
|
from_secret: USER_DEV
|
||||||
|
password:
|
||||||
|
from_secret: PWD_DEV
|
||||||
|
port: 22
|
||||||
|
script:
|
||||||
|
- cd /www/builder
|
||||||
|
- mkdir jdt-admin-dev
|
||||||
|
- tar -xzvf dist.tar -C /www/builder/jdt-admin-dev
|
||||||
|
- rm -rf dist.tar
|
||||||
|
- cd jdt-admin-dev
|
||||||
|
- docker build -t jdt-admin-dev .
|
||||||
|
- docker stop jdt-admin-dev
|
||||||
|
- docker rm jdt-admin-dev
|
||||||
|
- docker run -d -p 8085:80 --restart=always --name jdt-admin-dev jdt-admin-dev
|
||||||
|
- cd ..
|
||||||
|
- rm -rf jdt-admin-dev
|
||||||
|
|
||||||
|
- name: 正式服-产物上传
|
||||||
|
pull: if-not-exists
|
||||||
|
image: appleboy/drone-scp
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
settings:
|
||||||
|
host:
|
||||||
|
from_secret: HOST_PROD
|
||||||
|
username:
|
||||||
|
from_secret: USER_PROD
|
||||||
|
password:
|
||||||
|
from_secret: PWD_PROD
|
||||||
|
port: 22
|
||||||
|
strip_components: 1
|
||||||
|
target: /www/builder
|
||||||
|
source:
|
||||||
|
- ./dist.tar
|
||||||
|
|
||||||
|
- name: 正式服-部署
|
||||||
|
pull: if-not-exists
|
||||||
|
image: appleboy/drone-ssh
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
settings:
|
||||||
|
host:
|
||||||
|
from_secret: HOST_PROD
|
||||||
|
username:
|
||||||
|
from_secret: USER_PROD
|
||||||
|
password:
|
||||||
|
from_secret: PWD_PROD
|
||||||
|
port: 22
|
||||||
|
script:
|
||||||
|
- cd /www/builder
|
||||||
|
- mkdir jdt-admin-prod
|
||||||
|
- tar -xzvf dist.tar -C /www/builder/jdt-admin-prod
|
||||||
|
- rm -rf dist.tar
|
||||||
|
- cd jdt-admin-prod
|
||||||
|
- docker build -t jdt-admin-prod .
|
||||||
|
- docker stop jdt-admin-prod
|
||||||
|
- docker rm jdt-admin-prod
|
||||||
|
- docker run -d -p 8085:80 --restart=always --name jdt-admin-prod jdt-admin-prod
|
||||||
|
- cd ..
|
||||||
|
- rm -rf jdt-admin-prod
|
||||||
|
|
||||||
|
- name: 企业微信通知
|
||||||
|
pull: if-not-exists
|
||||||
|
image: plugins/webhook
|
||||||
|
when:
|
||||||
|
branch:
|
||||||
|
- test
|
||||||
|
- main
|
||||||
|
status:
|
||||||
|
- success
|
||||||
|
- failure
|
||||||
|
settings:
|
||||||
|
urls: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=a2065e21-4f92-4f5b-a432-2c0cd1d965b5
|
||||||
|
content_type: application/json
|
||||||
|
template: |
|
||||||
|
{
|
||||||
|
"msgtype": "markdown",
|
||||||
|
"markdown": {
|
||||||
|
"content": "{{#success build.status}}✅{{else}}❌{{/success}}**{{ repo.owner }}/{{ repo.name }}** (Build #{{build.number}})\n
|
||||||
|
>**构建结果**: {{ build.status }}
|
||||||
|
>**构建详情**: [点击查看]({{ build.link }})
|
||||||
|
>**代码分支**: {{ build.branch }}
|
||||||
|
>**提交标识**: {{ build.commit }}
|
||||||
|
>**提交发起**: {{ build.author }}
|
||||||
|
>**提交信息**: {{ build.message }}
|
||||||
|
"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -8,8 +8,8 @@ on:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-deploy-dev:
|
build-and-deploy-dev:
|
||||||
if: gitea.ref_name == 'test'
|
if: github.ref_name == 'test'
|
||||||
runs-on: gitea_act_runner
|
runs-on: docker
|
||||||
container:
|
container:
|
||||||
image: node:24-alpine
|
image: node:24-alpine
|
||||||
steps:
|
steps:
|
||||||
@@ -72,21 +72,20 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
|
WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
|
||||||
STATUS: ${{ job.status }}
|
STATUS: ${{ job.status }}
|
||||||
REPO: ${{ gitea.repository }}
|
REPO: ${{ github.repository }}
|
||||||
RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}
|
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||||
BRANCH: ${{ gitea.ref_name }}
|
BRANCH: ${{ github.ref_name }}
|
||||||
COMMIT: ${{ gitea.sha }}
|
COMMIT: ${{ github.sha }}
|
||||||
ACTOR: ${{ gitea.actor }}
|
ACTOR: ${{ github.actor }}
|
||||||
run: |
|
run: |
|
||||||
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories || true
|
|
||||||
apk add --no-cache curl jq
|
apk add --no-cache curl jq
|
||||||
EMOJI=$( [ "$STATUS" = "success" ] && echo "✅" || echo "❌" )
|
EMOJI=$( [ "$STATUS" = "success" ] && echo "✅" || echo "❌" )
|
||||||
MSG="$(printf "%s**%s** (Run #%s)\n>**构建结果**: %s\n>**构建详情**: [点击查看](%s)\n>**代码分支**: %s\n>**提交标识**: %s\n>**提交发起**: %s\n" "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$STATUS" "$RUN_URL" "$BRANCH" "$COMMIT" "$ACTOR")"
|
MSG="$(printf "%s**%s** (Run #%s)\n>**构建结果**: %s\n>**构建详情**: [点击查看](%s)\n>**代码分支**: %s\n>**提交标识**: %s\n>**提交发起**: %s\n" "$EMOJI" "$REPO" "${{ github.run_number }}" "$STATUS" "$RUN_URL" "$BRANCH" "$COMMIT" "$ACTOR")"
|
||||||
curl -sS -H 'Content-Type: application/json' -d "{\"msgtype\":\"markdown\",\"markdown\":{\"content\":\"$MSG\"}}" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}"
|
curl -sS -H 'Content-Type: application/json' -d "{\"msgtype\":\"markdown\",\"markdown\":{\"content\":\"$MSG\"}}" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}"
|
||||||
|
|
||||||
build-and-deploy-prod:
|
build-and-deploy-prod:
|
||||||
if: gitea.ref_name == 'main'
|
if: github.ref_name == 'main'
|
||||||
runs-on: gitea_act_runner
|
runs-on: docker
|
||||||
container:
|
container:
|
||||||
image: node:24-alpine
|
image: node:24-alpine
|
||||||
steps:
|
steps:
|
||||||
@@ -149,14 +148,13 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
|
WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
|
||||||
STATUS: ${{ job.status }}
|
STATUS: ${{ job.status }}
|
||||||
REPO: ${{ gitea.repository }}
|
REPO: ${{ github.repository }}
|
||||||
RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}
|
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
|
||||||
BRANCH: ${{ gitea.ref_name }}
|
BRANCH: ${{ github.ref_name }}
|
||||||
COMMIT: ${{ gitea.sha }}
|
COMMIT: ${{ github.sha }}
|
||||||
ACTOR: ${{ gitea.actor }}
|
ACTOR: ${{ github.actor }}
|
||||||
run: |
|
run: |
|
||||||
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories || true
|
|
||||||
apk add --no-cache curl jq
|
apk add --no-cache curl jq
|
||||||
EMOJI=$( [ "$STATUS" = "success" ] && echo "✅" || echo "❌" )
|
EMOJI=$( [ "$STATUS" = "success" ] && echo "✅" || echo "❌" )
|
||||||
MSG="$(printf "%s**%s** (Run #%s)\n>**构建结果**: %s\n>**构建详情**: [点击查看](%s)\n>**代码分支**: %s\n>**提交标识**: %s\n>**提交发起**: %s\n" "$EMOJI" "$REPO" "${{ gitea.run_number }}" "$STATUS" "$RUN_URL" "$BRANCH" "$COMMIT" "$ACTOR")"
|
MSG="$(printf "%s**%s** (Run #%s)\n>**构建结果**: %s\n>**构建详情**: [点击查看](%s)\n>**代码分支**: %s\n>**提交标识**: %s\n>**提交发起**: %s\n" "$EMOJI" "$REPO" "${{ github.run_number }}" "$STATUS" "$RUN_URL" "$BRANCH" "$COMMIT" "$ACTOR")"
|
||||||
curl -sS -H 'Content-Type: application/json' -d "{\"msgtype\":\"markdown\",\"markdown\":{\"content\":\"$MSG\"}}" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}"
|
curl -sS -H 'Content-Type: application/json' -d "{\"msgtype\":\"markdown\",\"markdown\":{\"content\":\"$MSG\"}}" "https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=${WEBHOOK_KEY}"
|
||||||
|
|||||||
@@ -186,6 +186,7 @@ const selectOptions = ref([
|
|||||||
label: '商家名称',
|
label: '商家名称',
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
const columns = ref([
|
const columns = ref([
|
||||||
{
|
{
|
||||||
title: '订单号',
|
title: '订单号',
|
||||||
|
|||||||
Reference in New Issue
Block a user