From d85892f615c21f41f53642b76e3250a067f91f09 Mon Sep 17 00:00:00 2001 From: pengshiyu <1940607002@qq.com> Date: Sat, 8 Jul 2023 15:15:05 +0800 Subject: [PATCH] fix --- .github/workflows/docker-publish.yml | 8 ++++++++ .github/workflows/python-publish.yml | 8 ++++++++ CHANGELOG.md | 3 +++ domain_admin/main.py | 10 +++++++++- http/domain-info.http | 1 + 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 09176bf731..bb4180736d 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -48,6 +48,14 @@ jobs: token: ${{ secrets.GH_PAT }} path: 'domain_admin/public' + - name: Checkout + uses: actions/checkout@v3 + with: + repository: 'mouday/domain-admin-mini' + ref: 'dist' + token: ${{ secrets.GH_PAT }} + path: 'domain_admin/public/m' + - name: Build Docker Image uses: docker/build-push-action@v2 if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml index d93f54ddfe..8641d54815 100644 --- a/.github/workflows/python-publish.yml +++ b/.github/workflows/python-publish.yml @@ -45,6 +45,14 @@ jobs: token: ${{ secrets.GH_PAT }} path: 'domain_admin/public' + - name: Checkout + uses: actions/checkout@v3 + with: + repository: 'mouday/domain-admin-mini' + ref: 'dist' + token: ${{ secrets.GH_PAT }} + path: 'domain_admin/public/m' + - name: Build and publish if: startsWith(github.ref, 'refs/tags/') env: diff --git a/CHANGELOG.md b/CHANGELOG.md index dd672d5179..ba4971b3c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ - ssl证书申请 - admin拥有所有权限 +- v1.4.27(2023-07-08) + - 新增 移动端H5页面 + - v1.4.26(2023-07-07) - 修复 久远的旧版本升级到新版本出错的问题 diff --git a/domain_admin/main.py b/domain_admin/main.py index 4c185b1e45..c677b9104c 100644 --- a/domain_admin/main.py +++ b/domain_admin/main.py @@ -54,6 +54,15 @@ def index(): return send_file('public/index.html') +@app.get('/m/') +def mobile(): + """ + 移动端首页 + :return: + """ + return send_file('public/m/index.html') + + @app.get('/test') def app_hello(): """ @@ -105,5 +114,4 @@ def init_app(flask_app): system_service.init_system_config(flask_app) - init_app(app) diff --git a/http/domain-info.http b/http/domain-info.http index 1546a95e8c..db717d9515 100644 --- a/http/domain-info.http +++ b/http/domain-info.http @@ -95,6 +95,7 @@ X-TOKEN: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjoxLCJleHAiOjE2NjQ5Nj {} +### POST {{baseUrl}}/api/checkDomainCert Content-Type: application/json