From a288e3ec5c5cc73a33ed0a0a5eb2d0880a917754 Mon Sep 17 00:00:00 2001 From: wangqx Date: Fri, 26 Sep 2025 10:55:45 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E6=94=B9=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 1 - .../handler/SaTokenExceptionHandler.java | 2 +- .../security/config/SecurityConfig.java | 7 ------ .../web/handler/GlobalExceptionHandler.java | 10 ++++++++ .../convert/impl/AccountBillConvertImpl.java | 23 +++++++++++++++++++ .../member/domain/vo/AccountBillVO.java | 4 ++++ .../member/enums/AccountBillSourceEnum.java | 8 +++++++ 7 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/impl/AccountBillConvertImpl.java diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 0ace2766f..f57a3d85a 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -120,7 +120,6 @@ security: - /*/api-docs - /*/api-docs/** - /warm-flow-ui/token-name - - /app/** - /resource/oss/** - /callback/api - /cms/vlog/vodCallBack diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java index 76c926bf6..2632f0d19 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java @@ -46,7 +46,7 @@ public class SaTokenExceptionHandler { public R handleNotLoginException(NotLoginException e, HttpServletRequest request) { String requestURI = request.getRequestURI(); log.error("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI, e.getMessage()); - return R.fail(HttpStatus.HTTP_UNAUTHORIZED, "认证失败，无法访问系统资源:" + e.getMessage()); + return R.notLogin(); } } diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java index 97d06bfef..2c4245205 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java @@ -75,13 +75,6 @@ public class SecurityConfig implements WebMvcConfigurer { // "-100", "客户端ID与Token不匹配", // StpUtil.getTokenValue()); // } - - // 有效率影响 用于临时测试 - // if (log.isDebugEnabled()) { - // log.info("剩余有效时间: {}", StpUtil.getTokenTimeout()); - // log.info("临时有效时间: {}", StpUtil.getTokenActivityTimeout()); - // } - }); })).addPathPatterns("/**") // 排除不需要拦截的路径 diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java index d96cd1ca7..1581484e7 100644 --- a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java +++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java @@ -1,5 +1,6 @@ package org.dromara.common.web.handler; +import cn.dev33.satoken.exception.NotLoginException; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import jakarta.servlet.ServletException; @@ -180,4 +181,13 @@ public class GlobalExceptionHandler { return R.fail(message); } + /** + * 自定义验证异常 + */ + @ExceptionHandler(NotLoginException.class) + public R handleNotLoginException(NotLoginException e) { + log.error(e.getMessage()); + return R.notLogin(); + } + } diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/impl/AccountBillConvertImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/impl/AccountBillConvertImpl.java new file mode 100644 index 000000000..6deb5bff3 --- /dev/null +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/convert/impl/AccountBillConvertImpl.java @@ -0,0 +1,23 @@ +package com.wzj.soopin.member.convert.impl; + +import com.wzj.soopin.member.domain.po.AccountBill; +import com.wzj.soopin.member.domain.vo.AccountBillVO; +import com.wzj.soopin.member.enums.AccountBillSourceEnum; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; + +/** + * 会员账户表 DO <=> DTO <=> VO / BO / Query + * + * @author zcc + */ +@Component("accountBillConvert") +@Primary +public class AccountBillConvertImpl extends com.wzj.soopin.member.convert.AccountBillConvertImpl { + @Override + public AccountBillVO toVO(AccountBill t) { + AccountBillVO vo= super.toVO(t); + vo.setSourceName(AccountBillSourceEnum.getByCode(t.getSource()).getMessage()); + return vo; + } +} diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java index 0dfe81b04..86d8fe7bb 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/vo/AccountBillVO.java @@ -54,6 +54,10 @@ public class AccountBillVO extends BaseAudit { @Excel(name = "来源") private Integer source; + @Schema(description ="来源") + @Excel(name = "来源") + private String sourceName; + @Schema(description ="会员id") private Long memberId; diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/AccountBillSourceEnum.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/AccountBillSourceEnum.java index 601fc4718..612082d39 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/AccountBillSourceEnum.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/enums/AccountBillSourceEnum.java @@ -25,6 +25,14 @@ public enum AccountBillSourceEnum { this.code = code; this.message = message; } + public static AccountBillSourceEnum getByCode(Integer code) { + for (AccountBillSourceEnum anEnum : AccountBillSourceEnum.values()) { + if (anEnum.getCode().equals(code)) { + return anEnum; + } + } + return null; + } public Integer getCode() { return code;