diff --git a/app/.env b/app/.env index 77818f1..0f656f3 100644 --- a/app/.env +++ b/app/.env @@ -9,6 +9,7 @@ proxy_mode=2 client_name=ShuFuAI -java_api_base=http://8.136.19.173:18080 +java_api_base=http://127.0.0.1:18080 +# java_api_base=http://8.136.19.173:18080 diff --git a/app/__pycache__/config.cpython-312.pyc b/app/__pycache__/config.cpython-312.pyc index 809b628..f5d4763 100644 Binary files a/app/__pycache__/config.cpython-312.pyc and b/app/__pycache__/config.cpython-312.pyc differ diff --git a/app/config.py b/app/config.py index 8f5c626..fa1767f 100644 --- a/app/config.py +++ b/app/config.py @@ -39,7 +39,7 @@ os.environ['OSS_ACCESS_KEY_SECRET'] = accessKeySecret os.environ['SECRET_KEY'] = "ddffc7c1d02121d9554d7b080b2511b6" -debug = False +debug = True version = "1.0.22" APP_UPDATE_URL = f"{_base_url}/api/version/latest" # 检测更新接口地址,返回 { "file_url": "...", "version": "x.x.x" } os.environ['APP_VERSION'] = version diff --git a/app/main.py b/app/main.py index 5a7d640..721bd10 100644 --- a/app/main.py +++ b/app/main.py @@ -10,7 +10,7 @@ os.makedirs(cache_path,exist_ok=True) if not debug: today = datetime.datetime.now().strftime("%Y_%m_%d") sys.stdout = open(os.path.join(cache_path,f'{today}.log'), 'a',buffering=1) - sys.stderr = sys.stdout + # sys.stderr = sys.stdout import webview import threading @@ -352,7 +352,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.enqueue_json) webview.start( - debug=False, + debug=True, storage_path=cache_path, private_mode=False ) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoAuthService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoAuthService.java index 036bd65..71f2694 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoAuthService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/ziniao/service/ZiniaoAuthService.java @@ -294,7 +294,7 @@ public class ZiniaoAuthService { .queryParam("storeId", storeId) .queryParam("openapiToken", loginToken) .queryParam("userId", userId) - .queryParam("launchUrl", encodedLaunchUrl) + .queryParam("lanuchUrl", encodedLaunchUrl) .queryParam("autoopen", Boolean.TRUE.equals(ziniaoProperties.getOpenStoreAutoOpen())) .queryParam("debuggPort", ziniaoProperties.getOpenStoreDebugPort()) .queryParam("notPromptForDownload", Boolean.TRUE.equals(ziniaoProperties.getOpenStoreNotPromptForDownload()) ? 1 : 0); @@ -303,7 +303,7 @@ public class ZiniaoAuthService { builder.queryParam("forceDownloadPath", encodedPath); } if (ziniaoProperties.getOpenStoreExtraArgs() != null && !ziniaoProperties.getOpenStoreExtraArgs().isBlank()) { - builder.queryParam("extraArgs", ziniaoProperties.getOpenStoreExtraArgs()); + builder.queryParam("options_argument", ziniaoProperties.getOpenStoreExtraArgs()); } return builder.build().encode().toUriString(); } diff --git a/backend-java/src/main/resources/application.yml b/backend-java/src/main/resources/application.yml index 25abfb6..7ce15a9 100644 --- a/backend-java/src/main/resources/application.yml +++ b/backend-java/src/main/resources/application.yml @@ -96,7 +96,7 @@ aiimage: staff-list-path: ${AIIMAGE_ZINIAO_STAFF_LIST_PATH:/superbrowser/rest/v1/erp/staff/list} user-stores-path: ${AIIMAGE_ZINIAO_USER_STORES_PATH:/superbrowser/rest/v1/erp/user/stores} user-login-token-path: ${AIIMAGE_ZINIAO_USER_LOGIN_TOKEN_PATH:/superbrowser/rest/v1/token/user-login} - open-store-scheme: ${AIIMAGE_ZINIAO_OPEN_STORE_SCHEME:superbrowser://OpenStore} + open-store-scheme: ${AIIMAGE_ZINIAO_OPEN_STORE_SCHEME:superbrowser://OpenStrore} open-store-user-id: ${AIIMAGE_ZINIAO_OPEN_STORE_USER_ID:} open-store-launch-url: ${AIIMAGE_ZINIAO_OPEN_STORE_LAUNCH_URL:https://www.baidu.com} open-store-auto-open: ${AIIMAGE_ZINIAO_OPEN_STORE_AUTO_OPEN:true}