diff --git a/app/ali_oss.py b/app/ali_oss.py index 179fadd..35fbe08 100644 --- a/app/ali_oss.py +++ b/app/ali_oss.py @@ -14,7 +14,6 @@ def upload_file(file_content: bytes, key: str): cfg.credentials_provider = credentials_provider cfg.region = region cfg.endpoint = endpoint - cfg.retry_max_attempts = 3 client = oss.Client(cfg) result = client.put_object( diff --git a/app/config.py b/app/config.py index 0b5d8f9..137cad8 100644 --- a/app/config.py +++ b/app/config.py @@ -49,8 +49,8 @@ os.environ['OSS_ACCESS_KEY_SECRET'] = accessKeySecret os.environ['SECRET_KEY'] = "ddffc7c1d02121d9554d7b080b2511b6" -debug = True -version = "1.0.13" +debug = False +version = "1.0.56" APP_UPDATE_URL = f"{_base_url}/api/version/latest" # 检测更新接口地址，返回 { "file_url": "...", "version": "x.x.x" } os.environ['APP_VERSION'] = version os.environ['APP_UPDATE_URL'] = APP_UPDATE_URL @@ -59,9 +59,6 @@ os.environ['APP_UPDATE_URL'] = APP_UPDATE_URL # 队列 JSON_TASK_QUEUE = Queue() - -base_dir = os.getcwd() - #删除品牌，正在执行中的任务 runing_task = { diff --git a/app/main.py b/app/main.py index 0286722..08586b0 100644 --- a/app/main.py +++ b/app/main.py @@ -434,7 +434,7 @@ def main(): window.expose(api.close, api.minimize, api.maximize, api.toggle_maximize, generate_images, api.save_image, api.save_image_to_folder, api.select_folder, api.select_brand_xlsx_files, api.select_brand_folder, api.save_file_from_url, api.save_template_xlsx,api.save_template_zip,api.upload_file_to_java,api.open_external_url,api.enqueue_json,api.get_detail_del,api.save_file_from_url_new) webview.start( - debug=True, + debug=False, storage_path=cache_path, private_mode=False ) diff --git a/app/update/PyQt5/Qt/.keep_dir.txt b/app/update/PyQt5/Qt/.keep_dir.txt new file mode 100644 index 0000000..e69de29 diff --git a/app/update/PyQt5/Qt5/.keep_dir.txt b/app/update/PyQt5/Qt5/.keep_dir.txt new file mode 100644 index 0000000..e69de29 diff --git a/app/update/PyQt5/QtCore.pyd b/app/update/PyQt5/QtCore.pyd new file mode 100644 index 0000000..c376c68 Binary files /dev/null and b/app/update/PyQt5/QtCore.pyd differ diff --git a/app/update/PyQt5/QtGui.pyd b/app/update/PyQt5/QtGui.pyd new file mode 100644 index 0000000..3381759 Binary files /dev/null and b/app/update/PyQt5/QtGui.pyd differ diff --git a/app/update/PyQt5/QtWidgets.pyd b/app/update/PyQt5/QtWidgets.pyd new file mode 100644 index 0000000..5899382 Binary files /dev/null and b/app/update/PyQt5/QtWidgets.pyd differ diff --git a/app/update/PyQt5/qt-plugins/iconengines/qsvgicon.dll b/app/update/PyQt5/qt-plugins/iconengines/qsvgicon.dll new file mode 100644 index 0000000..cbca63c Binary files /dev/null and b/app/update/PyQt5/qt-plugins/iconengines/qsvgicon.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qgif.dll b/app/update/PyQt5/qt-plugins/imageformats/qgif.dll new file mode 100644 index 0000000..b6e5658 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qgif.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qicns.dll b/app/update/PyQt5/qt-plugins/imageformats/qicns.dll new file mode 100644 index 0000000..5b4365f Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qicns.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qico.dll b/app/update/PyQt5/qt-plugins/imageformats/qico.dll new file mode 100644 index 0000000..d89a637 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qico.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qjpeg.dll b/app/update/PyQt5/qt-plugins/imageformats/qjpeg.dll new file mode 100644 index 0000000..98cdf95 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qjpeg.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qsvg.dll b/app/update/PyQt5/qt-plugins/imageformats/qsvg.dll new file mode 100644 index 0000000..c6b732b Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qsvg.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qtga.dll b/app/update/PyQt5/qt-plugins/imageformats/qtga.dll new file mode 100644 index 0000000..d4f77f8 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qtga.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qtiff.dll b/app/update/PyQt5/qt-plugins/imageformats/qtiff.dll new file mode 100644 index 0000000..43cbc0c Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qtiff.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qwbmp.dll b/app/update/PyQt5/qt-plugins/imageformats/qwbmp.dll new file mode 100644 index 0000000..e1dc12c Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qwbmp.dll differ diff --git a/app/update/PyQt5/qt-plugins/imageformats/qwebp.dll b/app/update/PyQt5/qt-plugins/imageformats/qwebp.dll new file mode 100644 index 0000000..3c49ed8 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/imageformats/qwebp.dll differ diff --git a/app/update/PyQt5/qt-plugins/mediaservice/dsengine.dll b/app/update/PyQt5/qt-plugins/mediaservice/dsengine.dll new file mode 100644 index 0000000..2f5bcc7 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/mediaservice/dsengine.dll differ diff --git a/app/update/PyQt5/qt-plugins/mediaservice/qtmedia_audioengine.dll b/app/update/PyQt5/qt-plugins/mediaservice/qtmedia_audioengine.dll new file mode 100644 index 0000000..adcf5bc Binary files /dev/null and b/app/update/PyQt5/qt-plugins/mediaservice/qtmedia_audioengine.dll differ diff --git a/app/update/PyQt5/qt-plugins/mediaservice/wmfengine.dll b/app/update/PyQt5/qt-plugins/mediaservice/wmfengine.dll new file mode 100644 index 0000000..c7aa07e Binary files /dev/null and b/app/update/PyQt5/qt-plugins/mediaservice/wmfengine.dll differ diff --git a/app/update/PyQt5/qt-plugins/platforms/qminimal.dll b/app/update/PyQt5/qt-plugins/platforms/qminimal.dll new file mode 100644 index 0000000..c4bcfd8 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/platforms/qminimal.dll differ diff --git a/app/update/PyQt5/qt-plugins/platforms/qoffscreen.dll b/app/update/PyQt5/qt-plugins/platforms/qoffscreen.dll new file mode 100644 index 0000000..ad29783 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/platforms/qoffscreen.dll differ diff --git a/app/update/PyQt5/qt-plugins/platforms/qwebgl.dll b/app/update/PyQt5/qt-plugins/platforms/qwebgl.dll new file mode 100644 index 0000000..5f317e5 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/platforms/qwebgl.dll differ diff --git a/app/update/PyQt5/qt-plugins/platforms/qwindows.dll b/app/update/PyQt5/qt-plugins/platforms/qwindows.dll new file mode 100644 index 0000000..e9c319d Binary files /dev/null and b/app/update/PyQt5/qt-plugins/platforms/qwindows.dll differ diff --git a/app/update/PyQt5/qt-plugins/platformthemes/qxdgdesktopportal.dll b/app/update/PyQt5/qt-plugins/platformthemes/qxdgdesktopportal.dll new file mode 100644 index 0000000..34c0231 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/platformthemes/qxdgdesktopportal.dll differ diff --git a/app/update/PyQt5/qt-plugins/printsupport/windowsprintersupport.dll b/app/update/PyQt5/qt-plugins/printsupport/windowsprintersupport.dll new file mode 100644 index 0000000..2e50171 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/printsupport/windowsprintersupport.dll differ diff --git a/app/update/PyQt5/qt-plugins/styles/qwindowsvistastyle.dll b/app/update/PyQt5/qt-plugins/styles/qwindowsvistastyle.dll new file mode 100644 index 0000000..c97acd6 Binary files /dev/null and b/app/update/PyQt5/qt-plugins/styles/qwindowsvistastyle.dll differ diff --git a/app/update/PyQt5/sip.pyd b/app/update/PyQt5/sip.pyd new file mode 100644 index 0000000..a8009c0 Binary files /dev/null and b/app/update/PyQt5/sip.pyd differ diff --git a/app/update/_bz2.pyd b/app/update/_bz2.pyd new file mode 100644 index 0000000..598aa11 Binary files /dev/null and b/app/update/_bz2.pyd differ diff --git a/app/update/_ctypes.pyd b/app/update/_ctypes.pyd new file mode 100644 index 0000000..5905ec4 Binary files /dev/null and b/app/update/_ctypes.pyd differ diff --git a/app/update/_decimal.pyd b/app/update/_decimal.pyd new file mode 100644 index 0000000..1c4087d Binary files /dev/null and b/app/update/_decimal.pyd differ diff --git a/app/update/_elementtree.pyd b/app/update/_elementtree.pyd new file mode 100644 index 0000000..6ea5ee0 Binary files /dev/null and b/app/update/_elementtree.pyd differ diff --git a/app/update/_hashlib.pyd b/app/update/_hashlib.pyd new file mode 100644 index 0000000..8cd8b1e Binary files /dev/null and b/app/update/_hashlib.pyd differ diff --git a/app/update/_hashlib.zip b/app/update/_hashlib.zip new file mode 100644 index 0000000..9ef0fc5 Binary files /dev/null and b/app/update/_hashlib.zip differ diff --git a/app/update/_lzma.pyd b/app/update/_lzma.pyd new file mode 100644 index 0000000..eb9b88e Binary files /dev/null and b/app/update/_lzma.pyd differ diff --git a/app/update/_socket.pyd b/app/update/_socket.pyd new file mode 100644 index 0000000..4608360 Binary files /dev/null and b/app/update/_socket.pyd differ diff --git a/app/update/libcrypto-1_1-x64.dll b/app/update/libcrypto-1_1-x64.dll new file mode 100644 index 0000000..0939c40 Binary files /dev/null and b/app/update/libcrypto-1_1-x64.dll differ diff --git a/app/update/libeay32.dll b/app/update/libeay32.dll new file mode 100644 index 0000000..6cefeb1 Binary files /dev/null and b/app/update/libeay32.dll differ diff --git a/app/update/libffi-7.dll b/app/update/libffi-7.dll new file mode 100644 index 0000000..8fd2e5e Binary files /dev/null and b/app/update/libffi-7.dll differ diff --git a/app/update/msvcp140.dll b/app/update/msvcp140.dll new file mode 100644 index 0000000..5a1cb64 Binary files /dev/null and b/app/update/msvcp140.dll differ diff --git a/app/update/msvcp140_1.dll b/app/update/msvcp140_1.dll new file mode 100644 index 0000000..9ed52a2 Binary files /dev/null and b/app/update/msvcp140_1.dll differ diff --git a/app/update/psutil/_psutil_windows.pyd b/app/update/psutil/_psutil_windows.pyd new file mode 100644 index 0000000..6c73e36 Binary files /dev/null and b/app/update/psutil/_psutil_windows.pyd differ diff --git a/app/update/pyexpat.pyd b/app/update/pyexpat.pyd new file mode 100644 index 0000000..cb7801c Binary files /dev/null and b/app/update/pyexpat.pyd differ diff --git a/app/update/python3.dll b/app/update/python3.dll new file mode 100644 index 0000000..1fe5788 Binary files /dev/null and b/app/update/python3.dll differ diff --git a/app/update/python39.dll b/app/update/python39.dll new file mode 100644 index 0000000..8299163 Binary files /dev/null and b/app/update/python39.dll differ diff --git a/app/update/qt5core.dll b/app/update/qt5core.dll new file mode 100644 index 0000000..40e8de1 Binary files /dev/null and b/app/update/qt5core.dll differ diff --git a/app/update/qt5dbus.dll b/app/update/qt5dbus.dll new file mode 100644 index 0000000..e06ebf3 Binary files /dev/null and b/app/update/qt5dbus.dll differ diff --git a/app/update/qt5gui.dll b/app/update/qt5gui.dll new file mode 100644 index 0000000..bf38dda Binary files /dev/null and b/app/update/qt5gui.dll differ diff --git a/app/update/qt5multimedia.dll b/app/update/qt5multimedia.dll new file mode 100644 index 0000000..f4ea511 Binary files /dev/null and b/app/update/qt5multimedia.dll differ diff --git a/app/update/qt5network.dll b/app/update/qt5network.dll new file mode 100644 index 0000000..d32644d Binary files /dev/null and b/app/update/qt5network.dll differ diff --git a/app/update/qt5printsupport.dll b/app/update/qt5printsupport.dll new file mode 100644 index 0000000..de4c30b Binary files /dev/null and b/app/update/qt5printsupport.dll differ diff --git a/app/update/qt5qml.dll b/app/update/qt5qml.dll new file mode 100644 index 0000000..7c2e538 Binary files /dev/null and b/app/update/qt5qml.dll differ diff --git a/app/update/qt5qmlmodels.dll b/app/update/qt5qmlmodels.dll new file mode 100644 index 0000000..a0497d3 Binary files /dev/null and b/app/update/qt5qmlmodels.dll differ diff --git a/app/update/qt5quick.dll b/app/update/qt5quick.dll new file mode 100644 index 0000000..4ff0bc6 Binary files /dev/null and b/app/update/qt5quick.dll differ diff --git a/app/update/qt5svg.dll b/app/update/qt5svg.dll new file mode 100644 index 0000000..edfbf4a Binary files /dev/null and b/app/update/qt5svg.dll differ diff --git a/app/update/qt5websockets.dll b/app/update/qt5websockets.dll new file mode 100644 index 0000000..1b21504 Binary files /dev/null and b/app/update/qt5websockets.dll differ diff --git a/app/update/qt5widgets.dll b/app/update/qt5widgets.dll new file mode 100644 index 0000000..80ae4e3 Binary files /dev/null and b/app/update/qt5widgets.dll differ diff --git a/app/update/select.pyd b/app/update/select.pyd new file mode 100644 index 0000000..5b15220 Binary files /dev/null and b/app/update/select.pyd differ diff --git a/app/update/ssleay32.dll b/app/update/ssleay32.dll new file mode 100644 index 0000000..0276bba Binary files /dev/null and b/app/update/ssleay32.dll differ diff --git a/app/update/unicodedata.pyd b/app/update/unicodedata.pyd new file mode 100644 index 0000000..77216c7 Binary files /dev/null and b/app/update/unicodedata.pyd differ diff --git a/app/update/update.exe b/app/update/update.exe new file mode 100644 index 0000000..a2e7113 Binary files /dev/null and b/app/update/update.exe differ diff --git a/app/update/vcruntime140.dll b/app/update/vcruntime140.dll new file mode 100644 index 0000000..2e2bb47 Binary files /dev/null and b/app/update/vcruntime140.dll differ diff --git a/app/update/vcruntime140_1.dll b/app/update/vcruntime140_1.dll new file mode 100644 index 0000000..dd0c100 Binary files /dev/null and b/app/update/vcruntime140_1.dll differ diff --git a/app/winsrc.bat b/app/winsrc.bat new file mode 100644 index 0000000..28e3730 --- /dev/null +++ b/app/winsrc.bat @@ -0,0 +1,38 @@ +@echo off +chcp 65001 >nul +setlocal enabledelayedexpansion + +echo 正在执行 PowerShell 命令解除文件锁定... +powershell -Command "Get-ChildItem -Path \"%cd%\" -Recurse | Unblock-File" +if %errorlevel% equ 0 ( + echo 文件解锁完成 +) else ( + echo 文件解锁失败，请检查 PowerShell 权限 +) + +echo. +echo 检查 ShuFuAi.exe.config 文件... + +if exist "ShuFuAi.exe.config" ( + echo ShuFuAi.exe.config 已存在，跳过创建 +) else ( + echo 正在创建 ShuFuAi.exe.config... + ( + echo ^ + echo ^ + echo ^ + echo ^ + echo ^ + echo ^ + ) > "ShuFuAi.exe.config" + + if exist "ShuFuAi.exe.config" ( + echo ShuFuAi.exe.config 创建成功 + ) else ( + echo ShuFuAi.exe.config 创建失败，请检查权限 + ) +) + +echo. +echo 操作完成！ +pause \ No newline at end of file