Compare commits

..

47 Commits

Author SHA1 Message Date
8fa1ea3bb0 ci(other): ci脚本换源
All checks were successful
CI Build & Deploy / build-and-deploy-dev (push) Has been skipped
CI Build & Deploy / build-and-deploy-prod (push) Successful in 1m50s
2025-11-05 11:47:42 +08:00
b8116640fc ci: test ci 2025-11-05 11:47:31 +08:00
8aa6424fad ci: test ci 2025-11-05 11:47:19 +08:00
cbf38a87b7 ci: test ci 2025-11-05 11:46:42 +08:00
f35ba89165 ci: test ci 2025-11-05 11:46:24 +08:00
5146fe7932 ci: update ci
All checks were successful
CI Build & Deploy / build-and-deploy-dev (push) Has been skipped
CI Build & Deploy / build-and-deploy-prod (push) Successful in 2m44s
2025-10-31 18:03:40 +08:00
b7980221e7 ci: ci test 2025-10-31 18:03:40 +08:00
101ff278d0 ci: test ci 2025-10-31 18:03:40 +08:00
6e51a2e90c ci: test ci 2025-10-31 18:03:40 +08:00
d6bd167cc5 ci: test ci 2025-10-31 18:03:31 +08:00
9952e47f58 ci: test ci 2025-10-31 18:03:31 +08:00
2f6ad79660 build(deps): 依赖升级 2025-10-31 18:03:31 +08:00
07e3e15be8 refactor: 活动订单id显示变更嘉联
Some checks failed
continuous-integration/drone/push Build is failing
2025-10-31 14:40:14 +08:00
d5751d305c feat(custom): 多API版本
All checks were successful
continuous-integration/drone/push Build is passing
2025-09-23 18:27:30 +08:00
5e32c846c7 feat(custom): 订单列表支付方式筛选增加新条件
All checks were successful
continuous-integration/drone/push Build is passing
2025-05-29 16:03:28 +08:00
7609765042 mod(custom): \! 2025-05-29 16:03:28 +08:00
96c802be5f Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-19 15:35:43 +08:00
667bb80456 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-14 23:07:27 +08:00
e9d5ca54a3 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-12 01:43:11 +08:00
5128b519b9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-09-06 21:39:40 +08:00
df831595c9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 18:11:27 +08:00
7dda1e1734 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 05:33:50 +08:00
28021165e2 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-04 00:20:51 +08:00
bd1b127306 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-03 23:33:32 +08:00
503b077c6b Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-31 21:04:16 +08:00
d4ab8720cb Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-28 10:45:31 +08:00
4488180cc9 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-20 18:47:22 +08:00
d40146c07e Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-29 16:10:01 +08:00
06b43dd14d Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-20 16:07:08 +08:00
9657f989cd Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-09 19:22:19 +08:00
2c881a2084 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-28 16:39:46 +08:00
45e6c145e5 Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-15 16:04:06 +08:00
77c7b1e8b9 Merge branch 'test' 2024-03-08 17:59:07 +08:00
f5d75820d7 Merge branch 'test' 2024-01-31 23:00:16 +08:00
6279e8c692 Merge branch 'test' 2024-01-27 14:13:25 +08:00
9f89ccab42 Merge branch 'test' 2023-12-24 00:04:28 +08:00
673a17a817 Merge branch 'test' 2023-12-22 22:09:09 +08:00
3fa884fbad Merge branch 'test' 2023-12-20 23:10:53 +08:00
c733fc1124 Merge branch 'test' 2023-12-19 23:02:13 +08:00
d15a377710 Merge branch 'test' 2023-12-17 00:46:54 +08:00
2c13d9d25d Merge branch 'test' 2023-12-15 20:50:42 +08:00
1338ad99ad Merge branch 'test' 2023-12-13 20:47:00 +08:00
9416fced28 Merge branch 'test' 2023-12-08 20:48:41 +08:00
92b6c6bea2 Merge branch 'test' 2023-12-04 18:44:43 +08:00
23dca69b2f Merge branch 'test' 2023-11-29 18:54:26 +08:00
d8c9c15442 Merge branch 'test' 2023-11-29 15:33:51 +08:00
bcf6fa4df2 build(custom): 增加idea配置 2023-10-28 20:19:47 +08:00
3 changed files with 16 additions and 173 deletions

View File

@@ -1,158 +0,0 @@
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,7 +8,7 @@ on:
jobs:
build-and-deploy-dev:
if: github.ref_name == 'test'
if: gitea.ref_name == 'test'
runs-on: gitea_act_runner
container:
image: node:24-alpine
@@ -72,19 +72,20 @@ jobs:
env:
WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
STATUS: ${{ job.status }}
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 }}
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 }}
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" "${{ github.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" "${{ gitea.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: github.ref_name == 'main'
if: gitea.ref_name == 'main'
runs-on: gitea_act_runner
container:
image: node:24-alpine
@@ -148,13 +149,14 @@ jobs:
env:
WEBHOOK_KEY: ${{ secrets.QYWX_WEBHOOK_KEY }}
STATUS: ${{ job.status }}
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 }}
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 }}
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" "${{ github.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" "${{ gitea.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,7 +186,6 @@ const selectOptions = ref([
label: '商家名称',
},
])
const columns = ref([
{
title: '订单号',