diff --git a/README.md b/README.md index cba6364..ab2bbf1 100644 --- a/README.md +++ b/README.md @@ -536,7 +536,13 @@ Core模块集成Vert.x实现类似spring的注解式路由API ## Star History -[![Star History Chart](https://api.star-history.com/svg?repos=qaiu/netdisk-fast-download&type=Date)](https://star-history.com/#qaiu/netdisk-fast-download&Date) + + + + + Star History Chart + + ## **免责声明** - 用户在使用本项目时,应自行承担风险,并确保其行为符合当地法律法规。开发者不对用户因使用本项目而导致的任何后果负责。 diff --git a/core-database/pom.xml b/core-database/pom.xml index 0ae8493..62369aa 100644 --- a/core-database/pom.xml +++ b/core-database/pom.xml @@ -65,7 +65,7 @@ org.postgresql postgresql - 42.7.11 + 42.7.13 diff --git a/pom.xml b/pom.xml index b0188d1..eb5abc4 100644 --- a/pom.xml +++ b/pom.xml @@ -33,9 +33,9 @@ 3.18.0 2.0.0 10.2.5 - 2.18.6 + 2.18.9 - 1.5.32 + 1.5.34 4.13.2 diff --git a/web-front/package.json b/web-front/package.json index c12b74a..6ce7199 100644 --- a/web-front/package.json +++ b/web-front/package.json @@ -13,7 +13,7 @@ "@element-plus/icons-vue": "^2.3.1", "@monaco-editor/loader": "^1.4.0", "@vueuse/core": "^11.2.0", - "axios": "1.16.1", + "axios": "1.18.0", "clipboard": "^2.0.11", "core-js": "^3.8.3", "crypto-js": "^4.2.0", diff --git a/web-service/doc/openapi.json b/web-service/doc/openapi.json index d86f1fc..25324f5 100644 --- a/web-service/doc/openapi.json +++ b/web-service/doc/openapi.json @@ -386,6 +386,16 @@ "type": "string", "example": "uuid123" } + }, + { + "name": "stoken", + "in": "query", + "required": false, + "description": "分享 token,用于子目录解析时复用认证状态", + "schema": { + "type": "string", + "example": "OASBe5qM0pg2VvvyLM..." + } } ], "responses": { diff --git a/web-service/src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java b/web-service/src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java index a640eb3..80b1d94 100644 --- a/web-service/src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java +++ b/web-service/src/main/java/cn/qaiu/lz/common/util/URLParamUtil.java @@ -68,9 +68,9 @@ public class URLParamUtil { boolean firstParam = !decodedUrl.contains("?"); for (String paramName : params.names()) { - // 忽略 "url", "pwd", "dirId", "uuid", "auth" 参数(这些参数单独处理,不应拼接到分享URL中) + // 忽略 "url", "pwd", "dirId", "uuid", "auth", "stoken" 参数(这些参数单独处理,不应拼接到分享URL中) if (!paramName.equals("url") && !paramName.equals("pwd") && !paramName.equals("dirId") - && !paramName.equals("uuid") && !paramName.equals("auth")) { + && !paramName.equals("uuid") && !paramName.equals("auth") && !paramName.equals("stoken")) { if (firstParam) { urlBuilder.append("?"); firstParam = false; diff --git a/web-service/src/main/java/cn/qaiu/lz/web/controller/ParserApi.java b/web-service/src/main/java/cn/qaiu/lz/web/controller/ParserApi.java index 6e16346..9e71e41 100644 --- a/web-service/src/main/java/cn/qaiu/lz/web/controller/ParserApi.java +++ b/web-service/src/main/java/cn/qaiu/lz/web/controller/ParserApi.java @@ -161,7 +161,7 @@ public class ParserApi { @RouteMapping("/getFileList") public Future> getFileList(HttpServerRequest request, String pwd, String dirId, String uuid, - String auth) { + String stoken, String auth) { String url = URLParamUtil.parserParams(request); ParserCreate parserCreate; try { @@ -176,6 +176,9 @@ public class ParserApi { if (StringUtils.isNotBlank(dirId)) { parserCreate.getShareLinkInfo().getOtherParam().put("dirId", dirId); } + if (StringUtils.isNotBlank(stoken)) { + parserCreate.getShareLinkInfo().getOtherParam().put("stoken", stoken); + } if (StringUtils.isNotBlank(uuid)) { parserCreate.getShareLinkInfo().getOtherParam().put("uuid", uuid); }