diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java index 4aec99bd48ea9dbab5fc628967c16c92c7672260..e4edd52ce05d78e8a042c1942a13f65f6101f1ba 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java @@ -27,7 +27,6 @@ import com.pig4cloud.pig.admin.api.vo.TokenVo; import com.pig4cloud.pig.auth.support.handler.PigAuthenticationFailureEventHandler; import com.pig4cloud.pig.common.core.constant.CacheConstants; import com.pig4cloud.pig.common.core.constant.CommonConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.core.util.RetOps; import com.pig4cloud.pig.common.core.util.SpringContextHolder; @@ -108,8 +107,7 @@ public class PigTokenEndpoint { @RequestParam(OAuth2ParameterNames.CLIENT_ID) String clientId, @RequestParam(OAuth2ParameterNames.SCOPE) String scope, @RequestParam(OAuth2ParameterNames.STATE) String state) { - SysOauthClientDetails clientDetails = RetOps - .of(clientDetailsService.getClientDetailsById(clientId, SecurityConstants.FROM_IN)).getData() + SysOauthClientDetails clientDetails = RetOps.of(clientDetailsService.getClientDetailsById(clientId)).getData() .orElseThrow(() -> new OAuthClientException("clientId 不合法")); Set authorizedScopes = StringUtils.commaDelimitedListToSet(clientDetails.getScope()); diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java index 9f5d998dd4f8f1980c444017c896c99dee6564d4..15b2a312bda8741d40ef401b3877d5dfadbb7212 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/SecurityConstants.java @@ -47,6 +47,11 @@ public interface SecurityConstants { */ String FROM = "from"; + /** + * 请求header + */ + String HEADER_FROM_IN = FROM + "=" + FROM_IN; + /** * 默认登录URL */ diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java index cd21742306520e99308cd1193487fa3b7d374e18..162ab829164e6c8d1a45845da3b361dde8971397 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java @@ -18,7 +18,6 @@ package com.pig4cloud.pig.common.log.event; import com.pig4cloud.pig.admin.api.entity.SysLog; import com.pig4cloud.pig.admin.api.feign.RemoteLogService; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; @@ -39,7 +38,7 @@ public class SysLogListener { @EventListener(SysLogEvent.class) public void saveSysLog(SysLogEvent event) { SysLog sysLog = (SysLog) event.getSource(); - remoteLogService.saveLog(sysLog, SecurityConstants.FROM_IN); + remoteLogService.saveLog(sysLog); } } diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java index a5e9f5c02bb36dd16f2d0ec6db963a5bbabb8292..47353cf9e8e08f9f7c197aa8fdaa8272c1895307 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigBearerTokenExtractor.java @@ -41,7 +41,7 @@ public class PigBearerTokenExtractor implements BearerTokenResolver { private boolean allowFormEncodedBodyParameter = false; - private boolean allowUriQueryParameter = false; + private boolean allowUriQueryParameter = true; private String bearerTokenHeaderName = HttpHeaders.AUTHORIZATION; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigAppUserDetailsServiceImpl.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigAppUserDetailsServiceImpl.java index 6bdba27ad9cb1ed06574dd9d5de497257a5fb146..2da512537cf99ef620d53390495e7956986003d8 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigAppUserDetailsServiceImpl.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigAppUserDetailsServiceImpl.java @@ -54,7 +54,7 @@ public class PigAppUserDetailsServiceImpl implements PigUserDetailsService { return (PigUser) cache.get(phone).get(); } - R result = remoteUserService.infoByMobile(phone, SecurityConstants.FROM_IN); + R result = remoteUserService.infoByMobile(phone); UserDetails userDetails = getUserDetails(result); if (cache != null) { diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRemoteRegisteredClientRepository.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRemoteRegisteredClientRepository.java index d99a9817d2dcf083c5fa33e34431e079c59956aa..8acdd0ad553dcef7378b3128aa5bd87c1e3cb0d2 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRemoteRegisteredClientRepository.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigRemoteRegisteredClientRepository.java @@ -86,8 +86,7 @@ public class PigRemoteRegisteredClientRepository implements RegisteredClientRepo @Cacheable(value = CacheConstants.CLIENT_DETAILS_KEY, key = "#clientId", unless = "#result == null") public RegisteredClient findByClientId(String clientId) { - SysOauthClientDetails clientDetails = RetOps - .of(clientDetailsService.getClientDetailsById(clientId, SecurityConstants.FROM_IN)).getData() + SysOauthClientDetails clientDetails = RetOps.of(clientDetailsService.getClientDetailsById(clientId)).getData() .orElseThrow(() -> new OAuthClientException("客户端查询异常，请检查数据库链接")); RegisteredClient.Builder builder = RegisteredClient.withId(clientDetails.getClientId()) diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java index b2d710f1a618c66408706a491df9d7014aa72d44..0eb0b862d6480fd9129ee1a3c4de40edcb1d959a 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java @@ -19,7 +19,6 @@ package com.pig4cloud.pig.common.security.service; import com.pig4cloud.pig.admin.api.dto.UserInfo; import com.pig4cloud.pig.admin.api.feign.RemoteUserService; import com.pig4cloud.pig.common.core.constant.CacheConstants; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.core.util.R; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; @@ -56,7 +55,7 @@ public class PigUserDetailsServiceImpl implements PigUserDetailsService { return (PigUser) cache.get(username).get(); } - R result = remoteUserService.info(username, SecurityConstants.FROM_IN); + R result = remoteUserService.info(username); UserDetails userDetails = getUserDetails(result); if (cache != null) { cache.put(username, userDetails); diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteClientDetailsService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteClientDetailsService.java index af15361f4801c61a56169477519b47b003c1319a..e130bd89602d9b059229dc8b8af6f3ed4d2a1432 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteClientDetailsService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteClientDetailsService.java @@ -26,7 +26,6 @@ import com.pig4cloud.pig.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestHeader; import java.util.List; @@ -40,19 +39,16 @@ public interface RemoteClientDetailsService { /** * 通过clientId 查询客户端信息 * @param clientId 用户名 - * @param from 调用标志 * @return R */ - @GetMapping("/client/getClientDetailsById/{clientId}") - R getClientDetailsById(@PathVariable("clientId") String clientId, - @RequestHeader(SecurityConstants.FROM) String from); + @GetMapping(value = "/client/getClientDetailsById/{clientId}", headers = SecurityConstants.HEADER_FROM_IN) + R getClientDetailsById(@PathVariable("clientId") String clientId); /** * 查询全部客户端 - * @param from 调用标识 * @return R */ - @GetMapping("/client/list") - R> listClientDetails(@RequestHeader(SecurityConstants.FROM) String from); + @GetMapping(value = "/client/list", headers = SecurityConstants.HEADER_FROM_IN) + R> listClientDetails(); } diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDeptService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDeptService.java index 2dee548b61ee2eb9e7a46d007d814926ac8127c7..197b3015cd2dc2ddd232c9c278a5d5e080d4b81c 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDeptService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteDeptService.java @@ -22,7 +22,6 @@ import com.pig4cloud.pig.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestHeader; import java.util.List; @@ -36,8 +35,7 @@ public interface RemoteDeptService { * 查收子级id列表 * @return 返回子级id列表 */ - @GetMapping("/dept/child-id/{deptId}") - R> listChildDeptId(@PathVariable("deptId") Long deptId, - @RequestHeader(SecurityConstants.FROM) String from); + @GetMapping(value = "/dept/child-id/{deptId}", headers = SecurityConstants.HEADER_FROM_IN) + R> listChildDeptId(@PathVariable("deptId") Long deptId); } diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java index 117b050b01f78f4b966db91f5c90ba0329492555..f4fd260db35defe5c991906d7a792a7f5c945098 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteLogService.java @@ -23,7 +23,6 @@ import com.pig4cloud.pig.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; /** * @author lengleng @@ -35,10 +34,9 @@ public interface RemoteLogService { /** * 保存日志 * @param sysLog 日志实体 - * @param from 内部调用标志 * @return succes、false */ - @PostMapping("/log") - R saveLog(@RequestBody SysLog sysLog, @RequestHeader(SecurityConstants.FROM) String from); + @PostMapping(value = "/log", headers = SecurityConstants.HEADER_FROM_IN) + R saveLog(@RequestBody SysLog sysLog); } diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteParamService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteParamService.java index 712f45bc30ebe549524313fb4f4663a31d9704dc..deb214bc36dd3a022810b7bb81068d8cbb8bca4f 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteParamService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteParamService.java @@ -6,7 +6,6 @@ import com.pig4cloud.pig.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestHeader; /** * @author lengleng @@ -20,10 +19,9 @@ public interface RemoteParamService { /** * 通过key 查询参数配置 * @param key key - * @param from 声明成内部调用，避免MQ 等无法调用 * @return */ - @GetMapping("/param/publicValue/{key}") - R getByKey(@PathVariable("key") String key, @RequestHeader(SecurityConstants.FROM) String from); + @GetMapping(value = "/param/publicValue/{key}", headers = SecurityConstants.HEADER_FROM_IN) + R getByKey(@PathVariable("key") String key); } diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java index efcda6b4df5681d81a4c7d4f358c9cb9a74d7fe5..7976fef905895219e913805788634f821ee0e96c 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteTokenService.java @@ -34,19 +34,17 @@ public interface RemoteTokenService { /** * 分页查询token 信息 * @param params 分页参数 - * @param from 内部调用标志 * @return page */ - @PostMapping("/token/page") - R getTokenPage(@RequestBody Map params, @RequestHeader(SecurityConstants.FROM) String from); + @PostMapping(value = "/token/page", headers = SecurityConstants.HEADER_FROM_IN) + R getTokenPage(@RequestBody Map params); /** * 删除token * @param token token - * @param from 调用标志 * @return */ - @DeleteMapping("/token/{token}") - R removeToken(@PathVariable("token") String token, @RequestHeader(SecurityConstants.FROM) String from); + @DeleteMapping(value = "/token/{token}", headers = SecurityConstants.HEADER_FROM_IN) + R removeToken(@PathVariable("token") String token); } diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java index bfb354af0d25f720cb0845db7378346428060520..3dfc3f084a87acd1cade03a430478bba1a69956b 100755 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/feign/RemoteUserService.java @@ -23,7 +23,6 @@ import com.pig4cloud.pig.common.core.util.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -39,11 +38,10 @@ public interface RemoteUserService { /** * 通过用户名查询用户、角色信息 * @param username 用户名 - * @param from 调用标志 * @return R */ - @GetMapping("/user/info/{username}") - R info(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM) String from); + @GetMapping(value = "/user/info/{username}", headers = SecurityConstants.HEADER_FROM_IN) + R info(@PathVariable("username") String username); /** * 通过手机号码查询用户、角色信息 @@ -51,8 +49,8 @@ public interface RemoteUserService { * @param from 调用标志 * @return R */ - @GetMapping("/app/info/{phone}") - R infoByMobile(@PathVariable("phone") String phone, @RequestHeader(SecurityConstants.FROM) String from); + @GetMapping(value = "/app/info/{phone}", headers = SecurityConstants.HEADER_FROM_IN) + R infoByMobile(@PathVariable("phone") String phone); /** * 根据部门id，查询对应的用户 id 集合 @@ -60,8 +58,7 @@ public interface RemoteUserService { * @param from 调用标志 * @return 用户 id 集合 */ - @GetMapping("/user/ids") - R> listUserIdByDeptIds(@RequestParam("deptIds") Set deptIds, - @RequestHeader(SecurityConstants.FROM) String from); + @GetMapping(value = "/user/ids", headers = SecurityConstants.HEADER_FROM_IN) + R> listUserIdByDeptIds(@RequestParam("deptIds") Set deptIds); } diff --git a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/ParamResolver.java b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/ParamResolver.java index 51d0337b8bab0310b9f607d07623f6088496807a..9b4e43a0619020a7172aaf911d26a9203b5473da 100644 --- a/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/ParamResolver.java +++ b/pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/util/ParamResolver.java @@ -3,7 +3,6 @@ package com.pig4cloud.pig.admin.api.util; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.pig4cloud.pig.admin.api.feign.RemoteParamService; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.core.util.SpringContextHolder; import lombok.experimental.UtilityClass; @@ -44,7 +43,7 @@ public class ParamResolver { RemoteParamService remoteParamService = SpringContextHolder.getBean(RemoteParamService.class); - String result = remoteParamService.getByKey(key, SecurityConstants.FROM_IN).getData(); + String result = remoteParamService.getByKey(key).getData(); if (StrUtil.isNotBlank(result)) { return Convert.convert(clazz, result); diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java index 140a1f3c30b134d7fee515b6d606b4d8d28977bc..3d53f91f1490f356b8806989cf194a12b2304877 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java @@ -17,7 +17,6 @@ package com.pig4cloud.pig.admin.controller; import com.pig4cloud.pig.admin.api.feign.RemoteTokenService; -import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.core.util.R; import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; @@ -48,7 +47,7 @@ public class TokenController { */ @GetMapping("/page") public R token(@RequestParam Map params) { - return remoteTokenService.getTokenPage(params, SecurityConstants.FROM_IN); + return remoteTokenService.getTokenPage(params); } /** @@ -59,7 +58,7 @@ public class TokenController { @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_token_del')") public R delete(@PathVariable String id) { - return remoteTokenService.removeToken(id, SecurityConstants.FROM_IN); + return remoteTokenService.removeToken(id); } }