From 399efe49ff3fc0e957c487f1ab882ba2c7f03a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E6=9D=8E?= <1040978436@qq.com> Date: Wed, 7 Jan 2026 16:43:12 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/common-core/pom.xml | 9 ++++ .../com/tacit/common/utils/JSONUtils.java | 26 +++++++++ .../com/tacit/common/utils/RedisConfig.java | 45 ++++++++++++++++ .../com/tacit/common/utils/RedisUtils.java | 37 +++++++++++++ .../java/com/tacit/common/utils/ResCode.java | 53 +++++++++++++++++++ .../java/com/tacit/common/entity/Base.java | 3 +- .../tacit/common/entity/ResponseResult.java | 3 ++ pom.xml | 14 +++++ tacit-admin/Dockerfile | 2 +- tacit-admin/pom.xml | 10 +++- .../admin/controller/AuthController.java | 13 +++++ .../com/tacit/admin/service/UserService.java | 4 ++ .../admin/service/impl/UserServiceImpl.java | 21 +++++++- .../src/main/resources/application-dev.yml | 33 ------------ .../src/main/resources/application-qa.yml | 33 ------------ tacit-admin/src/main/resources/bootstrap.yml | 8 +-- tacit-app-api/Dockerfile | 2 +- .../src/main/resources/application-dev.yml | 43 --------------- .../src/main/resources/application-qa.yml | 43 --------------- .../src/main/resources/bootstrap.yml | 7 ++- tacit-gateway/Dockerfile | 2 +- tacit-gateway/pom.xml | 10 +++- .../com/tacit/gateway/config/RedisConfig.java | 45 ++++++++++++++++ .../filter/JwtAuthenticationFilter.java | 18 ++++--- .../src/main/resources/bootstrap.yml | 7 ++- 25 files changed, 319 insertions(+), 172 deletions(-) create mode 100644 common/common-core/src/main/java/com/tacit/common/utils/JSONUtils.java create mode 100644 common/common-core/src/main/java/com/tacit/common/utils/RedisConfig.java create mode 100644 common/common-core/src/main/java/com/tacit/common/utils/RedisUtils.java create mode 100644 common/common-core/src/main/java/com/tacit/common/utils/ResCode.java create mode 100644 tacit-gateway/src/main/java/com/tacit/gateway/config/RedisConfig.java diff --git a/common/common-core/pom.xml b/common/common-core/pom.xml index ca0e2da..257124d 100644 --- a/common/common-core/pom.xml +++ b/common/common-core/pom.xml @@ -56,6 +56,15 @@ junit-jupiter test + + + org.springframework.boot + spring-boot-starter-data-redis + + + redis.clients + jedis + diff --git a/common/common-core/src/main/java/com/tacit/common/utils/JSONUtils.java b/common/common-core/src/main/java/com/tacit/common/utils/JSONUtils.java new file mode 100644 index 0000000..afda4a6 --- /dev/null +++ b/common/common-core/src/main/java/com/tacit/common/utils/JSONUtils.java @@ -0,0 +1,26 @@ +package com.tacit.common.utils; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.tacit.common.exception.BusinessException; + +public class JSONUtils { + public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper() + .registerModule(new JavaTimeModule()); + /** + * + * @param obj + * @return + */ + public static String obj2String(T obj) { + if (obj == null) { + return null; + } + try { + return obj instanceof String ? (String)obj : OBJECT_MAPPER.writeValueAsString(obj); + } catch (JsonProcessingException e) { + throw new BusinessException("object 序列化错误"); + } + } +} diff --git a/common/common-core/src/main/java/com/tacit/common/utils/RedisConfig.java b/common/common-core/src/main/java/com/tacit/common/utils/RedisConfig.java new file mode 100644 index 0000000..d35619d --- /dev/null +++ b/common/common-core/src/main/java/com/tacit/common/utils/RedisConfig.java @@ -0,0 +1,45 @@ +package com.tacit.common.utils; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +public class RedisConfig { + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory factory) { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(factory); + + // key 使用 String 序列化 + template.setKeySerializer(new StringRedisSerializer()); + template.setHashKeySerializer(new StringRedisSerializer()); + + // value 使用 JSON 序列化 + Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(Object.class); + ObjectMapper mapper = new ObjectMapper(); + + // 设置字段可见性 + mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + + // 新版 Jackson 安全的多态类型配置 + mapper.activateDefaultTyping( + LaissezFaireSubTypeValidator.instance, + ObjectMapper.DefaultTyping.NON_FINAL + ); + + template.setValueSerializer(serializer); + template.setHashValueSerializer(serializer); + + template.afterPropertiesSet(); + return template; + } +} diff --git a/common/common-core/src/main/java/com/tacit/common/utils/RedisUtils.java b/common/common-core/src/main/java/com/tacit/common/utils/RedisUtils.java new file mode 100644 index 0000000..946c08e --- /dev/null +++ b/common/common-core/src/main/java/com/tacit/common/utils/RedisUtils.java @@ -0,0 +1,37 @@ +package com.tacit.common.utils; + +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Component; +import redis.clients.jedis.Jedis; +import redis.clients.jedis.JedisPool; + +import java.util.concurrent.TimeUnit; + +/** + * @Description: redis工具类 + * @Author: lidongjin + * @CreateTime: 2026-01-07 09:27 + */ +@Slf4j +@Component +public class RedisUtils { + + @Autowired + private RedisTemplate redisTemplate; + public void setObject(String key, Object value, long expireTime, TimeUnit timeUnit) { + redisTemplate.opsForValue().set(key, value, expireTime, timeUnit); + } + + public Boolean hasKey(String key) { + return redisTemplate.hasKey(key); + } + + public void delete(String token) { + redisTemplate.delete(token); + } +} diff --git a/common/common-core/src/main/java/com/tacit/common/utils/ResCode.java b/common/common-core/src/main/java/com/tacit/common/utils/ResCode.java new file mode 100644 index 0000000..0cbd16b --- /dev/null +++ b/common/common-core/src/main/java/com/tacit/common/utils/ResCode.java @@ -0,0 +1,53 @@ +package com.tacit.common.utils; + +/** + * @Author: ldj + * @Date: 2026/1/7 10:54 + */ +public enum ResCode { + + SAVE_SUCCESS(200, "保存成功"), + + QUERY_SUCCESS(200, ""), + + DELETE_SUCCESS(200, "删除成功"), + // 处理成功的 + SUCCESS_REQUEST(200, "成功"), + + NO_LOGIN(201, "登录超时请重新登录"), + + NO_PARAM(202, "参数为空"), + + PARAM_ERROR(202, "参数序列化错误"), + + NO_PERMISSION(401, "用户没有该权限"), + // 查询的数据或者前端传入的数据不存在 + DATA_NOT_EXIST(9999, "不存在"), + + SYSTEM_ERROR(9999, "系统内部错误"), + + MULTIPART_TOO_LARGE(203, "上传文件过大，文件不能超过10MB"), + + LOGOUT(202, "退出成功") + ; + + + /** 错误码 */ + private Integer resultCode; + + /** 错误描述 */ + private String resultMsg; + + ResCode(Integer resultCode, String resultMsg) { + this.resultCode = resultCode; + this.resultMsg = resultMsg; + } + + public Integer getResultCode() { + return resultCode; + } + + public String getResultMsg() { + return resultMsg; + } +} diff --git a/common/common-model/src/main/java/com/tacit/common/entity/Base.java b/common/common-model/src/main/java/com/tacit/common/entity/Base.java index 90ea1b2..51cd8fc 100644 --- a/common/common-model/src/main/java/com/tacit/common/entity/Base.java +++ b/common/common-model/src/main/java/com/tacit/common/entity/Base.java @@ -5,10 +5,11 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; +import java.io.Serializable; import java.time.LocalDateTime; @Data -public class Base { +public class Base implements Serializable { @TableId(type = IdType.AUTO) private Long id; private LocalDateTime createTime; diff --git a/common/common-model/src/main/java/com/tacit/common/entity/ResponseResult.java b/common/common-model/src/main/java/com/tacit/common/entity/ResponseResult.java index 9e679bb..5c10b3c 100644 --- a/common/common-model/src/main/java/com/tacit/common/entity/ResponseResult.java +++ b/common/common-model/src/main/java/com/tacit/common/entity/ResponseResult.java @@ -28,6 +28,9 @@ public class ResponseResult implements Serializable { public static ResponseResult success(T data) { return new ResponseResult<>(200, "操作成功", data); } + public static ResponseResult success(Integer code, String message,T data) { + return new ResponseResult<>(code, message,data); + } public static ResponseResult success(String message, T data) { return new ResponseResult<>(200, message, data); diff --git a/pom.xml b/pom.xml index 5fc031c..0bdfed4 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,8 @@ 3.14.0 5.9.3 4.0.4 + 3.2.0 + 2.2.1.RELEASE @@ -218,6 +220,17 @@ resilience4j-timelimiter ${resilience4j.version} + + + org.springframework.boot + spring-boot-starter-data-redis + ${data-redis.version} + + + redis.clients + jedis + ${redis.version} + @@ -256,6 +269,7 @@ spring-cloud-starter-loadbalancer ${loadbalancer.version} + diff --git a/tacit-admin/Dockerfile b/tacit-admin/Dockerfile index 134c908..cd14165 100644 --- a/tacit-admin/Dockerfile +++ b/tacit-admin/Dockerfile @@ -1,4 +1,4 @@ -FROM java:21 +FROM openjdk:21-rc COPY *.jar /app.jar CMD ["--server.port=8082"] diff --git a/tacit-admin/pom.xml b/tacit-admin/pom.xml index 7e1fd82..c5cd6a7 100644 --- a/tacit-admin/pom.xml +++ b/tacit-admin/pom.xml @@ -94,7 +94,15 @@ org.springframework.cloud spring-cloud-starter-bootstrap - + + + org.springframework.boot + spring-boot-starter-data-redis + + + redis.clients + jedis + diff --git a/tacit-admin/src/main/java/com/tacit/admin/controller/AuthController.java b/tacit-admin/src/main/java/com/tacit/admin/controller/AuthController.java index cb80600..9e06be2 100644 --- a/tacit-admin/src/main/java/com/tacit/admin/controller/AuthController.java +++ b/tacit-admin/src/main/java/com/tacit/admin/controller/AuthController.java @@ -4,10 +4,15 @@ import com.tacit.admin.entity.dto.LoginRequest; import com.tacit.admin.entity.dto.LoginResponse; import com.tacit.admin.entity.dto.RegisterRequest; import com.tacit.admin.service.UserService; +import com.tacit.common.constant.CommonConstant; import com.tacit.common.entity.ResponseResult; +import com.tacit.common.utils.ResCode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -32,4 +37,12 @@ public class AuthController { userService.register(registerRequest); return ResponseResult.success(); } + @Operation(summary = "用户退出登录", description = "用户退出登录") + @PostMapping("/logout") + public ResponseResult logout(HttpServletRequest request) { + String authorization = request.getHeader("Authorization"); + String token = authorization.substring(CommonConstant.JWT_PREFIX.length()); + userService.logout(token); + return ResponseResult.success(ResCode.LOGOUT.getResultCode(), ResCode.LOGOUT.getResultMsg(), null); + } } diff --git a/tacit-admin/src/main/java/com/tacit/admin/service/UserService.java b/tacit-admin/src/main/java/com/tacit/admin/service/UserService.java index 8583a6e..75d3294 100644 --- a/tacit-admin/src/main/java/com/tacit/admin/service/UserService.java +++ b/tacit-admin/src/main/java/com/tacit/admin/service/UserService.java @@ -62,4 +62,8 @@ public interface UserService extends IService { * @param registerRequest 注册请求参数 */ void register(RegisterRequest registerRequest); + /** + * 用户退出登录 + */ + void logout(String token); } diff --git a/tacit-admin/src/main/java/com/tacit/admin/service/impl/UserServiceImpl.java b/tacit-admin/src/main/java/com/tacit/admin/service/impl/UserServiceImpl.java index 6628469..bc3ef9c 100644 --- a/tacit-admin/src/main/java/com/tacit/admin/service/impl/UserServiceImpl.java +++ b/tacit-admin/src/main/java/com/tacit/admin/service/impl/UserServiceImpl.java @@ -9,13 +9,17 @@ import com.tacit.admin.entity.dto.RegisterRequest; import com.tacit.admin.mapper.UserMapper; import com.tacit.admin.service.UserService; import com.tacit.common.utils.JwtUtils; +import com.tacit.common.utils.RedisUtils; import jakarta.annotation.Resource; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.TimeUnit; @Service public class UserServiceImpl extends ServiceImpl implements UserService { @@ -25,6 +29,8 @@ public class UserServiceImpl extends ServiceImpl implements Us @Resource private PasswordEncoder passwordEncoder; + @Autowired + private RedisUtils redisUtils; @Override public User getUserByUsername(String username) { @@ -71,6 +77,11 @@ public class UserServiceImpl extends ServiceImpl implements Us @Override public LoginResponse login(LoginRequest loginRequest) { + // 验证用户名、密码 不是空也不是null + if (StringUtils.isBlank(loginRequest.getUsername()) || StringUtils.isBlank(loginRequest.getPassword())) { + throw new RuntimeException("用户名或密码不能为空"); + } + // 根据用户名查询用户 User user = getUserByUsername(loginRequest.getUsername()); if (user == null) { @@ -87,7 +98,8 @@ public class UserServiceImpl extends ServiceImpl implements Us claims.put("username", user.getUsername()); claims.put("role", user.getRole()); String token = JwtUtils.generateToken(claims); - + // 将生成的 JWT 令牌存储到 Redis 缓存中，设置过期时间为 7 天（7 * 24 * 60 * 60 秒） + redisUtils.setObject(token, user.getId(),7 * 24 * 60 * 60, TimeUnit.SECONDS); // 构建登录响应 LoginResponse loginResponse = new LoginResponse(); loginResponse.setToken(token); @@ -95,6 +107,13 @@ public class UserServiceImpl extends ServiceImpl implements Us return loginResponse; } + /** + * 用户退出登录 + */ + @Override + public void logout(String token) { + redisUtils.delete(token); + } @Override public void register(RegisterRequest registerRequest) { diff --git a/tacit-admin/src/main/resources/application-dev.yml b/tacit-admin/src/main/resources/application-dev.yml index aba1b0a..67ff5c7 100644 --- a/tacit-admin/src/main/resources/application-dev.yml +++ b/tacit-admin/src/main/resources/application-dev.yml @@ -1,36 +1,3 @@ server: port: 8082 -spring: - datasource: - driver-class-name: com.oceanbase.jdbc.Driver - url: jdbc:oceanbase://localhost:2881/tacit?useUnicode=true&characterEncoding=utf-8&useSSL=false - username: root - password: 123456 - data: - redis: - host: 117.72.94.232 - port: 56379 - password: redis - database: 1 - -mybatis-plus: - configuration: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:mapper/**/*.xml - type-aliases-package: com.tacit.admin.entity - -# Swagger Configuration -springdoc: - api-docs: - enabled: true - path: /v3/api-docs - swagger-ui: - enabled: true - path: /swagger-ui.html - -# Logging Configuration -logging: - level: - com.tacit.admin: debug diff --git a/tacit-admin/src/main/resources/application-qa.yml b/tacit-admin/src/main/resources/application-qa.yml index 8f9e0bb..67ff5c7 100644 --- a/tacit-admin/src/main/resources/application-qa.yml +++ b/tacit-admin/src/main/resources/application-qa.yml @@ -1,36 +1,3 @@ server: port: 8082 -spring: - datasource: - driver-class-name: com.oceanbase.jdbc.Driver - url: jdbc:oceanbase://117.72.94.232:53306/tacit?useUnicode=true&characterEncoding=utf-8&useSSL=false - username: root - password: fU44GFH5 - data: - redis: - host: 117.72.94.232 - port: 56379 - password: redis - database: 2 - -mybatis-plus: - configuration: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:mapper/**/*.xml - type-aliases-package: com.tacit.admin.entity - -# Swagger Configuration -springdoc: - api-docs: - enabled: true - path: /v3/api-docs - swagger-ui: - enabled: true - path: /swagger-ui.html - -# Logging Configuration -logging: - level: - com.tacit.admin: debug diff --git a/tacit-admin/src/main/resources/bootstrap.yml b/tacit-admin/src/main/resources/bootstrap.yml index 7eedd3c..29358cc 100644 --- a/tacit-admin/src/main/resources/bootstrap.yml +++ b/tacit-admin/src/main/resources/bootstrap.yml @@ -7,12 +7,14 @@ spring: nacos: discovery: enabled: true - server-addr: localhost:8848 + server-addr: http://117.72.94.232:9091 username: nacos password: nacos + namespace: ldj config: enabled: true - server-addr: localhost:8848 + server-addr: http://117.72.94.232:9091 file-extension: yaml username: nacos - password: nacos \ No newline at end of file + password: nacos + namespace: ldj \ No newline at end of file diff --git a/tacit-app-api/Dockerfile b/tacit-app-api/Dockerfile index 134c908..cd14165 100644 --- a/tacit-app-api/Dockerfile +++ b/tacit-app-api/Dockerfile @@ -1,4 +1,4 @@ -FROM java:21 +FROM openjdk:21-rc COPY *.jar /app.jar CMD ["--server.port=8082"] diff --git a/tacit-app-api/src/main/resources/application-dev.yml b/tacit-app-api/src/main/resources/application-dev.yml index bd848cf..ac79bd8 100644 --- a/tacit-app-api/src/main/resources/application-dev.yml +++ b/tacit-app-api/src/main/resources/application-dev.yml @@ -1,46 +1,3 @@ server: port: 8083 -spring: - application: - name: tacit-app-api - config: - import: optional:nacos:localhost:8848?namespace=public&group=DEFAULT_GROUP&file-extension=yml - cloud: - nacos: - discovery: - enabled: true - server-addr: localhost:8848 - namespace: public - datasource: - driver-class-name: com.oceanbase.jdbc.Driver - url: jdbc:oceanbase://localhost:3306/tacit?useUnicode=true&characterEncoding=utf-8&useSSL=false - username: root - password: 123456 - data: - redis: - host: 117.72.94.232 - port: 56379 - password: redis - database: 1 - -mybatis-plus: - configuration: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:mapper/**/*.xml - type-aliases-package: com.tacit.app.entity - -# Swagger Configuration -springdoc: - api-docs: - enabled: true - path: /v3/api-docs - swagger-ui: - enabled: true - path: /swagger-ui.html - -# Logging Configuration -logging: - level: - com.tacit.app: debug diff --git a/tacit-app-api/src/main/resources/application-qa.yml b/tacit-app-api/src/main/resources/application-qa.yml index 67158c3..ac79bd8 100644 --- a/tacit-app-api/src/main/resources/application-qa.yml +++ b/tacit-app-api/src/main/resources/application-qa.yml @@ -1,46 +1,3 @@ server: port: 8083 -spring: - application: - name: tacit-app-api - config: - import: optional:nacos:localhost:8848?namespace=public&group=DEFAULT_GROUP&file-extension=yml - cloud: - nacos: - discovery: - enabled: true - server-addr: localhost:8848 - namespace: public - datasource: - driver-class-name: com.oceanbase.jdbc.Driver - url: jdbc:oceanbase://117.72.94.232:53306/tacit?useUnicode=true&characterEncoding=utf-8&useSSL=false - username: root - password: fU44GFH5 - data: - redis: - host: 117.72.94.232 - port: 56379 - password: redis - database: 2 - -mybatis-plus: - configuration: - map-underscore-to-camel-case: true - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - mapper-locations: classpath*:mapper/**/*.xml - type-aliases-package: com.tacit.app.entity - -# Swagger Configuration -springdoc: - api-docs: - enabled: true - path: /v3/api-docs - swagger-ui: - enabled: true - path: /swagger-ui.html - -# Logging Configuration -logging: - level: - com.tacit.app: debug diff --git a/tacit-app-api/src/main/resources/bootstrap.yml b/tacit-app-api/src/main/resources/bootstrap.yml index 0a4a6be..653bf3b 100644 --- a/tacit-app-api/src/main/resources/bootstrap.yml +++ b/tacit-app-api/src/main/resources/bootstrap.yml @@ -7,12 +7,15 @@ spring: nacos: discovery: enabled: true - server-addr: localhost:8848 + server-addr: http://117.72.94.232:9091 username: nacos password: nacos + namespace: ldj config: enabled: true - server-addr: localhost:8848 + server-addr: http://117.72.94.232:9091 + # server-addr: localhost:8848 file-extension: yaml username: nacos password: nacos + namespace: ldj diff --git a/tacit-gateway/Dockerfile b/tacit-gateway/Dockerfile index 134c908..cd14165 100644 --- a/tacit-gateway/Dockerfile +++ b/tacit-gateway/Dockerfile @@ -1,4 +1,4 @@ -FROM java:21 +FROM openjdk:21-rc COPY *.jar /app.jar CMD ["--server.port=8082"] diff --git a/tacit-gateway/pom.xml b/tacit-gateway/pom.xml index 11a7631..6699776 100644 --- a/tacit-gateway/pom.xml +++ b/tacit-gateway/pom.xml @@ -62,7 +62,15 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + + + org.springframework.boot + spring-boot-starter-data-redis + + + redis.clients + jedis + diff --git a/tacit-gateway/src/main/java/com/tacit/gateway/config/RedisConfig.java b/tacit-gateway/src/main/java/com/tacit/gateway/config/RedisConfig.java new file mode 100644 index 0000000..c9c7906 --- /dev/null +++ b/tacit-gateway/src/main/java/com/tacit/gateway/config/RedisConfig.java @@ -0,0 +1,45 @@ +package com.tacit.gateway.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +@Configuration +public class RedisConfig { + + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory factory) { + RedisTemplate template = new RedisTemplate<>(); + template.setConnectionFactory(factory); + + // key 使用 String 序列化 + template.setKeySerializer(new StringRedisSerializer()); + template.setHashKeySerializer(new StringRedisSerializer()); + + // value 使用 JSON 序列化 + Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(Object.class); + ObjectMapper mapper = new ObjectMapper(); + + // 设置字段可见性 + mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + + // 新版 Jackson 安全的多态类型配置 + mapper.activateDefaultTyping( + LaissezFaireSubTypeValidator.instance, + ObjectMapper.DefaultTyping.NON_FINAL + ); + + template.setValueSerializer(serializer); + template.setHashValueSerializer(serializer); + + template.afterPropertiesSet(); + return template; + } +} diff --git a/tacit-gateway/src/main/java/com/tacit/gateway/filter/JwtAuthenticationFilter.java b/tacit-gateway/src/main/java/com/tacit/gateway/filter/JwtAuthenticationFilter.java index 2e17445..d49fd7e 100644 --- a/tacit-gateway/src/main/java/com/tacit/gateway/filter/JwtAuthenticationFilter.java +++ b/tacit-gateway/src/main/java/com/tacit/gateway/filter/JwtAuthenticationFilter.java @@ -3,9 +3,11 @@ package com.tacit.gateway.filter; import com.tacit.common.constant.CommonConstant; import com.tacit.common.utils.JwtUtils; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.server.reactive.ServerHttpRequest; @@ -22,13 +24,14 @@ import java.util.List; @Component("JwtAuthenticationFilter") @Slf4j public class JwtAuthenticationFilter extends AbstractGatewayFilterFactory { - + @Autowired + private RedisTemplate redisTemplate; // 不需要认证的路径 private static final List WHITE_LIST = List.of( - "/api/auth/login", - "/api/auth/register", - "/admin/auth/login", - "/admin/auth/register", + "/auth/login", + "/auth/register", + "/auth/login", + "/auth/register", "/swagger-ui", "/v3/api-docs" ); @@ -70,7 +73,10 @@ public class JwtAuthenticationFilter extends AbstractGatewayFilterFactory