From 531d48a74e2d943f4aa502c92f124efa223e51c7 Mon Sep 17 00:00:00 2001 From: MMS Date: Mon, 2 Jun 2025 02:25:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docApi/controller/DocUserController.java | 84 ++++++++++++------- .../utils/{DocBaseTool.java => JwtUtil.java} | 16 ++-- .../src/main/resources/application.yml | 6 +- .../com/sxpcwlkj/authority/LoginObject.java | 16 +++- .../com/sxpcwlkj/common/enums/DeviceEnum.java | 6 +- .../sxpcwlkj/common/enums/ErrorCodeEnum.java | 1 + .../common/exception/MmsException.java | 2 + .../exception/TokenExpireException.java | 7 +- .../framework/exception/GlobalException.java | 2 +- .../redis/constant/RedisConstant.java | 1 + 10 files changed, 92 insertions(+), 49 deletions(-) rename mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/utils/{DocBaseTool.java => JwtUtil.java} (83%) diff --git a/mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/controller/DocUserController.java b/mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/controller/DocUserController.java index 92420bb..48d693f 100644 --- a/mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/controller/DocUserController.java +++ b/mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/controller/DocUserController.java @@ -1,22 +1,21 @@ package com.sxpcwlkj.docApi.controller; +import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaIgnore; +import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.result.BaseWxPayResult; -import com.github.binarywang.wxpay.service.WxPayService; -import com.ijpay.core.enums.SignType; import com.ijpay.core.enums.TradeType; import com.ijpay.core.kit.WxPayKit; -import com.ijpay.wxpay.WxPayApiConfigKit; import com.sxpcwlkj.authority.LoginObject; import com.sxpcwlkj.common.code.entity.WxCodeBo; +import com.sxpcwlkj.common.enums.DeviceEnum; import com.sxpcwlkj.common.enums.WxCodeStatusEnum; import com.sxpcwlkj.common.utils.*; import com.sxpcwlkj.docApi.entity.DocOrder; import com.sxpcwlkj.docApi.entity.DocProduct; import com.sxpcwlkj.docApi.entity.DocUser; -import com.sxpcwlkj.docApi.entity.bo.DocOrderBo; import com.sxpcwlkj.docApi.entity.bo.MyRequest; import com.sxpcwlkj.docApi.entity.vo.DocOrderVo; import com.sxpcwlkj.docApi.entity.vo.DocUserVo; @@ -25,10 +24,9 @@ import com.sxpcwlkj.docApi.mapper.DocOrderMapper; import com.sxpcwlkj.docApi.mapper.DocProductMapper; import com.sxpcwlkj.docApi.service.DocOrderService; import com.sxpcwlkj.docApi.service.DocUserService; -import com.sxpcwlkj.docApi.utils.DocBaseTool; import com.sxpcwlkj.docApi.utils.DocR; -import com.sxpcwlkj.framework.utils.SignUtil; import com.sxpcwlkj.redis.RedisUtil; +import com.sxpcwlkj.redis.constant.RedisConstant; import com.sxpcwlkj.wx.service.WxCodeService; import com.sxpcwlkj.wx.service.WxOrderService; import com.sxpcwlkj.wx.service.WxService; @@ -39,6 +37,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.time.Duration; import java.util.*; /** @@ -48,8 +47,8 @@ import java.util.*; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/vpapi/meb") -public class DocUserController extends DocBaseTool { +@RequestMapping("/doc-api/meb/v1") +public class DocUserController{ private final DocUserService docUserService; private final DocOrderMapper docOrderMapper; @@ -68,10 +67,10 @@ public class DocUserController extends DocBaseTool { */ @SaIgnore @PostMapping("/userinfo") - public DocR userinfo(HttpServletRequest request, HttpServletResponse response){ - DocUserVo docUserVo = docUserService.selectVoById(getUserId(request)); + public R userinfo(HttpServletRequest request, HttpServletResponse response){ + DocUserVo docUserVo = LoginObject.getLoginObject(DocUserVo.class); if(docUserVo==null){ - return DocR.error("99910","会话过期"); + return R.fail("会话过期"); } docOrderMapper.delete(new LambdaQueryWrapper().eq(DocOrder::getUid,docUserVo.getUid()) .eq(DocOrder::getStatus,0) @@ -103,8 +102,8 @@ public class DocUserController extends DocBaseTool { docUserVo.setVip_date(DateUtil.getStrToDate("2025-01-01 00:00:00")); docUserVo.setType("usr"); } - CookieUtil.setCookie(response,"mss",getToken(docUserVo.getUid()),1000*60*60*24*7); - return DocR.ok(docUserVo); + + return R.success(docUserVo); } @@ -114,7 +113,7 @@ public class DocUserController extends DocBaseTool { */ @SaIgnore @PostMapping("/oauth-authorize") - public DocR> oauthAuthorize(){ + public R> oauthAuthorize(){ Map data= new HashMap<>(); String state=RandomUtil.getRandomUUID(); String codeUrl= wxCodeService.getCode(new WxCodeBo(state) @@ -123,33 +122,36 @@ public class DocUserController extends DocBaseTool { .paramData(state)); data.put("url",codeUrl); data.put("state",state); - return DocR.ok(data); + return R.success(data); } /** * 登录二维码轮询 - * @param request 请求 + * @param bo 请求 * @return 登录状态 */ @SaIgnore @PostMapping("/oauth-polling") - public DocR> oauthPolling(@RequestBody MyRequest bo){ + public R> oauthPolling(@RequestBody MyRequest bo,HttpServletRequest request, HttpServletResponse response){ String state = bo.getState(); Map data= new HashMap<>(); data.put("status","0"); if(state==null){ - return DocR.error("50001","state不能为空！"); + return R.fail("state不能为空！"); } //登录二维码 WxCodeBo wxCodeBo= wxCodeService.getCodeState(new WxCodeBo(state).typeDocLogin()); if(Objects.equals(wxCodeBo.getState(), WxCodeStatusEnum.SUCCEED.getValue())){ log.info(wxCodeBo.getOpenId()); - DocUser docUser= docUserService.bindingOpenId(wxCodeBo.getOpenId()); + DocUser vo= docUserService.bindingOpenId(wxCodeBo.getOpenId()); data.put("status","1"); - data.put("token",getToken(docUser.getUid())); + String token = LoginObject.loginToken(vo.getUid(), DeviceEnum.PC.getType(), 10000000L, "id", vo.getUid()); + RedisUtil.setCacheObject(RedisConstant.PC_KEY+vo.getUid(),vo, Duration.ofSeconds(10000000L)); + data.put("token",token); + CookieUtil.setCookie(response,"token",token,1000*60*60*24*7); } - return DocR.ok(data); + return R.success(data); } @@ -158,10 +160,10 @@ public class DocUserController extends DocBaseTool { * @param request 请求 * @return 商品列表 */ - @SaIgnore + @SaCheckLogin @PostMapping("/product-list") - public DocR> productList(HttpServletRequest request){ - String uid= getUserId(request); + public R> productList(HttpServletRequest request){ + String uid= LoginObject.getLoginId(); List docProducts= docProductMapper.selectList(new LambdaQueryWrapper().eq(DocProduct::getStatus,1).orderByAsc(DocProduct::getSort)); Map endData= new HashMap<>(); List> data= new ArrayList<>(); @@ -175,7 +177,7 @@ public class DocUserController extends DocBaseTool { DocUserVo docUserVo= docUserService.selectVoById(uid); if(docUserVo==null){ - return DocR.error("99910","会话过期"); + return R.fail("会话过期"); } Map orderInfo= new HashMap<>(); orderInfo.put("openId",docUserVo.getOpenId()); @@ -197,7 +199,7 @@ public class DocUserController extends DocBaseTool { } endData.put("items",data); - return DocR.ok(endData); + return R.success(endData); } @@ -206,20 +208,39 @@ public class DocUserController extends DocBaseTool { * @param request 请求 * @return 登录状态 */ - @SaIgnore + @SaCheckLogin @PostMapping("/product-buy-qry") - public DocR> productBuyQry(@RequestBody MyRequest bo,HttpServletRequest request){ + public R> productBuyQry(@RequestBody MyRequest bo,HttpServletRequest request){ String prodId = bo.getProd_id(); Map data= new HashMap<>(); data.put("status","0"); if(prodId==null){ - return DocR.error("50001","prodId不能为空！"); + return R.fail("prodId不能为空！"); } - data.put("status",docOrderService.selectPayState(prodId,getUserId(request))); - return DocR.ok(data); + data.put("status",docOrderService.selectPayState(prodId,LoginObject.getLoginId())); + return R.success(data); } + /** + * 退出登录 + */ + @SaCheckLogin + @PostMapping("/logout") + public R logout(HttpServletResponse response){ + StpUtil.logout(); + CookieUtil.setCookie(response,"token","",0); + return R.success("退出成功！"); + } + + + /** + * 支付回调-官方微信 + * @param req 请求 + * @param resp 响应 + * @param body 请求体 + * @return 响应 + */ @SaIgnore @PostMapping("/notify") public String notify(HttpServletRequest req, HttpServletResponse resp, @RequestBody String body){ @@ -253,6 +274,7 @@ public class DocUserController extends DocBaseTool { /** + * 微信支付WxPay * 异步通知 */ @RequestMapping(value = "/payNotify", method = {RequestMethod.POST, RequestMethod.GET}) diff --git a/mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/utils/DocBaseTool.java b/mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/utils/JwtUtil.java similarity index 83% rename from mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/utils/DocBaseTool.java rename to mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/utils/JwtUtil.java index 70f7803..bb01fe1 100644 --- a/mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/utils/DocBaseTool.java +++ b/mms-docs/mms-doc-api/src/main/java/com/sxpcwlkj/docApi/utils/JwtUtil.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.jwt.JWT; import cn.hutool.jwt.JWTHeader; import cn.hutool.jwt.JWTUtil; -import com.sxpcwlkj.common.exception.MmsException; import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; @@ -15,13 +14,16 @@ import java.util.Map; import static cn.hutool.core.lang.Singleton.put; +/** + * @author shanpengnian + */ @Slf4j -public class DocBaseTool { +public class JwtUtil { private final String KEY= "4548912314JKJ85HT=="; - public String getUserId(HttpServletRequest request){ - String cookie = getCookieValue(request,"mss"); + public String getId(HttpServletRequest request){ + String cookie = getCookieValue(request,"token"); if(cookie!=null){ if (StrUtil.isBlank(cookie) || cookie.split("\\.").length != 3) { log.error("无效的JWT格式: " + cookie); @@ -31,18 +33,18 @@ public class DocBaseTool { if(verify){ final JWT jwt = JWTUtil.parseToken(cookie); jwt.getHeader(JWTHeader.TYPE); - return jwt.getPayload("uid").toString(); + return jwt.getPayload("id").toString(); } } return "-1"; } - public String getToken(String uid){ + public String createToken(String id){ Map map = new HashMap() { @Serial private static final long serialVersionUID = 1L; { - put("uid", uid); + put("id", id); put("expire_time", System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 7); } }; diff --git a/mms-docs/mms-doc-api/src/main/resources/application.yml b/mms-docs/mms-doc-api/src/main/resources/application.yml index c89754a..a8b7de2 100644 --- a/mms-docs/mms-doc-api/src/main/resources/application.yml +++ b/mms-docs/mms-doc-api/src/main/resources/application.yml @@ -83,13 +83,13 @@ spring: --- # Sa-Token配置 sa-token: # token名称 (同时也是cookie名称) - token-name: Authorization + token-name: docToken # token 有效期（单位：秒） 默认30天，-1 代表永久有效 timeout: 86400 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结 active-timeout: 1800 # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录） - is-concurrent: true + is-concurrent: false # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token） is-share: false # 是否尝试从header里读取token @@ -97,7 +97,7 @@ sa-token: # 是否在header读取不到token时，继续从请求题参数里继续尝试读取 is-read-body: true # 是否尝试从cookie里读取token - is-read-cookie: false + is-read-cookie: true # token前缀 # token-prefix: "Token_" # jwt秘钥 diff --git a/mms-modules/mms-authority/src/main/java/com/sxpcwlkj/authority/LoginObject.java b/mms-modules/mms-authority/src/main/java/com/sxpcwlkj/authority/LoginObject.java index 288b626..a705d78 100644 --- a/mms-modules/mms-authority/src/main/java/com/sxpcwlkj/authority/LoginObject.java +++ b/mms-modules/mms-authority/src/main/java/com/sxpcwlkj/authority/LoginObject.java @@ -9,6 +9,7 @@ import cn.hutool.core.lang.Console; import com.sxpcwlkj.common.enums.DeviceEnum; import com.sxpcwlkj.common.enums.ErrorCodeEnum; import com.sxpcwlkj.common.exception.LoginException; +import com.sxpcwlkj.common.exception.MmsException; import com.sxpcwlkj.common.utils.MapstructUtil; import com.sxpcwlkj.common.utils.StringUtil; import com.sxpcwlkj.redis.RedisUtil; @@ -94,6 +95,7 @@ public class LoginObject { * @return 当前登录用户 */ public static T getLoginObject(Class clazz) { + if (isLogin()) { try { if (getLoginId() != null) { @@ -105,6 +107,9 @@ public class LoginObject { if (DeviceEnum.ADMIN.getType().equals(device)){ object = RedisUtil.getCacheObject(RedisConstant.ADMIN_KEY + StpUtil.getLoginIdAsLong()); } + if (DeviceEnum.PC.getType().equals(device)){ + object = RedisUtil.getCacheObject(RedisConstant.PC_KEY + StpUtil.getLoginIdAsLong()); + } return MapstructUtil.convert(object, clazz); } @@ -114,7 +119,8 @@ public class LoginObject { } //请先登录 - throw new NotLoginException(ErrorCodeEnum.USER_NOT_LOGIN.getValue(), DeviceEnum.MOBILE.getType(), "0"); + throw new MmsException(ErrorCodeEnum.USER_NOT_LOGIN.getValue(),ErrorCodeEnum.USER_NOT_LOGIN.getKey()); +// throw new NotLoginException(ErrorCodeEnum.USER_NOT_LOGIN.getValue(), DeviceEnum.MOBILE.getType(), "0"); } /** @@ -122,12 +128,18 @@ public class LoginObject { * * @param id 标识ID * @param device 登录设备 - * @param timeout 过期时间 + * @param timeout 过期时间/秒 * @param jwtKey JWL key * @param jwtValue JWT value * @return 登录token */ public static String loginToken(String id, String device, Long timeout, String jwtKey, String jwtValue) { + Console.log("当前会话TokenName", StpUtil.getTokenName()); + if(StpUtil.isLogin()){ + // 获取当前会话的token值 + Console.log("当前会话已登录，无需重复登录", StpUtil.getTokenName()); + return StpUtil.getTokenValue(); + } //根据用户id，进行登录 SaLoginModel saLoginModel = new SaLoginModel(); if (StringUtil.isNotEmpty(device)) { diff --git a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/DeviceEnum.java b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/DeviceEnum.java index eb3e411..1cf6823 100644 --- a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/DeviceEnum.java +++ b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/DeviceEnum.java @@ -20,7 +20,11 @@ public enum DeviceEnum { /** * 移动端 */ - MOBILE("MOBILE"); + MOBILE("MOBILE"), + /** + * PC端 + */ + PC("PC"); private final String type; diff --git a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/ErrorCodeEnum.java b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/ErrorCodeEnum.java index 62e82f4..dec78cd 100644 --- a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/ErrorCodeEnum.java +++ b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/enums/ErrorCodeEnum.java @@ -5,6 +5,7 @@ import lombok.Getter; /** * 接口返回错误码枚举 + * @author shanpengnian */ public enum ErrorCodeEnum implements IEnum { diff --git a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/exception/MmsException.java b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/exception/MmsException.java index 21051a0..cda8494 100644 --- a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/exception/MmsException.java +++ b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/exception/MmsException.java @@ -3,6 +3,7 @@ package com.sxpcwlkj.common.exception; import com.sxpcwlkj.common.enums.ErrorCode; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springframework.http.HttpStatus; import java.io.Serial; @@ -37,6 +38,7 @@ public class MmsException extends RuntimeException { public MmsException(String message) { this.message = message; + this.code = HttpStatus.INTERNAL_SERVER_ERROR.value(); } public MmsException(String message, Integer code) { diff --git a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/exception/TokenExpireException.java b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/exception/TokenExpireException.java index a92a159..cfca70a 100644 --- a/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/exception/TokenExpireException.java +++ b/mms-modules/mms-common/src/main/java/com/sxpcwlkj/common/exception/TokenExpireException.java @@ -1,10 +1,13 @@ package com.sxpcwlkj.common.exception; import com.sxpcwlkj.common.enums.ErrorCodeEnum; +import lombok.Setter; /** * 用户登陆信息过期异常 + * @author xijue */ +@Setter public class TokenExpireException extends RuntimeException { private static final long serialVersionUID = 1L; @@ -27,9 +30,5 @@ public class TokenExpireException extends RuntimeException { return message; } - public void setMessage(String message) { - this.message = message; - } - } diff --git a/mms-modules/mms-framework/src/main/java/com/sxpcwlkj/framework/exception/GlobalException.java b/mms-modules/mms-framework/src/main/java/com/sxpcwlkj/framework/exception/GlobalException.java index dc6b3eb..cc85a67 100644 --- a/mms-modules/mms-framework/src/main/java/com/sxpcwlkj/framework/exception/GlobalException.java +++ b/mms-modules/mms-framework/src/main/java/com/sxpcwlkj/framework/exception/GlobalException.java @@ -258,7 +258,7 @@ public class GlobalException { HttpServletRequest request) { String requestUrl = request.getRequestURI(); log.error("请求地址'{}','{}'.", requestUrl, e.getMessage()); - return R.fail(HttpStatus.TEMPORARY_REDIRECT.value(), e.getMessage()); + return R.fail(e.getCode(), e.getMessage()); } diff --git a/mms-modules/mms-redis/src/main/java/com/sxpcwlkj/redis/constant/RedisConstant.java b/mms-modules/mms-redis/src/main/java/com/sxpcwlkj/redis/constant/RedisConstant.java index f1525bd..6ff3719 100644 --- a/mms-modules/mms-redis/src/main/java/com/sxpcwlkj/redis/constant/RedisConstant.java +++ b/mms-modules/mms-redis/src/main/java/com/sxpcwlkj/redis/constant/RedisConstant.java @@ -10,6 +10,7 @@ public class RedisConstant { // user换成前缀key public static final String ADMIN_KEY="admin:"; public static final String MOBILE_KEY="mobile:member:"; + public static final String PC_KEY="pc:member:"; public static final String ENCRYPTION_SERVER_PORT="encryption:server:"; public static final String ENCRYPTION_APP_ID="encryption:"; public static final String COOKIE_APP_ID="cookie:";