Merge pull request #21 from GOOD-AN/dev

合并 Dev

Author: GOOD-AN

.gitignore

@@ -0,0 +1,6 @@
+__pycache__
+venv
+config.*
+log
+user_info
+exchange_list.json

README.md

@@ -1,21 +1,21 @@
-<p align="center"><img alt="项目图标" src="./images/logo.png"></p>
+<p align="center"><img alt="项目图标" src="data/images/logo.png"></p>
 <div align="center">
   <a href="https://github.com/GOOD-AN/Mys-Exchange-Goods/releases/latest" target="_blank">
     <img alt="最新发行版" src="https://img.shields.io/github/v/release/GOOD-AN/Mys-Exchange-Goods?logo=python&style=for-the-badge">
   </a>
-  <img alt="Python 版本要求" src="https://img.shields.io/badge/Python-3.6+-green.svg?longCache=true&style=for-the-badge">
+  <img alt="Python 版本要求" src="https://img.shields.io/badge/Python-3.7+-green.svg?longCache=true&style=for-the-badge">
   <img alt="GitHub CodeQL 代码检查" src="https://img.shields.io/github/actions/workflow/status/GOOD-AN/Mys-Exchange-Goods/codeql.yml?logo=github&style=for-the-badge">
   <img alt="开源协议" src="https://img.shields.io/badge/License-mit-blue.svg?longCache=true&style=for-the-badge">
 </div>
 
 ## 🖨️ 相关文档
 在使用前请务必阅读文档，若有疑问，请先查阅文档或者Issues里是否有相同的问题
 
-* [使用说明](https://github.com/GOOD-AN/Mys-Exchange-Goods/wiki/运行方法)
-* [配置说明](https://github.com/GOOD-AN/Mys-Exchange-Goods/wiki/配置文件说明)
-* [更新日志](./docs/CHANGELOG.md)
-* [常见问题](https://github.com/GOOD-AN/Mys-Exchange-Goods/wiki/FAQ)
-* [关于项目](./docs/ABOUT.md)
+* 使用说明 [DOCS](./docs/运行方法.md) 或 [WIKI](https://github.com/GOOD-AN/Mys-Exchange-Goods/wiki/运行方法)
+* 配置说明 [DOCS](./docs/配置文件说明.md) 或 [WIKI](https://github.com/GOOD-AN/Mys-Exchange-Goods/wiki/配置文件说明)
+* 更新日志 [DOCS](./docs/CHANGELOG.md)
+* 常见问题 [DOCS](./docs/FAQ.md) 或 [WIKI](https://github.com/GOOD-AN/Mys-Exchange-Goods/wiki/FAQ)
+* 关于项目 [DOCS](./docs/ABOUT.md)
 
 ## 💬 交流反馈
 请于[此页](https://blog.goodant.top/about/)下方的联系方式中交流 | **请优先使用QQ群**

config/default_config.ini

@@ -2,25 +2,18 @@
 name = Mys_Exch_Goods
 env = local
 branch = main
-version = 2.0.4
+version = 3.0.0
 
-[user_info]
-cookie =
-uid =
-address_id =
-game_uid =
+[update_setting]
+check_enable = true
+update_enable = true
+check_account_enable = true
+update_account_enable = true
 
-[exchange_info]
-good_id =
-time = 0000-00-00 00:00:00
+[exchange_setting]
 thread = 3
 retry = 5
 
-[check_network]
-enable = true
-interval_time = 15
-stop_time = 30
-
 [notify]
 enable = false
 

config/logging_config.py

@@ -2,12 +2,12 @@
 日志配置
 """
 log_config = {
-    "version": 1.0,
+    "version": 1,
     "formatters": {
-        "standard_out": {
+        "simplify_output": {
             "format": "%(message)s"
         },
-        "standard_file": {
+        "full_output": {
             "format": "[%(asctime)s] MEG.%(levelname)s: (%(module)s) >>> %(message)s",
             "datefmt": "%Y-%m-%d %H:%M:%S %z"
         }
@@ -17,27 +17,42 @@
         "standard_console": {
             "class": "logging.StreamHandler",
             "level": "DEBUG",
-            "formatter": "standard_out"
+            "formatter": "simplify_output"
         },
         "standard_file": {
             "class": "logging.handlers.TimedRotatingFileHandler",
-            "level": "INFO",
-            "formatter": "standard_file",
+            "level": "DEBUG",
+            "formatter": "full_output",
             "filename": "log/default_log.log",
             "when": 'D',
             "interval": 1,
             "backupCount": 5,
             "encoding": "utf-8"
+        },
+        "debug_console": {
+            "class": "logging.StreamHandler",
+            "level": "DEBUG",
+            "formatter": "full_output"
         }
     },
     "loggers": {
-        "standard_logger": {
+        "info_file_logger": {
             "handlers": ["standard_console", "standard_file"],
             "level": "INFO",
             "propagate": False
         },
-        "debug_logger": {
+        "debug_file_logger": {
+            "handlers": ["standard_console", "standard_file"],
+            "level": "DEBUG",
+            "propagate": False
+        },
+        "info_console_logger": {
             "handlers": ["standard_console"],
+            "level": "INFO",
+            "propagate": False
+        },
+        "debug_console_logger": {
+            "handlers": ["debug_console"],
             "level": "DEBUG",
             "propagate": False
         }

images/logo.png data/images/logo.pngimages/logo.png renamed to data/images/logo.png

@@ -1,5 +1,32 @@
 # 更新日志
 
+## [3.0.0.230420 Alpha] - 2023-0420
+
+### Added
+- 添加了对多账号多商品的支持
+- 添加了设置兑换商品直接添加兑换任务的功能
+
+### Changed
+- 重构项目结构
+- 将定时任务修改为异步
+
+### Removed
+- 移除了对网络延迟的检查
+
+# 历史版本
+
+<details>
+    <summary>展开查看</summary>
+
+## [2.0.5.230313 Alpha] - 2023-0313
+
+### Changed
+- 将请求库由requests改为HTTPX
+- 兑换商品修改为异步
+
+### Fixed
+- 修复创建目录报错
+
 ## [2.0.4.221117 Alpha] - 2022-11-17
 
 ### Fixed
@@ -34,11 +61,6 @@
 - 项目目录重构
 - 优化部分功能逻辑
 
-# 历史版本
-
-<details>
-    <summary>展开查看</summary>
-
 ## [1.1.2.221101 Alpha] - 2022-11-01
 
 ### Changed

images/logo_small.ico data/images/logo_small.icoimages/logo_small.ico renamed to data/images/logo_small.ico

@@ -0,0 +1,11 @@
+### Q: 打开程序闪退
+**A:** 请在命令行内打开程序，并将报错或者发生的现象提交issue。
+
+### Q: No such file or directory: ''
+**A:** 检查是否存在单引号内的文件，若存在，请将报错完整的提交issue。
+
+### Q: cookie、address_id、good_id不知道怎么办
+**A:** 请仔细查看配置文件说明，可以通过程序获取并自动填写。
+
+### Q: 有部分配置不知道怎么填写怎么办
+**A:** 请仔细查看配置文件说明，酌情修改。

images/logo_small.png data/images/logo_small.pngimages/logo_small.png renamed to data/images/logo_small.png

@@ -0,0 +1,17 @@
+### 直接运行
+按需求下载已打包压缩好的压缩文件(即将支持多系统)，运行根目录的程序即可。[下载地址](https://github.com/GOOD-AN/Mys-Exchange-Goods/releases/latest)
+
+### 源码运行
+**首先需在你的计算机上准备python程序，版本请大于3.6，若使用其余版本而无法运行，本项目不做任何解答**
+
+#### 第一步、下载此项目
+`git clone git@github.com:GOOD-AN/Mys-Exchange-Goods.git`
+
+#### 第二步、安装所需运行库
+`pip install -r requirements.txt`
+
+#### (可选，因可通过程序配置)第三步、配置`config`文件夹内的配置文件
+按[此说明](./配置文件说明.md)配置
+
+#### 第四步、运行`main.py`
+`python main.py`