Compare commits

..

48 Commits

Author SHA1 Message Date
b20ae843d6 ci: test ci
Some checks failed
CI Build & Deploy / build-and-deploy-dev (push) Has been cancelled
CI Build & Deploy / build-and-deploy-prod (push) Has been cancelled
2025-10-31 16:54:11 +08:00
90b920b9b4 ci: test ci 2025-10-31 16:44:32 +08:00
7c198fac43 build(deps): 依赖升级
Some checks failed
continuous-integration/drone/push Build is failing
2025-10-31 15:37:57 +08:00
f231939ae9 refactor: 活动订单id显示变更嘉联
Some checks failed
continuous-integration/drone/push Build is failing
2025-10-31 14:39:18 +08:00
914c25e962 feat(custom): 多API版本
All checks were successful
continuous-integration/drone/push Build is passing
2025-09-23 18:27:19 +08:00
4261f8c5f1 feat(custom): 订单列表支付方式筛选增加新条件
All checks were successful
continuous-integration/drone/push Build is passing
2025-05-29 15:33:56 +08:00
e90e74ff40 mod(custom): \! 2025-05-29 15:33:56 +08:00
d520e95b3b Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-19 15:16:09 +08:00
7b5bb9b565 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-13 16:40:37 +08:00
e7b1992932 Merge branch 'test' of https://gitea.jdt168.com/XinLingKeJi/jdt-admin into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-12 01:42:56 +08:00
aee9a2d9c0 Merge branch 'dev' into test 2024-09-12 01:42:52 +08:00
f031d84745 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-09 16:04:14 +08:00
94cb709702 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-06 21:05:30 +08:00
b2ff663fa8 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-05 20:30:25 +08:00
5c129c35af Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-05 16:42:12 +08:00
2d067aae44 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-03 22:24:16 +08:00
0f1fa9c932 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 18:03:33 +08:00
a8a3bc4ee9 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 05:33:39 +08:00
7fc8762bd9 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-04 00:20:40 +08:00
d21b06875a Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-01 22:56:51 +08:00
65ade0ef3a Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-29 18:48:12 +08:00
e051d75d21 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-29 18:35:23 +08:00
8daa1d4925 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-29 18:06:12 +08:00
3e920e2873 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-28 10:45:22 +08:00
f75d9eef81 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-19 17:03:31 +08:00
0ea8754321 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-19 11:01:23 +08:00
b47bc1b35b Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-18 19:05:04 +08:00
cab4da5b28 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-17 20:10:00 +08:00
7c7d395518 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-17 18:29:45 +08:00
324426ef4a Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-06-21 19:51:24 +08:00
d3a8a0425c Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-29 16:09:52 +08:00
5c9b248624 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-20 16:06:56 +08:00
a7cb1758e2 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-09 19:20:19 +08:00
25e4185183 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-28 16:39:38 +08:00
233824e959 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-21 18:36:08 +08:00
1f7669f033 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-20 16:38:37 +08:00
18b2e7361f Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-15 16:03:15 +08:00
2d109b22a0 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 20:53:46 +08:00
6256f59fe9 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 18:51:10 +08:00
49bbe2a086 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 18:48:50 +08:00
929a9e5826 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 18:30:34 +08:00
a01f94bfb3 Merge branch 'dev' into test
Some checks failed
continuous-integration/drone/push Build is failing
2024-03-08 18:23:19 +08:00
5c7a54cfb4 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 18:16:49 +08:00
b027215afa Merge branch 'dev' into test 2024-03-08 17:52:24 +08:00
165149e0c2 Merge branch 'dev' into test 2024-03-07 18:57:32 +08:00
373e25cf82 Merge branch 'dev' into test 2024-01-31 22:59:50 +08:00
ce68556827 Merge branch 'dev' into test 2024-01-25 23:02:04 +08:00
cb2e68cede Merge pull request 'feat(custom): 新增记录' (#1) from dev into test
Reviewed-on: #1
2024-01-25 22:54:27 +08:00
3 changed files with 175 additions and 18 deletions

158
.drone.yml Normal file
View 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 }}
"
}
}

View File

@@ -8,8 +8,8 @@ on:
jobs:
build-and-deploy-dev:
if: gitea.ref_name == 'test'
runs-on: gitea_act_runner
if: github.ref_name == 'test'
runs-on: docker
container:
image: node:24-alpine
steps:
@@ -72,21 +72,20 @@ jobs:
env:
WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
STATUS: ${{ job.status }}
REPO: ${{ gitea.repository }}
RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}
BRANCH: ${{ gitea.ref_name }}
COMMIT: ${{ gitea.sha }}
ACTOR: ${{ gitea.actor }}
REPO: ${{ github.repository }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
BRANCH: ${{ github.ref_name }}
COMMIT: ${{ github.sha }}
ACTOR: ${{ github.actor }}
run: |
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories || true
apk add --no-cache curl jq
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}"
build-and-deploy-prod:
if: gitea.ref_name == 'main'
runs-on: gitea_act_runner
if: github.ref_name == 'main'
runs-on: docker
container:
image: node:24-alpine
steps:
@@ -149,14 +148,13 @@ jobs:
env:
WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
STATUS: ${{ job.status }}
REPO: ${{ gitea.repository }}
RUN_URL: ${{ gitea.server_url }}/${{ gitea.repository }}/actions/runs/${{ gitea.run_id }}
BRANCH: ${{ gitea.ref_name }}
COMMIT: ${{ gitea.sha }}
ACTOR: ${{ gitea.actor }}
REPO: ${{ github.repository }}
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
BRANCH: ${{ github.ref_name }}
COMMIT: ${{ github.sha }}
ACTOR: ${{ github.actor }}
run: |
sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories || true
apk add --no-cache curl jq
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}"

View File

@@ -186,6 +186,7 @@ const selectOptions = ref([
label: '商家名称',
},
])
const columns = ref([
{
title: '订单号',