From 8f525f2edd73c7c5463391f430a67250570d909f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 11 四月 2025 17:37:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/web/WebCategoryController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/web/WebCategoryController.java b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
index cd9a67e..3cab702 100644
--- a/server/src/main/java/com/doumee/api/web/WebCategoryController.java
+++ b/server/src/main/java/com/doumee/api/web/WebCategoryController.java
@@ -38,9 +38,9 @@
@LoginRequired
@GetMapping("/categoryTree")
@ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鏍�")
- public ApiResponse<List<CategoryVO>> categoryVOTree(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
+ public ApiResponse<List<CategoryVO>> categoryVOTree(@RequestParam String categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
jwtTokenUtil.getUserInfoByToken(token);
return ApiResponse.success(categoryService.getCategoryVOTree(categoryType));
}catch (BusinessException e){
@@ -54,9 +54,9 @@
@LoginRequired
@GetMapping("/categoryList")
@ApiOperation("鑾峰彇鍒嗙被绫诲埆鑾峰彇鍒嗙被鍒楄〃")
- public ApiResponse<List<CategoryVO>> categoryList(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token, ServerWebExchange serverWebExchange){
+ public ApiResponse<List<CategoryVO>> categoryList(Integer categoryType, @RequestHeader(JwtTokenUtil.HEADER_KEY) String token){
try {
- ServerHttpRequest request = serverWebExchange.getRequest();
+
jwtTokenUtil.getUserInfoByToken(token);
return ApiResponse.success(categoryService.getCategoryVOList(categoryType));
}catch (BusinessException e){
--
Gitblit v1.9.3