From d990c5c183745acc0683b17b9425f021368efa0a Mon Sep 17 00:00:00 2001 From: Night-stars-1 Date: Sat, 28 Dec 2024 14:45:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ci:=20=E6=B7=BB=E5=8A=A0=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 403fe94..78227d8 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -60,6 +60,7 @@ jobs: run: | Rename-Item -Path .\dist\heiyue -NewName Auto_Resonance_${{ github.ref_name }} Compress-Archive -Path .\dist\Auto_Resonance_${{ github.ref_name }}\ -DestinationPath .\dist\Auto_Resonance_${{ github.ref_name }}.zip -Force + Compress-Archive -Path .\dist\Auto_Resonance_${{ github.ref_name }}\HeiYue.exe -DestinationPath .\dist\Auto_Resonance_Incremental_${{ github.ref_name }}.zip -Force - name: Create release if: startsWith(github.ref, 'refs/tags/') @@ -69,4 +70,5 @@ jobs: body: ${{ steps.generate_changelog.outputs.changelog }} files: | ./dist/Auto_Resonance_${{ github.ref_name }}.zip + ./dist/Auto_Resonance_Incremental_${{ github.ref_name }}.zip make_latest: true From 075941c9350e7a0846d2bb6835b02d96bc96b40d Mon Sep 17 00:00:00 2001 From: Night-stars-1 Date: Sat, 28 Dec 2024 14:48:09 +0800 Subject: [PATCH 2/3] fix: AttributeError: GoodsData --- core/model/city_goods.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/core/model/city_goods.py b/core/model/city_goods.py index 0367c1e..eaac241 100644 --- a/core/model/city_goods.py +++ b/core/model/city_goods.py @@ -10,20 +10,20 @@ from pydantic import BaseModel, Field, RootModel -class GoodsData(BaseModel): - """商品数据""" - - num: int = 0 - """数量""" - buy_price: int = 0 - """购买价格""" - sell_price: int = 0 - """出售价格""" - profit: int = 0 - """利润""" class RouteModel(BaseModel): """目标商品模型""" + class GoodsData(BaseModel): + """商品数据""" + num: int = 0 + """数量""" + buy_price: int = 0 + """购买价格""" + sell_price: int = 0 + """出售价格""" + profit: int = 0 + """利润""" + buy_city_name: str = "" """购买城市""" buy_argaining_num: int = 0 From 3d604dbf50106f7e8d3d8ab198c2d14f2218eefc Mon Sep 17 00:00:00 2001 From: Night-stars-1 Date: Sat, 28 Dec 2024 14:48:47 +0800 Subject: [PATCH 3/3] fix: cannot import name 'GoodsData' --- auto/run_business/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/auto/run_business/main.py b/auto/run_business/main.py index 7915070..3f82ec7 100644 --- a/auto/run_business/main.py +++ b/auto/run_business/main.py @@ -1,12 +1,12 @@ """ Author: Night-stars-1 nujj1042633805@gmail.com Date: 2024-04-05 17:14:29 -LastEditTime: 2024-12-28 02:52:00 +LastEditTime: 2024-12-28 14:48:21 LastEditors: Night-stars-1 nujj1042633805@gmail.com """ import time -from typing import Dict, Literal, Union +from typing import Dict, Literal from loguru import logger @@ -19,7 +19,7 @@ from core.goods import show from core.image import get_bgr from core.model import app -from core.model.city_goods import GoodsData, RouteModel, RoutesModel +from core.model.city_goods import RouteModel, RoutesModel from core.module.bgr import BGR, BGRGroup from core.preset import click_station, get_city, go_home, go_outlets, wait_gbr from core.utils import read_json