From 5b159328598410216eccb09eedf542890b90f393 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 8 Mar 2024 20:42:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat=20:=20=E6=B8=85=E9=99=A4=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/impl/LoginServiceImpl.java | 24 +++++++------- .../common/log/aspect/LogAspect.java | 2 +- .../notice/config/RedisTemplateConfig.java | 31 ------------------- 3 files changed, 13 insertions(+), 44 deletions(-) delete mode 100644 notice/notice-biz/src/main/java/cn/fateverse/notice/config/RedisTemplateConfig.java diff --git a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java index f71b489..bfd8e1c 100644 --- a/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java +++ b/auth/src/main/java/cn/fateverse/auth/service/impl/LoginServiceImpl.java @@ -85,18 +85,18 @@ public class LoginServiceImpl implements LoginService { @Override public String login(LoginBody login) { log.info("用户:{},于:{}登录系统", login.getUsername(), DateUtil.format(new Date(), DateConstants.YYYY_MM_DD_HH_MM_SS)); -// String uuid = CacheConstants.CAPTCHA_CODE_KEY + login.getUuid(); -// String code = String.valueOf(redisTemplate.opsForValue().get(uuid)); -// if (null == code) { -// publishEvent(login.getUsername(), "验证码已过期!", Boolean.FALSE, null); -// throw new CustomException("验证码已过期!"); -// } -// if (!code.equals(login.getCode())) { -// publishEvent(login.getUsername(), "验证码错误!", Boolean.FALSE, null); -// throw new CustomException("验证码错误!"); -// } -// redisTemplate.delete(uuid); - //用户验证 + String uuid = CacheConstants.CAPTCHA_CODE_KEY + login.getUuid(); + String code = String.valueOf(redisTemplate.opsForValue().get(uuid)); + if (null == code) { + publishEvent(login.getUsername(), "验证码已过期!", Boolean.FALSE, null); + throw new CustomException("验证码已过期!"); + } + if (!code.equals(login.getCode())) { + publishEvent(login.getUsername(), "验证码错误!", Boolean.FALSE, null); + throw new CustomException("验证码错误!"); + } + redisTemplate.delete(uuid); + //用户验证 Authentication authentication = null; try { // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername diff --git a/common/common-log/src/main/java/cn/fateverse/common/log/aspect/LogAspect.java b/common/common-log/src/main/java/cn/fateverse/common/log/aspect/LogAspect.java index 8986fd8..cd1a62d 100644 --- a/common/common-log/src/main/java/cn/fateverse/common/log/aspect/LogAspect.java +++ b/common/common-log/src/main/java/cn/fateverse/common/log/aspect/LogAspect.java @@ -47,7 +47,7 @@ public class LogAspect { @Around("@within(log) || @annotation(log)") - public Object before(ProceedingJoinPoint point, Log log) throws Throwable { + public Object around(ProceedingJoinPoint point, Log log) throws Throwable { long startTime = System.currentTimeMillis(); try { Object proceed = point.proceed(point.getArgs()); diff --git a/notice/notice-biz/src/main/java/cn/fateverse/notice/config/RedisTemplateConfig.java b/notice/notice-biz/src/main/java/cn/fateverse/notice/config/RedisTemplateConfig.java deleted file mode 100644 index 4656a82..0000000 --- a/notice/notice-biz/src/main/java/cn/fateverse/notice/config/RedisTemplateConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -package cn.fateverse.notice.config; - -import cn.fateverse.notice.entity.UserInfo; -import org.redisson.spring.data.connection.RedissonConnectionFactory; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.StringRedisSerializer; - -/** - * @author Clay - * @date 2023-10-15 - */ -//@Configuration -public class RedisTemplateConfig { - - - @Bean("noticeRedisTemplate") - public RedisTemplate noticeRedisTemplate(RedissonConnectionFactory redissonConnectionFactory) { - RedisTemplate redisTemplate = new RedisTemplate<>(); - redisTemplate.setConnectionFactory(redissonConnectionFactory); - //设置key序列化方式string - redisTemplate.setKeySerializer(new StringRedisSerializer()); - redisTemplate.setHashKeySerializer(new StringRedisSerializer()); - redisTemplate.afterPropertiesSet(); - return redisTemplate; - } - - - -} From 27ead40bb36893cd3e10700e1ae3394a0f87b5d4 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 8 Mar 2024 21:30:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat=20:=20IpBack.java=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/fateverse/admin/entity/IpBack.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java new file mode 100644 index 0000000..b0aa6e4 --- /dev/null +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/IpBack.java @@ -0,0 +1,38 @@ +package cn.fateverse.admin.entity; + +import cn.fateverse.admin.vo.IpBackVo; +import cn.fateverse.common.core.annotaion.EnableAutoField; +import cn.fateverse.common.core.entity.BaseEntity; +import lombok.Data; + +/** + * @author Clay + * @date 2023-10-22 + */ +@Data +@EnableAutoField +public class IpBack extends BaseEntity { + /** + * 主键id + */ + private Long id; + /** + * ip地址 + */ + private String ipAddr; + /** + * ip类型 ipv4 ipv6 + */ + private String type; + + public IpBackVo toIPBackVo(){ + return IpBackVo.builder() + .id(id) + .ipAddr(ipAddr) + .type(type) + .createTime(getCreateTime()) + .remark(getRemark()) + .build(); + } + +} From c0e7c5b3495280c890082ea796902c087c1f3f19 Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Sat, 9 Mar 2024 13:59:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix=20:=20=E6=8E=A5=E5=8F=A3=E5=BC=80?= =?UTF-8?q?=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/fateverse/admin/entity/vo/MappingSwitchVo.java | 8 ++++++-- .../cn/fateverse/admin/service/impl/UserServiceImpl.java | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java index ebb3ae7..721421f 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/entity/vo/MappingSwitchVo.java @@ -87,19 +87,23 @@ public class MappingSwitchVo { private String operName; public static MappingSwitchVo toMappingSwitchVo(MappingSwitchInfo mappingSwitchInfo) { - return MappingSwitchVo.builder() + MappingSwitchVo mappingSwitchVo = MappingSwitchVo.builder() .key(mappingSwitchInfo.getKey()) .applicationName(mappingSwitchInfo.getApplicationName()) .className(mappingSwitchInfo.getClassName()) .description(mappingSwitchInfo.getDescription()) .methodName(mappingSwitchInfo.getMethodName()) .uris(mappingSwitchInfo.getUris()) - .type(mappingSwitchInfo.getType().toString()) .httpMethods(mappingSwitchInfo.getHttpMethods()) .state(mappingSwitchInfo.getState()) .operName(mappingSwitchInfo.getOperName()) .operTime(mappingSwitchInfo.getOperTime()) .build(); + MappingSwitchInfo.MappingSwitchType switchType = mappingSwitchInfo.getType(); + if (switchType != null) { + mappingSwitchVo.setType(switchType.name()); + } + return mappingSwitchVo; } diff --git a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java index 4036c19..5a1571d 100644 --- a/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/fateverse/admin/service/impl/UserServiceImpl.java @@ -307,7 +307,6 @@ public class UserServiceImpl implements UserService { batchUserPost(dto, Boolean.TRUE); dto.setPassword(null); UserBase user = dto.toUser(); - return userMapper.update(user); }