项目架构重构

UniMars · Mar 19, 2023 · dbaba4e · dbaba4e
1 parent 5007f33
commit dbaba4e
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-/setup.bat
-config.txt
+/install.bat
+config.ini
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <div align=center>
-<img alt="LOGO" src=./data/icon.svg width="256" height="256" />
+<img alt="LOGO" src=bill-manager/data/icon.svg  height="256" />
 
 # 个人账单管理(Bill Manager)
 <br>
@@ -15,7 +15,7 @@
 ## 文件结构及功能说明：
 
 - Bill Manager
-  - `start.py`: 启动应用的主程序
+  - `main.py`: 启动应用的主程序
   - `data`: 数据存储路径
   - `utils`: 存放用于账单管理的具体实现代码的文件夹
     - `util.py`: 支持通用的账单处理函数

diff --git a/data/icon.ico → bill-manager/data/icon.ico b/data/icon.ico → bill-manager/data/icon.ico
diff --git a/data/icon.png → bill-manager/data/icon.png b/data/icon.png → bill-manager/data/icon.png
diff --git a/data/icon.svg → bill-manager/data/icon.svg b/data/icon.svg → bill-manager/data/icon.svg
diff --git a/start.py → bill-manager/main.py b/start.py → bill-manager/main.py
@@ -42,7 +42,7 @@ def starter(write_p, read_p: str = r"D:\Document\材料\账单&发票"):
 
 if __name__ == '__main__':
     # path = r"C:\Users\Lenovo\OneDrive\Documents\个人财务管理.xlsx"
-    config = "./config.txt"
+    config = "./config.ini"
     open(config, 'a')
     with open(config, 'r', encoding='utf-8') as file:
         lines = file.readlines()

diff --git a/utils/alipay.py → bill-manager/utils/alipay.py b/utils/alipay.py → bill-manager/utils/alipay.py
@@ -4,7 +4,7 @@
 from re import compile
 from openpyxl import load_workbook
 import pandas as pd
-from util import BillReader, BillWriter, plus_minus_filter, JRZZLJ, bill_filter
+from utils.util import BillReader, BillWriter, plus_minus_filter, JRZZLJ, bill_filter
 
 
 class ALiPBillReader(BillReader):

diff --git a/utils/ccb.py → bill-manager/utils/ccb.py b/utils/ccb.py → bill-manager/utils/ccb.py
@@ -3,7 +3,7 @@
 import pandas as pd
 from xlrd import open_workbook
 
-from util import BillReader, BillWriter, bill_filter, JRZZLJ
+from utils.util import BillReader, BillWriter, bill_filter, JRZZLJ
 
 # 设置常量
 JYJE = "交易金额"

diff --git a/utils/util.py → bill-manager/utils/util.py b/utils/util.py → bill-manager/utils/util.py
diff --git a/utils/wechat.py → bill-manager/utils/wechat.py b/utils/wechat.py → bill-manager/utils/wechat.py
@@ -1,7 +1,7 @@
 import os
 
 import pandas as pd
-from util import BillReader, BillWriter, bill_filter, plus_minus_filter, JRZZLJ
+from utils.util import BillReader, BillWriter, bill_filter, plus_minus_filter, JRZZLJ
 
 
 class WCBillReader(BillReader):

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,3 @@
+openpyxl==3.1.2
+pandas==1.5.3
+xlrd==2.0.1