From 65e7f9750a98aab7cecb7cbd5d58da4706346dd8 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 12 Jan 2022 11:20:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96uuid?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=8C=E4=B8=BA=E5=8E=8B=E6=B5=8B?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=9A=84=E5=90=8C=E4=B8=80token=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/controller/common/UploadController.java | 3 --- .../lili/common/security/context/UserContext.java | 14 ++++++++++++++ .../lili/common/security/enums/SecurityEnum.java | 2 +- .../order/cart/service/CartServiceImpl.java | 5 +++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index 38d3cd0d3..b78b50328 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -52,9 +52,6 @@ public class UploadController { @Autowired private Cache cache; - @Autowired - private SystemSettingProperties systemSettingProperties; - @ApiOperation(value = "文件上传") @PostMapping(value = "/file") public ResultMessage upload(MultipartFile file, diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContext.java b/framework/src/main/java/cn/lili/common/security/context/UserContext.java index 6fdd63783..6ecf8ee62 100644 --- a/framework/src/main/java/cn/lili/common/security/context/UserContext.java +++ b/framework/src/main/java/cn/lili/common/security/context/UserContext.java @@ -37,6 +37,20 @@ public class UserContext { return null; } + /** + * 根据request获取用户信息 + * + * @return 授权用户 + */ + public static String getUuid() { + if (RequestContextHolder.getRequestAttributes() != null) { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String uuid = request.getHeader(SecurityEnum.UUID.getValue()); + return uuid; + } + return null; + } + /** * 根据jwt获取token重的用户信息 diff --git a/framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java b/framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java index 4d27d9418..c89a3f4b8 100644 --- a/framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java +++ b/framework/src/main/java/cn/lili/common/security/enums/SecurityEnum.java @@ -10,7 +10,7 @@ public enum SecurityEnum { /** * 存在与header中的token参数头 名 */ - HEADER_TOKEN("accessToken"), USER_CONTEXT("userContext"), JWT_SECRET("secret"); + HEADER_TOKEN("accessToken"), USER_CONTEXT("userContext"), JWT_SECRET("secret"), UUID("uuid"); String value; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 52808dbfb..bf975b0a6 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -229,8 +229,9 @@ public class CartServiceImpl implements CartService { //缓存key，默认使用购物车 if (cartTypeEnum != null) { - AuthUser currentUser = UserContext.getCurrentUser(); - return cartTypeEnum.getPrefix() + currentUser.getId(); +// AuthUser currentUser = UserContext.getCurrentUser(); +// return cartTypeEnum.getPrefix() + currentUser.getId(); + return cartTypeEnum.getPrefix() + UserContext.getUuid(); } throw new ServiceException(ResultCode.ERROR); }