更新2.4.0，使用新版UI

xaoyaoo · Jan 4, 2024 · ce43b67 · ce43b67
1 parent 68eb589
commit ce43b67
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pywxdump/api/__init__.py b/pywxdump/api/__init__.py
@@ -5,7 +5,7 @@
 # Author:       xaoyaoo
 # Date:         2023/12/14
 # -------------------------------------------------------------------------------
-
+from .api import api
 
 if __name__ == '__main__':
     pass
diff --git a/pywxdump/cli.py b/pywxdump/cli.py
@@ -206,7 +206,7 @@ def run(self, args):
         app.logger.setLevel(logging.ERROR)
 
         from flask_cors import CORS
-        from pywxdump.api.api import api
+        from pywxdump.api import api
         CORS(app, resources={r"/*": {"origins": "*"}}, supports_credentials=True)  # 允许所有域名跨域
         @app.before_request
         def before_request():

diff --git a/setup.py b/setup.py
@@ -39,15 +39,16 @@
     url="https://github.com/xaoyaoo/PyWxDump",
     license='MIT',
 
-    packages=['pywxdump', 'pywxdump.ui', 'pywxdump.wx_info', 'pywxdump.analyzer'],
+    packages=['pywxdump', 'pywxdump.ui', 'pywxdump.wx_info', 'pywxdump.analyzer', 'pywxdump.api'],
     package_dir={'pywxdump': 'pywxdump',
                  'pywxdump.wx_info': 'pywxdump/wx_info',
                  'pywxdump.analyzer': 'pywxdump/analyzer',
                  'pywxdump.ui': 'pywxdump/ui',
+                 'pywxdump.api': 'pywxdump/api',
                  },
 
     package_data={
-        'pywxdump': ['version_list.json', 'ui/templates/*']
+        'pywxdump': ['version_list.json', 'ui/templates/*', 'ui/web/*', 'ui/web/assets/*']
     },
     classifiers=[
         "Programming Language :: Python :: 3",