From 1ed411578fceec5a9b0b6c265e1831aa3bed7f2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 7 Jan 2025 13:34:33 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=91=E5=90=8D=E5=8D=95=E5=8F=8A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=BF=E9=97=AE=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{AlipayBlacklist.java => TbUserBlacklist.java} | 14 ++++++++------ .../com/sqx/modules/app/entity/UserEntity.java | 12 ++++++++++++ .../app/interceptor/AuthorizationInterceptor.java | 15 ++++++++------- ...listMapper.java => TbUserBlacklistMapper.java} | 4 ++-- src/main/resources/application.yml | 2 +- 5 files changed, 31 insertions(+), 16 deletions(-) rename src/main/java/com/sqx/modules/app/entity/{AlipayBlacklist.java => TbUserBlacklist.java} (62%) rename src/main/java/com/sqx/modules/app/mapper/{AlipayBlacklistMapper.java => TbUserBlacklistMapper.java} (68%) diff --git a/src/main/java/com/sqx/modules/app/entity/AlipayBlacklist.java b/src/main/java/com/sqx/modules/app/entity/TbUserBlacklist.java similarity index 62% rename from src/main/java/com/sqx/modules/app/entity/AlipayBlacklist.java rename to src/main/java/com/sqx/modules/app/entity/TbUserBlacklist.java index 268d3bcb..3ec59f34 100644 --- a/src/main/java/com/sqx/modules/app/entity/AlipayBlacklist.java +++ b/src/main/java/com/sqx/modules/app/entity/TbUserBlacklist.java @@ -8,19 +8,21 @@ import lombok.Data; import java.io.Serializable; /** - * 支付宝黑名单 + * 用户黑名单 * @author tankaikai * @since 2025-01-07 12:56 */ @Data -@TableName(value ="alipay_blacklist") -public class AlipayBlacklist implements Serializable { +@TableName(value ="tb_user_blacklist") +public class TbUserBlacklist implements Serializable { private static final long serialVersionUID = 1L; - @TableId(type=IdType.INPUT) - private String alipayAccountNo; + @TableId(type=IdType.AUTO) + private Long id; - private String alipayAccountName; + private String idCardNo; + + private String realName; } diff --git a/src/main/java/com/sqx/modules/app/entity/UserEntity.java b/src/main/java/com/sqx/modules/app/entity/UserEntity.java index c80cccbe..c64ab118 100644 --- a/src/main/java/com/sqx/modules/app/entity/UserEntity.java +++ b/src/main/java/com/sqx/modules/app/entity/UserEntity.java @@ -61,6 +61,18 @@ public class UserEntity implements Serializable { @ApiModelProperty("性别 1男 2女") private Integer sex; + /** + * 姓名 + */ + @TableField("cert_name") + private String certName; + + /** + * 身份证号码 + */ + @TableField("cert_no") + private String certNo; + /** * 微信小程序openid */ diff --git a/src/main/java/com/sqx/modules/app/interceptor/AuthorizationInterceptor.java b/src/main/java/com/sqx/modules/app/interceptor/AuthorizationInterceptor.java index b62f21ca..b35c3d47 100644 --- a/src/main/java/com/sqx/modules/app/interceptor/AuthorizationInterceptor.java +++ b/src/main/java/com/sqx/modules/app/interceptor/AuthorizationInterceptor.java @@ -4,14 +4,15 @@ package com.sqx.modules.app.interceptor; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.sqx.common.exception.CzgException; import com.sqx.common.exception.SqxException; import com.sqx.common.utils.DateUtils; import com.sqx.common.utils.IPUtils; import com.sqx.modules.app.annotation.Login; -import com.sqx.modules.app.entity.AlipayBlacklist; +import com.sqx.modules.app.entity.TbUserBlacklist; import com.sqx.modules.app.entity.UserEntity; -import com.sqx.modules.app.mapper.AlipayBlacklistMapper; +import com.sqx.modules.app.mapper.TbUserBlacklistMapper; import com.sqx.modules.app.service.UserService; import com.sqx.modules.app.utils.JwtUtils; import com.sqx.modules.redisService.RedisService; @@ -40,7 +41,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { @Autowired private UserService userService; @Autowired - private AlipayBlacklistMapper alipayBlacklistMapper; + private TbUserBlacklistMapper tbUserBlacklistMapper; private final RedisService redisService; @@ -106,10 +107,10 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { throw new CzgException("异常行为用户: {}" + user.getUserId()); } - if(StrUtil.isNotBlank(user.getZhiFuBao())){ - AlipayBlacklist blacklist = alipayBlacklistMapper.selectById(user.getZhiFuBao()); - if(blacklist != null){ - throw new CzgException("禁止访问"); + if (StrUtil.isNotBlank(user.getCertNo())) { + TbUserBlacklist blacklist = tbUserBlacklistMapper.selectOne(Wrappers.lambdaQuery().eq(TbUserBlacklist::getIdCardNo, user.getCertNo())); + if (blacklist != null) { + throw new CzgException(StrUtil.format("黑名单用户，禁止访问：{} / {}", blacklist.getRealName(), blacklist.getIdCardNo())); } } diff --git a/src/main/java/com/sqx/modules/app/mapper/AlipayBlacklistMapper.java b/src/main/java/com/sqx/modules/app/mapper/TbUserBlacklistMapper.java similarity index 68% rename from src/main/java/com/sqx/modules/app/mapper/AlipayBlacklistMapper.java rename to src/main/java/com/sqx/modules/app/mapper/TbUserBlacklistMapper.java index b66ec9db..fb060666 100644 --- a/src/main/java/com/sqx/modules/app/mapper/AlipayBlacklistMapper.java +++ b/src/main/java/com/sqx/modules/app/mapper/TbUserBlacklistMapper.java @@ -1,7 +1,7 @@ package com.sqx.modules.app.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.sqx.modules.app.entity.AlipayBlacklist; +import com.sqx.modules.app.entity.TbUserBlacklist; import org.apache.ibatis.annotations.Mapper; /** @@ -10,5 +10,5 @@ import org.apache.ibatis.annotations.Mapper; * @since 2025-01-07 12:56 */ @Mapper -public interface AlipayBlacklistMapper extends BaseMapper { +public interface TbUserBlacklistMapper extends BaseMapper { } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 02533ed2..07f0f96f 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -127,7 +127,7 @@ spring: - qrtz_cron_triggers - qrtz_calendars - qrtz_blob_triggers - - alipay_blacklist + - tb_user_blacklist # 日志配置 logging: