Merge branch 'master' of [email protected]:firesuiry/jdmm-client.git

.gitignore

@@ -4,4 +4,5 @@
 /__pycache__/
 *.xlsx
 *.spec
-*.pyc
+*.pyc
+venv

account_manage.py

@@ -10,12 +10,14 @@
 path = Path('./data')
 FILE_XLS_FILE = './已发布文件.xls'
 
+
 class GenerateFileXlsWorker(QThread):
     log_signal = Signal(str)
 
     def __init__(self, cookie):
         super().__init__()
         self.cookie = cookie
+        # ；；；
 
     def generate_data_xls(self):
         next_url = FILE_QUERY_URL
@@ -67,9 +69,6 @@ def run(self):
             self.log_signal.emit(f'出现错误 当前错误：{e}')
 
 
-
-
-
 class AccountManager:
     def __init__(self, window, main):
         self.window = window

main.py

@@ -25,9 +25,6 @@ def createEditor(self, QWidget, QStyleOptionViewItem, QModelIndex):
         return None
 
 
-
-
-
 class LoginWorker(QThread):
     login_finish_signal = Signal(requests.Response)
 
@@ -122,9 +119,6 @@ def run(self):
                 f.close()
 
 
-
-
-
 class MainWindow(QWidget):
     def __init__(self):
         super(MainWindow, self).__init__()

main.spec

@@ -5,11 +5,12 @@ block_cipher = None
 
 
 a = Analysis(['main.py'],
-             pathex=['E:\\webDevelop\\jdmm-client'],
+             pathex=['D:\\develop\\jdmm-client'],
              binaries=[],
              datas=[],
              hiddenimports=['PySide2.QtXml', 'openpyxl'],
              hookspath=[],
+             hooksconfig={},
              runtime_hooks=[],
              excludes=[],
              win_no_prefer_redirects=False,
@@ -18,11 +19,12 @@ a = Analysis(['main.py'],
              noarchive=False)
 pyz = PYZ(a.pure, a.zipped_data,
              cipher=block_cipher)
+
 exe = EXE(pyz,
           a.scripts,
           a.binaries,
           a.zipfiles,
-          a.datas,
+          a.datas,  
           [],
           name='main',
           debug=False,
@@ -31,4 +33,8 @@ exe = EXE(pyz,
           upx=True,
           upx_exclude=[],
           runtime_tmpdir=None,
-          console=True )
+          console=True,
+          disable_windowed_traceback=False,
+          target_arch=None,
+          codesign_identity=None,
+          entitlements_file=None )

pack.bat

@@ -1,2 +1,7 @@
-echo pyinstaller main.py --hidden-import PySide2.QtXml -F --hidden-import openpyxl
-pyinstaller main.py --hidden-import PySide2.QtXml -F --hidden-import openpyxl
+echo delete cache
+del /f /s /q dist\*
+echo start make
+pyinstaller main.py --hidden-import PySide2.QtXml -F --hidden-import openpyxl
+echo start copy
+copy client.ui dist\
+copy run.bat dist\

requirements.txt

@@ -1,4 +1,5 @@
 requests
 PySide2
 openpyxl==2.3.4
-lanzou-api
+lanzou-api
+pyinstaller

run.bat

@@ -0,0 +1,2 @@
+main.exe
+pause