From 52ce0e1969ace55be73ce80ce1940100aa1c1b30 Mon Sep 17 00:00:00 2001 From: ZiJIe <17738440858@163.com> Date: Tue, 30 Sep 2025 17:16:11 +0800 Subject: [PATCH] 1 --- .idea/workspace.xml | 465 ------------------ electron-vue-template/src/main/main.ts | 49 +- electron-vue-template/src/main/preload.ts | 2 + electron-vue-template/src/renderer/App.vue | 156 +++--- .../src/renderer/api/auth.ts | 106 +--- .../src/renderer/api/device.ts | 45 +- .../src/renderer/api/rakuten.ts | 40 +- .../src/renderer/api/shopee.ts | 15 - .../src/renderer/api/update.ts | 11 + .../src/renderer/api/zebra.ts | 82 +-- .../components/amazon/AmazonDashboard.vue | 39 +- .../renderer/components/auth/LoginDialog.vue | 7 +- .../components/auth/RegisterDialog.vue | 14 +- .../components/common/SettingsDialog.vue | 332 +++++++++++++ .../components/common/UpdateDialog.vue | 173 ++++--- .../components/rakuten/RakutenDashboard.vue | 14 +- .../components/zebra/ZebraDashboard.vue | 6 +- erp_client_sb/pom.xml | 2 +- .../tashow/erp/ErpClientSbApplication.java | 26 +- .../erp/entity/AmazonProductEntity.java | 3 + .../repository/AmazonProductRepository.java | 6 +- .../impl/AmazonScrapingServiceImpl.java | 60 +-- .../controller/monitor/VersionController.java | 13 +- .../web/controller/tool/FileController.java | 3 - ruoyi-ui/src/views/monitor/version/index.vue | 9 +- 25 files changed, 689 insertions(+), 989 deletions(-) delete mode 100644 .idea/workspace.xml delete mode 100644 electron-vue-template/src/renderer/api/shopee.ts create mode 100644 electron-vue-template/src/renderer/api/update.ts create mode 100644 electron-vue-template/src/renderer/components/common/SettingsDialog.vue diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 63c653b..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,465 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "customColor": "", - "associatedIndex": 0 -} - - - - { - "keyToString": { - "Maven.erp_client_sb [clean].executor": "Run", - "Maven.erp_client_sb [install].executor": "Run", - "Maven.erp_client_sb [verify].executor": "Run", - "Maven.ruoyi [clean].executor": "Run", - "Maven.ruoyi [install].executor": "Run", - "ModuleVcsDetector.initialDetectionPerformed": "true", - "RequestMappingsPanelOrder0": "0", - "RequestMappingsPanelOrder1": "1", - "RequestMappingsPanelWidth0": "75", - "RequestMappingsPanelWidth1": "75", - "RunOnceActivity.ShowReadmeOnStart": "true", - "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager": "true", - "RunOnceActivity.git.unshallow": "true", - "Spring Boot.ErpClientSbApplication.executor": "Debug", - "Spring Boot.RuoYiApplication.executor": "Debug", - "Spring Boot.未命名.executor": "Debug", - "git-widget-placeholder": "master", - "last_opened_file_path": "C:/Users/ZiJIe/Desktop/wox/RuoYi-Vue/electron-vue-template/public", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "npm.build.executor": "Run", - "npm.build:win.executor": "Run", - "npm.run.executor": "Run", - "settings.editor.selected.configurable": "com.intellij.platform.ide.impl.presentationAssistant.PresentationAssistantConfigurable", - "ts.external.directory.path": "C:\\Users\\ZiJIe\\Desktop\\wox\\RuoYi-Vue\\electron-vue-template\\node_modules\\typescript\\lib", - "vue.rearranger.settings.migration": "true" - } -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + diff --git a/electron-vue-template/src/renderer/components/common/UpdateDialog.vue b/electron-vue-template/src/renderer/components/common/UpdateDialog.vue index 28ab8b7..460eb2f 100644 --- a/electron-vue-template/src/renderer/components/common/UpdateDialog.vue +++ b/electron-vue-template/src/renderer/components/common/UpdateDialog.vue @@ -2,15 +2,18 @@
v{{ version || '-' }}
- +
- App Icon + App Icon

新版本的"{{ appName }}"已经发布

-

{{ appName }} {{ info.latestVersion }} 可供安装,您现在的版本是 {{ version }},要现在安装吗?

+

{{ appName }} {{ info.latestVersion }} 可供安装,您现在的版本是 {{ + version + }},要现在安装吗?

更新信息

@@ -20,7 +23,7 @@ class="notes-box" :rows="6" readonly - resize="none" /> + resize="none"/>
@@ -41,7 +44,7 @@
- App Icon + App Icon
@@ -52,7 +55,7 @@ :percentage="prog.percentage" :show-text="false" :stroke-width="6" - color="#409EFF" /> + color="#409EFF"/>
{{ prog.current }} / {{ prog.total }} 取消 @@ -64,7 +67,7 @@
- App Icon + App Icon

更新完成

更新文件已下载,将在重启后自动应用

@@ -77,7 +80,7 @@ :percentage="100" :show-text="false" :stroke-width="6" - color="#67C23A" /> + color="#67C23A"/>
@@ -90,9 +93,9 @@