From 0a15f6acddc3e1c69fba24ba35f2f5d375cdc45c Mon Sep 17 00:00:00 2001 From: chenbingxuan <3581044601@qq.com> Date: Tue, 16 Jan 2024 14:32:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BD=91=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/TokenConstants.java | 2 +- .../doctor/gateway/filter/AuthFilter.java | 9 +++----- .../impl/HealthJobTitleServiceImpl.java | 1 + .../service/impl/SysDictTypeServiceImpl.java | 23 +++++++++---------- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java index a3155f8..8450fd3 100644 --- a/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java +++ b/doctor-common/doctor-common-core/src/main/java/doctor/common/core/constant/TokenConstants.java @@ -11,7 +11,7 @@ public class TokenConstants * 令牌自定义标识 */ public static final String AUTHENTICATION = "Authorization"; - public static final String SESSIONID = "SESSIONID"; + public static final String SESSIONID = "Sessionid"; /** * 令牌前缀 diff --git a/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java b/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java index aefad10..83c623f 100644 --- a/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java +++ b/doctor-gateway/src/main/java/doctor/gateway/filter/AuthFilter.java @@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.core.Ordered; +import org.springframework.http.HttpHeaders; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; @@ -122,13 +123,9 @@ public class AuthFilter implements GlobalFilter, Ordered private String getToken(ServerHttpRequest request) { String token = request.getHeaders().getFirst(TokenConstants.AUTHENTICATION); - if (StringUtils.isNotEmpty(token)) + if (StringUtils.isEmpty(token)) { - token = request.getQueryParams().getFirst(TokenConstants.SESSIONID); - } - if(StringUtils.isNotEmpty(token)){ - //TODO 解决报错问题 - request.getHeaders().set(TokenConstants.SESSIONID,token); + token = request.getHeaders().getFirst(TokenConstants.SESSIONID); } // 如果前端设置了令牌前缀，则裁剪掉前缀 if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX)) diff --git a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java index 9c14a3d..cf520b2 100644 --- a/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java +++ b/doctor-modules/doctor-health/src/main/java/doctor/service/impl/HealthJobTitleServiceImpl.java @@ -19,6 +19,7 @@ import doctor.util.OssUtil; import doctor.util.RSAUtils; import doctor.util.RsaKey; import doctor.util.SendEmail; +import lombok.extern.log4j.Log4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java b/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java index cba1ff1..2bb9d41 100644 --- a/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java +++ b/doctor-modules/doctor-system/src/main/java/doctor/system/service/impl/SysDictTypeServiceImpl.java @@ -20,7 +20,7 @@ import doctor.system.service.ISysDictTypeService; /** * 字典 业务层处理 - * + * * @author ruoyi */ @Service @@ -43,7 +43,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据条件分页查询字典类型 - * + * * @param dictType 字典类型信息 * @return 字典类型集合信息 */ @@ -55,7 +55,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据所有字典类型 - * + * * @return 字典类型集合信息 */ @Override @@ -66,7 +66,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据字典类型查询字典数据 - * + * * @param dictType 字典类型 * @return 字典数据集合信息 */ @@ -89,7 +89,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据字典类型ID查询信息 - * + * * @param dictId 字典类型ID * @return 字典类型 */ @@ -101,7 +101,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 根据字典类型查询信息 - * + * * @param dictType 字典类型 * @return 字典类型 */ @@ -113,7 +113,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 批量删除字典类型信息 - * + * * @param dictIds 需要删除的字典ID */ @Override @@ -167,7 +167,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 新增保存字典类型信息 - * + * * @param dict 字典类型信息 * @return 结果 */ @@ -184,7 +184,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 修改保存字典类型信息 - * + * * @param dict 字典类型信息 * @return 结果 */ @@ -205,13 +205,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService /** * 校验字典类型称是否唯一 - * + * * @param dict 字典类型 * @return 结果 */ @Override - public boolean checkDictTypeUnique(SysDictType dict) - { + public boolean checkDictTypeUnique(SysDictType dict) { Long dictId = StringUtils.isNull(dict.getDictId()) ? -1L : dict.getDictId(); SysDictType dictType = dictTypeMapper.checkDictTypeUnique(dict.getDictType()); if (StringUtils.isNotNull(dictType) && dictType.getDictId().longValue() != dictId.longValue())