From 1900d4eaf5d1cf051994b8465f14d1c0b76f2962 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 6 May 2025 12:57:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?test(ci):=20=E6=B5=8B=E8=AF=95ssh=E9=83=A8?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ssh-test.yml | 53 ++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 .github/workflows/ssh-test.yml diff --git a/.github/workflows/ssh-test.yml b/.github/workflows/ssh-test.yml new file mode 100644 index 0000000..ffb1711 --- /dev/null +++ b/.github/workflows/ssh-test.yml @@ -0,0 +1,53 @@ +# AUTO_MAA:A MAA Multi Account Management and Automation Tool +# Copyright © 2024-2025 DLmaster361 + +# This file is part of AUTO_MAA. + +# AUTO_MAA is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation, either version 3 of the License, +# or (at your option) any later version. + +# AUTO_MAA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty +# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See +# the GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with AUTO_MAA. If not, see . + +# Contact: DLmaster_361@163.com + +name: Build AUTO_MAA + +on: + workflow_dispatch: + +permissions: + contents: write + actions: write + +jobs: + pre_check: + name: Pre Checks + runs-on: ubuntu-latest + steps: + - name: Repo Check + id: repo_check + run: | + if [[ "$GITHUB_REPOSITORY" != "DLmaster361/AUTO_MAA" ]]; then + echo "When forking this repository to make your own builds, you have to adjust this check." + exit 1 + fi + exit 0 + publish_release: + name: Publish release + needs: build_AUTO_MAA + runs-on: ubuntu-20.04 + steps: + - name: Setup SSH Key + run: | + mkdir -p ~/.ssh + echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa + chmod 600 ~/.ssh/id_rsa + ssh-keyscan -p ${{ secrets.SSH_PORT }} -H ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts From d68d49a46921ed8f3d6b8a53892f04837e8e1717 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 6 May 2025 13:00:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?test(ci):=20=E6=9B=B4=E6=AD=A3=E7=8E=AF?= =?UTF-8?q?=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ssh-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ssh-test.yml b/.github/workflows/ssh-test.yml index ffb1711..f0ecf68 100644 --- a/.github/workflows/ssh-test.yml +++ b/.github/workflows/ssh-test.yml @@ -18,7 +18,7 @@ # Contact: DLmaster_361@163.com -name: Build AUTO_MAA +name: ssh-test on: workflow_dispatch: @@ -42,7 +42,7 @@ jobs: exit 0 publish_release: name: Publish release - needs: build_AUTO_MAA + needs: pre_check runs-on: ubuntu-20.04 steps: - name: Setup SSH Key From f22c1aeae326d39613d6d315f1509f901d795520 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 6 May 2025 13:07:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?test(ci):=20=E8=A1=A5=E5=85=85=E6=AD=A5?= =?UTF-8?q?=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ssh-test.yml | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ssh-test.yml b/.github/workflows/ssh-test.yml index f0ecf68..98f2df6 100644 --- a/.github/workflows/ssh-test.yml +++ b/.github/workflows/ssh-test.yml @@ -23,31 +23,18 @@ name: ssh-test on: workflow_dispatch: -permissions: - contents: write - actions: write - jobs: - pre_check: - name: Pre Checks - runs-on: ubuntu-latest - steps: - - name: Repo Check - id: repo_check - run: | - if [[ "$GITHUB_REPOSITORY" != "DLmaster361/AUTO_MAA" ]]; then - echo "When forking this repository to make your own builds, you have to adjust this check." - exit 1 - fi - exit 0 publish_release: name: Publish release - needs: pre_check - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: + - name: Checkout + uses: actions/checkout@v4 - name: Setup SSH Key run: | mkdir -p ~/.ssh echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa chmod 600 ~/.ssh/id_rsa ssh-keyscan -p ${{ secrets.SSH_PORT }} -H ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts + - name: Upload Release to Server + run: scp -P ${{ secrets.SSH_PORT }} -r artifacts/* ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}:/mnt/data/AUTO_MAA/ \ No newline at end of file From e7b6743e10c68430fe91067059ed6c8f91f08778 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Tue, 6 May 2025 17:43:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?test:=20=E7=A7=BB=E9=99=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/ssh-test.yml | 40 ---------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 .github/workflows/ssh-test.yml diff --git a/.github/workflows/ssh-test.yml b/.github/workflows/ssh-test.yml deleted file mode 100644 index 98f2df6..0000000 --- a/.github/workflows/ssh-test.yml +++ /dev/null @@ -1,40 +0,0 @@ -# AUTO_MAA:A MAA Multi Account Management and Automation Tool -# Copyright © 2024-2025 DLmaster361 - -# This file is part of AUTO_MAA. - -# AUTO_MAA is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation, either version 3 of the License, -# or (at your option) any later version. - -# AUTO_MAA is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -# the GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with AUTO_MAA. If not, see . - -# Contact: DLmaster_361@163.com - -name: ssh-test - -on: - workflow_dispatch: - -jobs: - publish_release: - name: Publish release - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Setup SSH Key - run: | - mkdir -p ~/.ssh - echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan -p ${{ secrets.SSH_PORT }} -H ${{ secrets.SERVER_IP }} >> ~/.ssh/known_hosts - - name: Upload Release to Server - run: scp -P ${{ secrets.SSH_PORT }} -r artifacts/* ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}:/mnt/data/AUTO_MAA/ \ No newline at end of file From 5e46040db6f36d0e3a366cfbdb7f29029a7374f3 Mon Sep 17 00:00:00 2001 From: DLmaster361 Date: Mon, 12 May 2025 14:53:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E6=97=A5=E5=BF=97=E5=88=86?= =?UTF-8?q?=E6=9E=90=E5=BF=BD=E7=95=A5MAA=E8=B6=85=E6=97=B6=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/config.py | 2 +- app/models/MAA.py | 2 ++ resources/version.json | 9 +++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/core/config.py b/app/core/config.py index d5f8628..c7a92af 100644 --- a/app/core/config.py +++ b/app/core/config.py @@ -624,7 +624,7 @@ class MaaUserConfig(QConfig): class AppConfig(GlobalConfig): - VERSION = "4.3.8.1" + VERSION = "4.3.8.2" gameid_refreshed = Signal() PASSWORD_refreshed = Signal() diff --git a/app/models/MAA.py b/app/models/MAA.py index 0557f8c..03727da 100644 --- a/app/models/MAA.py +++ b/app/models/MAA.py @@ -923,6 +923,8 @@ class MaaManager(QObject): latest_time = start_time for _ in logs[::-1]: try: + if "如果长时间无进一步日志更新，可能需要手动干预。" in _: + continue latest_time = datetime.strptime(_[1:20], "%Y-%m-%d %H:%M:%S") break except ValueError: diff --git a/resources/version.json b/resources/version.json index 698872b..ae63f5e 100644 --- a/resources/version.json +++ b/resources/version.json @@ -1,9 +1,14 @@ { - "main_version": "4.3.8.1", + "main_version": "4.3.8.2", "version_info": { + "4.3.8.2": { + "修复bug": [ + "日志分析忽略MAA超时提示" + ] + }, "4.3.8.1": { "新增功能": [ - "自定义基建显示配置名称", + "自定义基建显示配置名称 #46", "主调度台添加仅一次电源任务" ], "修复bug": [