15 changed files with 524 additions and 51 deletions
Split View
Diff Options
-
+7 -5ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAddressController.java
-
+5 -6ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java
-
+12 -1ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletLoginController.java
-
+9 -8ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java
-
+5 -3ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletServiceLogController.java
-
+3 -13ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java
-
+5 -5ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java
-
+1 -1ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/H5AppointmentController.java
-
+1 -1ruoyi-catdog/src/main/java/com/ruoyi/applet/service/IApiMallOrderService.java
-
+17 -5ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java
-
+266 -0ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/AppletTokenUtils.java
-
+1 -1ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java
-
+1 -0ruoyi-common/src/main/java/com/ruoyi/common/enums/OrderStatus.java
-
+189 -0ruoyi-common/src/main/java/com/ruoyi/common/utils/README_AppletTokenUtils.md
-
+2 -2ruoyi-mall/src/main/java/com/cyl/manager/oms/mapper/OrderMapper.java
+ 7
- 5
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAddressController.java
View File
+ 5
- 6
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java
View File
+ 12
- 1
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletLoginController.java
View File
+ 9
- 8
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java
View File
+ 5
- 3
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletServiceLogController.java
View File
+ 3
- 13
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java
View File
+ 5
- 5
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java
View File
+ 1
- 1
ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/H5AppointmentController.java
View File
+ 1
- 1
ruoyi-catdog/src/main/java/com/ruoyi/applet/service/IApiMallOrderService.java
View File
+ 17
- 5
ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java
View File
+ 266
- 0
ruoyi-catdog/src/main/java/com/ruoyi/applet/utils/AppletTokenUtils.java
View File
| @ -0,0 +1,266 @@ | |||
| package com.ruoyi.applet.utils; | |||
| import com.ruoyi.common.constant.Constants; | |||
| import com.ruoyi.common.core.domain.model.LoginApplet; | |||
| import com.ruoyi.common.core.redis.RedisCache; | |||
| import com.ruoyi.common.exception.ServiceException; | |||
| import com.ruoyi.common.utils.ServletUtils; | |||
| import com.ruoyi.common.utils.StringUtils; | |||
| import com.ruoyi.common.utils.spring.SpringUtils; | |||
| import com.ruoyi.model.domain.AppUsers; | |||
| import com.ruoyi.model.service.IAppUsersService; | |||
| import io.jsonwebtoken.Claims; | |||
| import io.jsonwebtoken.Jwts; | |||
| import org.springframework.beans.factory.annotation.Value; | |||
| import org.springframework.http.HttpStatus; | |||
| import org.springframework.stereotype.Component; | |||
| import javax.servlet.http.HttpServletRequest; | |||
| /** | |||
| * 伴宠师小程序Token解析工具类 | |||
| * 提供从HTTP请求头中获取token并解析成伴宠师用户信息的功能 | |||
| * | |||
| * @author ruoyi | |||
| */ | |||
| @Component | |||
| public class AppletTokenUtils { | |||
| // 令牌自定义标识 | |||
| @Value("${token.header}") | |||
| private String header; | |||
| // 令牌秘钥 | |||
| @Value("${token.secret}") | |||
| private String secret; | |||
| private static RedisCache redisCache; | |||
| private static IAppUsersService appUsersService; | |||
| static { | |||
| redisCache = SpringUtils.getBean(RedisCache.class); | |||
| appUsersService = SpringUtils.getBean(IAppUsersService.class); | |||
| } | |||
| /** | |||
| * 从当前HTTP请求中获取伴宠师用户ID | |||
| * 这是最常用的方法，用于获取当前登录的伴宠师用户ID | |||
| * | |||
| * @return 伴宠师用户ID，如果未登录或token无效则返回null | |||
| */ | |||
| public static Long getCurrentAppletUserId() { | |||
| try { | |||
| LoginApplet loginApplet = getCurrentLoginApplet(); | |||
| return loginApplet != null ? loginApplet.getAppletId() : null; | |||
| } catch (Exception e) { | |||
| return null; | |||
| } | |||
| } | |||
| /** | |||
| * 从当前HTTP请求中获取伴宠师用户ID（强制要求） | |||
| * 如果获取失败会抛出异常 | |||
| * | |||
| * @return 伴宠师用户ID | |||
| * @throws ServiceException 当获取失败时抛出 | |||
| */ | |||
| public static Long requireCurrentAppletUserId() { | |||
| Long userId = getCurrentAppletUserId(); | |||
| if (userId == null) { | |||
| throw new ServiceException("请先登录", HttpStatus.UNAUTHORIZED.value()); | |||
| } | |||
| AppUsers users = appUsersService.getById(userId); | |||
| if (users == null) { | |||
| throw new ServiceException("请重新登录", HttpStatus.UNAUTHORIZED.value()); | |||
| } | |||
| return userId; | |||
| } | |||
| /** | |||
| * 从当前HTTP请求中获取伴宠师登录信息 | |||
| * | |||
| * @return LoginApplet对象，包含用户ID、token、登录时间等信息 | |||
| */ | |||
| public static LoginApplet getCurrentLoginApplet() { | |||
| try { | |||
| HttpServletRequest request = ServletUtils.getRequest(); | |||
| return getLoginAppletFromRequest(request); | |||
| } catch (Exception e) { | |||
| return null; | |||
| } | |||
| } | |||
| /** | |||
| * 从指定的HTTP请求中获取伴宠师登录信息 | |||
| * | |||
| * @param request HTTP请求对象 | |||
| * @return LoginApplet对象 | |||
| */ | |||
| public static LoginApplet getLoginAppletFromRequest(HttpServletRequest request) { | |||
| if (request == null) { | |||
| return null; | |||
| } | |||
| // 获取请求携带的令牌 | |||
| String token = extractTokenFromRequest(request); | |||
| if (StringUtils.isEmpty(token)) { | |||
| return null; | |||
| } | |||
| try { | |||
| AppletTokenUtils instance = SpringUtils.getBean(AppletTokenUtils.class); | |||
| Claims claims = instance.parseToken(token); | |||
| // 解析对应的权限以及用户信息 | |||
| String uuid = (String) claims.get(Constants.LOGIN_APPLET_KEY); | |||
| if (StringUtils.isEmpty(uuid)) { | |||
| return null; | |||
| } | |||
| String userKey = Constants.LOGIN_APPLET_TOKEN_KEY + uuid; | |||
| return redisCache.getCacheObject(userKey); | |||
| } catch (Exception e) { | |||
| // 记录日志但不抛出异常，返回null让调用方处理 | |||
| return null; | |||
| } | |||
| } | |||
| /** | |||
| * 验证当前请求是否包含有效的伴宠师token | |||
| * | |||
| * @return true表示有效，false表示无效 | |||
| */ | |||
| public static boolean hasValidAppletToken() { | |||
| try { | |||
| LoginApplet loginApplet = getCurrentLoginApplet(); | |||
| return loginApplet != null && loginApplet.getAppletId() != null; | |||
| } catch (Exception e) { | |||
| return false; | |||
| } | |||
| } | |||
| /** | |||
| * 验证指定请求是否包含有效的伴宠师token | |||
| * | |||
| * @param request HTTP请求对象 | |||
| * @return true表示有效，false表示无效 | |||
| */ | |||
| public static boolean hasValidAppletToken(HttpServletRequest request) { | |||
| try { | |||
| LoginApplet loginApplet = getLoginAppletFromRequest(request); | |||
| return loginApplet != null && loginApplet.getAppletId() != null; | |||
| } catch (Exception e) { | |||
| return false; | |||
| } | |||
| } | |||
| /** | |||
| * 从HTTP请求中提取token字符串 | |||
| * | |||
| * @param request HTTP请求对象 | |||
| * @return token字符串，如果不存在则返回null | |||
| */ | |||
| private static String extractTokenFromRequest(HttpServletRequest request) { | |||
| try { | |||
| AppletTokenUtils instance = SpringUtils.getBean(AppletTokenUtils.class); | |||
| String token = request.getHeader(instance.header); | |||
| if (StringUtils.isNotEmpty(token) && token.startsWith(Constants.TOKEN_PREFIX)) { | |||
| token = token.replace(Constants.TOKEN_PREFIX, ""); | |||
| } | |||
| return token; | |||
| } catch (Exception e) { | |||
| return null; | |||
| } | |||
| } | |||
| /** | |||
| * 从令牌中获取数据声明 | |||
| * | |||
| * @param token 令牌 | |||
| * @return 数据声明 | |||
| * @throws Exception 解析失败时抛出 | |||
| */ | |||
| private Claims parseToken(String token) throws Exception { | |||
| return Jwts.parser() | |||
| .setSigningKey(secret) | |||
| .parseClaimsJws(token) | |||
| .getBody(); | |||
| } | |||
| /** | |||
| * 检查当前用户是否为指定用户 | |||
| * | |||
| * @param userId 要检查的用户ID | |||
| * @return true表示是当前用户，false表示不是 | |||
| */ | |||
| public static boolean isCurrentUser(Long userId) { | |||
| if (userId == null) { | |||
| return false; | |||
| } | |||
| Long currentUserId = getCurrentAppletUserId(); | |||
| return userId.equals(currentUserId); | |||
| } | |||
| /** | |||
| * 要求当前请求必须包含有效的伴宠师token，否则抛出异常 | |||
| * | |||
| * @throws ServiceException 当token无效时抛出 | |||
| */ | |||
| public static void requireValidAppletToken() { | |||
| if (!hasValidAppletToken()) { | |||
| throw new ServiceException("请先登录", HttpStatus.UNAUTHORIZED.value()); | |||
| } | |||
| } | |||
| /** | |||
| * 要求当前用户必须是指定用户，否则抛出异常 | |||
| * | |||
| * @param userId 要求的用户ID | |||
| * @throws ServiceException 当用户不匹配时抛出 | |||
| */ | |||
| public static void requireCurrentUser(Long userId) { | |||
| requireValidAppletToken(); | |||
| if (!isCurrentUser(userId)) { | |||
| throw new ServiceException("无权限访问", HttpStatus.FORBIDDEN.value()); | |||
| } | |||
| } | |||
| /** | |||
| * 获取当前登录用户的token字符串 | |||
| * | |||
| * @return token字符串，如果未登录则返回null | |||
| */ | |||
| public static String getCurrentToken() { | |||
| try { | |||
| HttpServletRequest request = ServletUtils.getRequest(); | |||
| return extractTokenFromRequest(request); | |||
| } catch (Exception e) { | |||
| return null; | |||
| } | |||
| } | |||
| /** | |||
| * 检查token是否即将过期（剩余时间少于指定分钟数） | |||
| * | |||
| * @param minutes 检查的分钟数阈值 | |||
| * @return true表示即将过期，false表示还有足够时间 | |||
| */ | |||
| public static boolean isTokenExpiringSoon(int minutes) { | |||
| try { | |||
| LoginApplet loginApplet = getCurrentLoginApplet(); | |||
| if (loginApplet == null || loginApplet.getExpireTime() == null) { | |||
| return true; | |||
| } | |||
| long currentTime = System.currentTimeMillis(); | |||
| long expireTime = loginApplet.getExpireTime(); | |||
| long remainingTime = expireTime - currentTime; | |||
| long thresholdTime = minutes * 60 * 1000L; // 转换为毫秒 | |||
| return remainingTime < thresholdTime; | |||
| } catch (Exception e) { | |||
| return true; | |||
| } | |||
| } | |||
| } | |||
+ 1
- 1
ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppUsersServiceImpl.java
View File
+ 1
- 0
ruoyi-common/src/main/java/com/ruoyi/common/enums/OrderStatus.java
View File
+ 189
- 0
ruoyi-common/src/main/java/com/ruoyi/common/utils/README_AppletTokenUtils.md
View File
| @ -0,0 +1,189 @@ | |||
| # AppletTokenUtils 工具类使用说明 | |||
| ## 概述 | |||
| `AppletTokenUtils` 是一个专门用于处理伴宠师小程序用户token解析的工具类。它可以从HTTP请求头中获取token并解析成伴宠师用户信息，提供了多种便捷的方法来获取当前登录用户的信息。 | |||
| ## 主要功能 | |||
| 1. **从请求头获取token并解析用户信息** | |||
| 2. **验证token有效性** | |||
| 3. **获取当前登录用户ID** | |||
| 4. **权限验证和用户身份检查** | |||
| 5. **token过期检查** | |||
| ## 常用方法 | |||
| ### 1. 获取当前用户ID | |||
| ```java | |||
| // 获取当前登录的伴宠师用户ID（可能返回null） | |||
| Long userId = AppletTokenUtils.getCurrentAppletUserId(); | |||
| // 获取当前登录的伴宠师用户ID（强制要求，失败会抛异常） | |||
| Long userId = AppletTokenUtils.requireCurrentAppletUserId(); | |||
| ``` | |||
| ### 2. 验证token有效性 | |||
| ```java | |||
| // 检查当前请求是否包含有效token | |||
| boolean isValid = AppletTokenUtils.hasValidAppletToken(); | |||
| // 要求当前请求必须包含有效token，否则抛异常 | |||
| AppletTokenUtils.requireValidAppletToken(); | |||
| ``` | |||
| ### 3. 获取登录信息 | |||
| ```java | |||
| // 获取当前登录的伴宠师详细信息 | |||
| LoginApplet loginApplet = AppletTokenUtils.getCurrentLoginApplet(); | |||
| if (loginApplet != null) { | |||
| Long userId = loginApplet.getAppletId(); | |||
| String token = loginApplet.getToken(); | |||
| Long loginTime = loginApplet.getLoginTime(); | |||
| Long expireTime = loginApplet.getExpireTime(); | |||
| } | |||
| ``` | |||
| ### 4. 用户身份验证 | |||
| ```java | |||
| // 检查当前用户是否为指定用户 | |||
| boolean isCurrentUser = AppletTokenUtils.isCurrentUser(userId); | |||
| // 要求当前用户必须是指定用户，否则抛异常 | |||
| AppletTokenUtils.requireCurrentUser(userId); | |||
| ``` | |||
| ### 5. Token过期检查 | |||
| ```java | |||
| // 检查token是否在30分钟内过期 | |||
| boolean expiringSoon = AppletTokenUtils.isTokenExpiringSoon(30); | |||
| ``` | |||
| ## 在控制器中的使用示例 | |||
| ### 示例1：获取当前用户信息 | |||
| ```java | |||
| @RestController | |||
| @RequestMapping("/applet/user") | |||
| public class AppletUserController { | |||
| @Autowired | |||
| private IAppUsersService appUsersService; | |||
| @GetMapping("/profile") | |||
| public AjaxResult getUserProfile() { | |||
| // 获取当前登录用户ID | |||
| Long userId = AppletTokenUtils.requireCurrentAppletUserId(); | |||
| // 根据用户ID获取用户详细信息 | |||
| AppUsers user = appUsersService.selectAppUsersByUserId(userId); | |||
| return AjaxResult.success("用户信息", user); | |||
| } | |||
| } | |||
| ``` | |||
| ### 示例2：用户权限验证 | |||
| ```java | |||
| @PutMapping("/updateProfile") | |||
| public AjaxResult updateProfile(@RequestBody AppUsers appUsers) { | |||
| // 验证当前用户只能修改自己的信息 | |||
| AppletTokenUtils.requireCurrentUser(appUsers.getUserId()); | |||
| // 执行更新操作 | |||
| int result = appUsersService.updateAppUsers(appUsers); | |||
| return result > 0 ? AjaxResult.success() : AjaxResult.error("更新失败"); | |||
| } | |||
| ``` | |||
| ### 示例3：可选的用户验证 | |||
| ```java | |||
| @GetMapping("/publicInfo") | |||
| public AjaxResult getPublicInfo() { | |||
| // 检查是否有有效token（不强制要求） | |||
| if (AppletTokenUtils.hasValidAppletToken()) { | |||
| Long userId = AppletTokenUtils.getCurrentAppletUserId(); | |||
| // 返回个性化信息 | |||
| return AjaxResult.success("个性化信息", getPersonalizedInfo(userId)); | |||
| } else { | |||
| // 返回公共信息 | |||
| return AjaxResult.success("公共信息", getPublicInfo()); | |||
| } | |||
| } | |||
| ``` | |||
| ### 示例4：在Service层中使用 | |||
| ```java | |||
| @Service | |||
| public class AppletOrderServiceImpl implements IAppletOrderService { | |||
| @Override | |||
| public List<Order> getCurrentUserOrders() { | |||
| // 在Service层也可以使用工具类获取当前用户 | |||
| Long userId = AppletTokenUtils.requireCurrentAppletUserId(); | |||
| return orderMapper.selectOrdersByUserId(userId); | |||
| } | |||
| @Override | |||
| public AjaxResult createOrder(Order order) { | |||
| // 自动设置订单的用户ID为当前登录用户 | |||
| Long userId = AppletTokenUtils.requireCurrentAppletUserId(); | |||
| order.setUserId(userId); | |||
| // 执行创建订单逻辑 | |||
| return orderMapper.insertOrder(order); | |||
| } | |||
| } | |||
| ``` | |||
| ## 异常处理 | |||
| 工具类会抛出以下异常： | |||
| - `ServiceException("请先登录", HttpStatus.UNAUTHORIZED)` - 当token无效或不存在时 | |||
| - `ServiceException("无权限访问", HttpStatus.FORBIDDEN)` - 当用户身份验证失败时 | |||
| 建议在全局异常处理器中统一处理这些异常： | |||
| ```java | |||
| @RestControllerAdvice | |||
| public class GlobalExceptionHandler { | |||
| @ExceptionHandler(ServiceException.class) | |||
| public AjaxResult handleServiceException(ServiceException e) { | |||
| return AjaxResult.error(e.getCode(), e.getMessage()); | |||
| } | |||
| } | |||
| ``` | |||
| ## 注意事项 | |||
| 1. **线程安全**：工具类是线程安全的，可以在多线程环境中使用 | |||
| 2. **性能考虑**：工具类会从Redis缓存中获取用户信息，性能较好 | |||
| 3. **异常处理**：使用`require*`方法时要做好异常处理 | |||
| 4. **空值检查**：使用非`require*`方法时要检查返回值是否为null | |||
| 5. **配置依赖**：确保`token.header`和`token.secret`配置正确 | |||
| ## 配置要求 | |||
| 在`application.yml`中需要配置： | |||
| ```yaml | |||
| token: | |||
| header: Authorization # token在请求头中的字段名 | |||
| secret: your-secret-key # JWT签名密钥 | |||
| ``` | |||
| ## 与现有代码的兼容性 | |||
| 这个工具类与现有的`TokenService`完全兼容，可以逐步替换原有的token解析逻辑，提高代码的简洁性和可维护性。 | |||