From 4fbe51d6252632f7b47614083e85dfa8ff292c50 Mon Sep 17 00:00:00 2001 From: ZiJIe <17738440858@163.com> Date: Thu, 9 Oct 2025 11:18:26 +0800 Subject: [PATCH] 1 --- .claude/settings.local.json | 5 +- electron-vue-template/package-lock.json | 403 ------------------ electron-vue-template/package.json | 2 +- electron-vue-template/scripts/dev-server.js | 4 +- electron-vue-template/scripts/private/tsc.js | 8 +- electron-vue-template/src/main/main.ts | 10 +- electron-vue-template/src/renderer/App.vue | 3 +- .../erp/controller/AmazonController.java | 3 +- .../impl/RakutenScrapingServiceImpl.java | 2 - .../monitor/ClientAccountController.java | 6 - .../com/ruoyi/system/domain/BanmaAccount.java | 52 +++ 11 files changed, 71 insertions(+), 427 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/BanmaAccount.java diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 677e781..dfcb38a 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -208,7 +208,10 @@ "Bash(start erpClient.exe)", "Bash(grep:*)", "Bash(npx asar list:*)", - "Bash(npx @electron/asar extract:*)" + "Bash(npx @electron/asar extract:*)", + "Bash(cnpm run:*)", + "Bash(awk:*)", + "Bash(xargs:*)" ], "deny": [], "ask": [], diff --git a/electron-vue-template/package-lock.json b/electron-vue-template/package-lock.json index 39d2fbb..7386a8f 100644 --- a/electron-vue-template/package-lock.json +++ b/electron-vue-template/package-lock.json @@ -17,7 +17,6 @@ "@vitejs/plugin-vue": "^4.4.1", "chalk": "^4.1.2", "chokidar": "^3.5.3", - "electron": "^38.1.2", "electron-builder": "^25.1.6", "express": "^5.1.0", "fs-extra": "^11.3.2", @@ -106,63 +105,6 @@ "node": "*" } }, - "node_modules/@electron/get": { - "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/@electron/get/-/get-2.0.3.tgz", - "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "debug": "^4.1.1", - "env-paths": "^2.2.0", - "fs-extra": "^8.1.0", - "got": "^11.8.5", - "progress": "^2.0.3", - "semver": "^6.2.0", - "sumchecker": "^3.0.1" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "global-agent": "^3.0.0" - } - }, - "node_modules/@electron/get/node_modules/fs-extra": { - "version": "8.1.0", - "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-8.1.0.tgz", - "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" - }, - "engines": { - "node": ">=6 <7 || >=8" - } - }, - "node_modules/@electron/get/node_modules/jsonfile": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-4.0.0.tgz", - "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==", - "dev": true, - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" - } - }, - "node_modules/@electron/get/node_modules/universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmmirror.com/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 4.0.0" - } - }, "node_modules/@electron/notarize": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz", @@ -1163,17 +1105,6 @@ "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==", "license": "MIT" }, - "node_modules/@types/yauzl": { - "version": "2.10.3", - "resolved": "https://registry.npmmirror.com/@types/yauzl/-/yauzl-2.10.3.tgz", - "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@types/node": "*" - } - }, "node_modules/@vitejs/plugin-vue": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.4.1.tgz", @@ -1901,15 +1832,6 @@ "node": ">=18" } }, - "node_modules/boolean": { - "version": "3.2.0", - "resolved": "https://registry.npmmirror.com/boolean/-/boolean-3.2.0.tgz", - "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/brace-expansion": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", @@ -2688,44 +2610,6 @@ "node": ">=10" } }, - "node_modules/define-data-property": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/define-properties": { - "version": "1.2.1", - "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "define-data-property": "^1.0.1", - "has-property-descriptors": "^1.0.0", - "object-keys": "^1.1.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2763,14 +2647,6 @@ "node": ">=8" } }, - "node_modules/detect-node": { - "version": "2.1.0", - "resolved": "https://registry.npmmirror.com/detect-node/-/detect-node-2.1.0.tgz", - "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/dir-compare": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz", @@ -2979,25 +2855,6 @@ "node": ">=0.10.0" } }, - "node_modules/electron": { - "version": "38.1.2", - "resolved": "https://registry.npmmirror.com/electron/-/electron-38.1.2.tgz", - "integrity": "sha512-WXUcN3W8h8NTTZViA3KNX0rV2YBU0X0mEUM3ubupXTDY4QtIN7tmiqYVOKSKpR2LckTmBWGuEeY4D6xVoffwKQ==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "@electron/get": "^2.0.0", - "@types/node": "^22.7.7", - "extract-zip": "^2.0.1" - }, - "bin": { - "electron": "cli.js" - }, - "engines": { - "node": ">= 12.20.55" - } - }, "node_modules/electron-builder": { "version": "25.1.6", "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.1.6.tgz", @@ -3210,14 +3067,6 @@ "node": ">= 0.4" } }, - "node_modules/es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmmirror.com/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/esbuild": { "version": "0.18.20", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", @@ -3271,20 +3120,6 @@ "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "license": "MIT" }, - "node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/estree-walker": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", @@ -3393,27 +3228,6 @@ "node": ">= 0.6" } }, - "node_modules/extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmmirror.com/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - }, - "bin": { - "extract-zip": "cli.js" - }, - "engines": { - "node": ">= 10.17.0" - }, - "optionalDependencies": { - "@types/yauzl": "^2.9.1" - } - }, "node_modules/extsprintf": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", @@ -3452,16 +3266,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmmirror.com/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "dev": true, - "license": "MIT", - "dependencies": { - "pend": "~1.2.0" - } - }, "node_modules/filelist": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", @@ -3826,57 +3630,6 @@ "node": "*" } }, - "node_modules/global-agent": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/global-agent/-/global-agent-3.0.0.tgz", - "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", - "dev": true, - "license": "BSD-3-Clause", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", - "es6-error": "^4.1.1", - "matcher": "^3.0.0", - "roarr": "^2.15.3", - "semver": "^7.3.2", - "serialize-error": "^7.0.1" - }, - "engines": { - "node": ">=10.0" - } - }, - "node_modules/global-agent/node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmmirror.com/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true, - "license": "ISC", - "optional": true, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/globalthis": { - "version": "1.0.4", - "resolved": "https://registry.npmmirror.com/globalthis/-/globalthis-1.0.4.tgz", - "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "define-properties": "^1.2.1", - "gopd": "^1.0.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/gopd/-/gopd-1.2.0.tgz", @@ -3929,20 +3682,6 @@ "node": ">=8" } }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", - "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "es-define-property": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/has-symbols": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.1.0.tgz", @@ -4419,14 +4158,6 @@ "dev": true, "license": "MIT" }, - "node_modules/json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmmirror.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true, - "license": "ISC", - "optional": true - }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -4799,20 +4530,6 @@ "node": ">=12" } }, - "node_modules/matcher": { - "version": "3.0.0", - "resolved": "https://registry.npmmirror.com/matcher/-/matcher-3.0.0.tgz", - "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "escape-string-regexp": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -5244,17 +4961,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/object-keys": { - "version": "1.1.1", - "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", - "dev": true, - "license": "MIT", - "optional": true, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz", @@ -5459,13 +5165,6 @@ "url": "https://github.com/sponsors/jet2jet" } }, - "node_modules/pend": { - "version": "1.2.0", - "resolved": "https://registry.npmmirror.com/pend/-/pend-1.2.0.tgz", - "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "dev": true, - "license": "MIT" - }, "node_modules/picocolors": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", @@ -5531,16 +5230,6 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "license": "MIT" }, - "node_modules/progress": { - "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/progress/-/progress-2.0.3.tgz", - "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -5814,25 +5503,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/roarr": { - "version": "2.15.4", - "resolved": "https://registry.npmmirror.com/roarr/-/roarr-2.15.4.tgz", - "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", - "dev": true, - "license": "BSD-3-Clause", - "optional": true, - "dependencies": { - "boolean": "^3.0.1", - "detect-node": "^2.0.4", - "globalthis": "^1.0.1", - "json-stringify-safe": "^5.0.1", - "semver-compare": "^1.0.0", - "sprintf-js": "^1.1.2" - }, - "engines": { - "node": ">=8.0" - } - }, "node_modules/rollup": { "version": "3.29.5", "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz", @@ -5923,24 +5593,6 @@ "node": ">=10" } }, - "node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - } - }, - "node_modules/semver-compare": { - "version": "1.0.0", - "resolved": "https://registry.npmmirror.com/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", - "dev": true, - "license": "MIT", - "optional": true - }, "node_modules/send": { "version": "1.2.0", "resolved": "https://registry.npmmirror.com/send/-/send-1.2.0.tgz", @@ -5987,23 +5639,6 @@ "node": ">= 0.6" } }, - "node_modules/serialize-error": { - "version": "7.0.1", - "resolved": "https://registry.npmmirror.com/serialize-error/-/serialize-error-7.0.1.tgz", - "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "type-fest": "^0.13.1" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/serve-static": { "version": "2.2.0", "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-2.2.0.tgz", @@ -6378,19 +6013,6 @@ "node": ">=8" } }, - "node_modules/sumchecker": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/sumchecker/-/sumchecker-3.0.1.tgz", - "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "debug": "^4.1.0" - }, - "engines": { - "node": ">= 8.0" - } - }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -6534,20 +6156,6 @@ "utf8-byte-length": "^1.0.1" } }, - "node_modules/type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "dev": true, - "license": "(MIT OR CC0-1.0)", - "optional": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/type-is": { "version": "2.0.1", "resolved": "https://registry.npmmirror.com/type-is/-/type-is-2.0.1.tgz", @@ -6980,17 +6588,6 @@ "node": ">=12" } }, - "node_modules/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmmirror.com/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", diff --git a/electron-vue-template/package.json b/electron-vue-template/package.json index acdec4d..e0c2b7f 100644 --- a/electron-vue-template/package.json +++ b/electron-vue-template/package.json @@ -19,7 +19,7 @@ "@vitejs/plugin-vue": "^4.4.1", "chalk": "^4.1.2", "chokidar": "^3.5.3", - "electron": "^38.1.2", + "electron": "^28.2.0", "electron-builder": "^25.1.6", "express": "^5.1.0", "fs-extra": "^11.3.2", diff --git a/electron-vue-template/scripts/dev-server.js b/electron-vue-template/scripts/dev-server.js index 276b254..7947497 100644 --- a/electron-vue-template/scripts/dev-server.js +++ b/electron-vue-template/scripts/dev-server.js @@ -25,7 +25,7 @@ async function startRenderer() { } async function startElectron() { - if (electronProcess) { // single instance lock + if (electronProcess) { return; } @@ -52,7 +52,7 @@ async function startElectron() { process.stdout.write(Chalk.blueBright(`[electron] `) + Chalk.white(data.toString())) }); - electronProcess.stderr.on('data', data => + electronProcess.stderr.on('data', data => process.stderr.write(Chalk.blueBright(`[electron] `) + Chalk.white(data.toString())) ); diff --git a/electron-vue-template/scripts/private/tsc.js b/electron-vue-template/scripts/private/tsc.js index baf0aa1..7d3faa0 100644 --- a/electron-vue-template/scripts/private/tsc.js +++ b/electron-vue-template/scripts/private/tsc.js @@ -3,14 +3,18 @@ const Chalk = require('chalk'); function compile(directory) { return new Promise((resolve, reject) => { - const tscProcess = ChildProcess.exec('tsc', { + const tscProcess = ChildProcess.exec('npx tsc', { cwd: directory, }); - tscProcess.stdout.on('data', data => + tscProcess.stdout.on('data', data => process.stdout.write(Chalk.yellowBright(`[tsc] `) + Chalk.white(data.toString())) ); + tscProcess.stderr.on('data', data => + process.stderr.write(Chalk.yellowBright(`[tsc] `) + Chalk.white(data.toString())) + ); + tscProcess.on('exit', exitCode => { if (exitCode > 0) { reject(exitCode); diff --git a/electron-vue-template/src/main/main.ts b/electron-vue-template/src/main/main.ts index 550c146..690ad12 100644 --- a/electron-vue-template/src/main/main.ts +++ b/electron-vue-template/src/main/main.ts @@ -227,9 +227,7 @@ function startSpringBoot() { app.quit(); } } - -// startSpringBoot(); - +startSpringBoot(); function stopSpringBoot() { if (!springProcess) return; try { @@ -313,9 +311,9 @@ app.whenReady().then(() => { splashWindow.loadFile(splashPath); } - // setTimeout(() => { - // openAppIfNotOpened(); - // }, 2000); + setTimeout(() => { + openAppIfNotOpened(); + }, 2000); app.on('activate', () => { if (BrowserWindow.getAllWindows().length === 0) { diff --git a/electron-vue-template/src/renderer/App.vue b/electron-vue-template/src/renderer/App.vue index 2bf4d81..562ade4 100644 --- a/electron-vue-template/src/renderer/App.vue +++ b/electron-vue-template/src/renderer/App.vue @@ -616,7 +616,7 @@ onUnmounted(() => { font-size: 12px; color: #909399; margin: 8px 6px 10px; - text-align: left; /* "电商平台"四个字靠左 */ + text-align: left; } .menu { @@ -690,7 +690,6 @@ onUnmounted(() => { flex-direction: column; } -/* 导航栏和认证相关样式已移至对应组件 */ .content-body { position: relative; diff --git a/erp_client_sb/src/main/java/com/tashow/erp/controller/AmazonController.java b/erp_client_sb/src/main/java/com/tashow/erp/controller/AmazonController.java index 19afacb..c869fce 100644 --- a/erp_client_sb/src/main/java/com/tashow/erp/controller/AmazonController.java +++ b/erp_client_sb/src/main/java/com/tashow/erp/controller/AmazonController.java @@ -25,8 +25,7 @@ public class AmazonController { private IAmazonScrapingService amazonScrapingService; @Autowired private AmazonProductRepository amazonProductRepository; - @Autowired - private JavaBridge javaBridge; + /** * 批量获取亚马逊产品信息 */ diff --git a/erp_client_sb/src/main/java/com/tashow/erp/service/impl/RakutenScrapingServiceImpl.java b/erp_client_sb/src/main/java/com/tashow/erp/service/impl/RakutenScrapingServiceImpl.java index 7ebd8b0..7c54c77 100644 --- a/erp_client_sb/src/main/java/com/tashow/erp/service/impl/RakutenScrapingServiceImpl.java +++ b/erp_client_sb/src/main/java/com/tashow/erp/service/impl/RakutenScrapingServiceImpl.java @@ -38,8 +38,6 @@ public class RakutenScrapingServiceImpl implements RakutenScrapingService { private RakutenProductRepository rakutenProductRepository; @Autowired private ErrorReporter errorReporter; - @Autowired - ObjectMapper objectMapper; /** * 根据店铺名称搜索并采集乐天商品数据 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ClientAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ClientAccountController.java index e730369..ec03f19 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ClientAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ClientAccountController.java @@ -52,12 +52,6 @@ public class ClientAccountController extends BaseController { @Autowired private JwtRsaKeyService jwtRsaKeyService; - - @Autowired - private ClientDeviceMapper clientDeviceMapper; - - - @Autowired private SseHubService sseHubService; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/BanmaAccount.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BanmaAccount.java new file mode 100644 index 0000000..cfc86b7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/BanmaAccount.java @@ -0,0 +1,52 @@ +package com.ruoyi.system.domain; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 斑马账号实体（数据库持久化） + */ +public class BanmaAccount extends BaseEntity { + private static final long serialVersionUID = 1L; + + private Long id; + /** 显示名 */ + private String name; + /** 登录用户名 */ + private String username; + /** 登录密码（服务端刷新Token用，不对外返回） */ + private String password; + /** 访问 Token（客户端刷新后回写） */ + private String token; + /** Token 过期时间（可选） */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date tokenExpireAt; + /** 是否默认账号 1是 0否 */ + private Integer isDefault; + /** 状态 1启用 0停用 */ + private Integer status; + /** 备注 */ + private String remark; + + public Long getId() { return id; } + public void setId(Long id) { this.id = id; } + public String getName() { return name; } + public void setName(String name) { this.name = name; } + public String getUsername() { return username; } + public void setUsername(String username) { this.username = username; } + public String getPassword() { return password; } + public void setPassword(String password) { this.password = password; } + public String getToken() { return token; } + public void setToken(String token) { this.token = token; } + public Date getTokenExpireAt() { return tokenExpireAt; } + public void setTokenExpireAt(Date tokenExpireAt) { this.tokenExpireAt = tokenExpireAt; } + public Integer getIsDefault() { return isDefault; } + public void setIsDefault(Integer isDefault) { this.isDefault = isDefault; } + public Integer getStatus() { return status; } + public void setStatus(Integer status) { this.status = status; } + @Override public String getRemark() { return remark; } + @Override public void setRemark(String remark) { this.remark = remark; } +} + +