From c7e10bc2498f15af3a67e5424a2f40d20592ac67 Mon Sep 17 00:00:00 2001 From: qiufeng Date: Mon, 19 Dec 2022 21:23:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=B8=85=E7=A9=BA=E9=80=A0=E6=88=90=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=97=A0=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oauth/api/entity/UserInfo.java | 2 +- .../oauth/api/entity/UserRole.java | 2 +- .../api/fallback/RemoteUserFallback.java | 20 +++++++-- .../oauth/api/remote/RemoteUserService.java | 32 ++++++++++++-- .../{ => common}/oauth/api/vo/UserInfoVo.java | 6 +-- .../main/resources/META-INF/spring.factories | 2 +- .../oauth/cache/UserPermissionCache.java | 13 +++++- .../common/oauth/cache/UserRoleCache.java | 15 ++++++- .../mfish/common/oauth/common/OauthUtils.java | 6 +-- .../oauth/cache/temp/UserRoleTempCache.java | 2 +- .../oauth/controller/SsoUserController.java | 42 +++++++++++++++---- .../oauth/controller/WeChatController.java | 2 +- .../cn/com/mfish/oauth/entity/SsoUser.java | 2 +- .../com/mfish/oauth/mapper/SsoUserMapper.java | 4 +- .../mfish/oauth/mapper/xml/SsoUserMapper.xml | 4 +- .../mfish/oauth/service/OAuth2Service.java | 4 +- .../mfish/oauth/service/SsoUserService.java | 4 +- .../oauth/service/impl/OAuth2ServiceImpl.java | 4 +- .../service/impl/SsoUserServiceImpl.java | 4 +- .../mfish/test/controller/TestController.java | 4 +- .../cn/com/mfish/test/entity/TestParam.java | 2 +- 21 files changed, 133 insertions(+), 43 deletions(-) rename mf-api/mf-oauth-api/src/main/java/cn/com/mfish/{ => common}/oauth/api/entity/UserInfo.java (97%) rename mf-api/mf-oauth-api/src/main/java/cn/com/mfish/{ => common}/oauth/api/entity/UserRole.java (92%) rename mf-api/mf-oauth-api/src/main/java/cn/com/mfish/{ => common}/oauth/api/fallback/RemoteUserFallback.java (57%) rename mf-api/mf-oauth-api/src/main/java/cn/com/mfish/{ => common}/oauth/api/remote/RemoteUserService.java (53%) rename mf-api/mf-oauth-api/src/main/java/cn/com/mfish/{ => common}/oauth/api/vo/UserInfoVo.java (83%) diff --git a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/entity/UserInfo.java b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserInfo.java similarity index 97% rename from mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/entity/UserInfo.java rename to mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserInfo.java index d4810b67..3bc661b9 100644 --- a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/entity/UserInfo.java +++ b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserInfo.java @@ -1,4 +1,4 @@ -package cn.com.mfish.oauth.api.entity; +package cn.com.mfish.common.oauth.api.entity; import cn.com.mfish.common.core.entity.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/entity/UserRole.java b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserRole.java similarity index 92% rename from mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/entity/UserRole.java rename to mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserRole.java index 0e1186ac..fc52114f 100644 --- a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/entity/UserRole.java +++ b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/entity/UserRole.java @@ -1,4 +1,4 @@ -package cn.com.mfish.oauth.api.entity; +package cn.com.mfish.common.oauth.api.entity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/fallback/RemoteUserFallback.java b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/fallback/RemoteUserFallback.java similarity index 57% rename from mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/fallback/RemoteUserFallback.java rename to mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/fallback/RemoteUserFallback.java index 4d2d889d..69f34a4b 100644 --- a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/fallback/RemoteUserFallback.java +++ b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/fallback/RemoteUserFallback.java @@ -1,12 +1,16 @@ -package cn.com.mfish.oauth.api.fallback; +package cn.com.mfish.common.oauth.api.fallback; import cn.com.mfish.common.core.web.Result; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.remote.RemoteUserService; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.remote.RemoteUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; +import java.util.List; +import java.util.Set; + /** * @author ：qiufeng * @description：Feign用户接口降级 @@ -29,6 +33,16 @@ public class RemoteUserFallback implements FallbackFactory { return Result.fail("错误:通过ID获取用户失败" + cause.getMessage()); } + @Override + public Result> getRoles(String origin, String userId, String clientId) { + return Result.fail("错误:获取角色信息失败" + cause.getMessage()); + } + + @Override + public Result> getPermissions(String origin, String userId, String clientId) { + return Result.fail("错误:获取按钮权限失败" + cause.getMessage()); + } + }; } } diff --git a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/remote/RemoteUserService.java b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/remote/RemoteUserService.java similarity index 53% rename from mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/remote/RemoteUserService.java rename to mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/remote/RemoteUserService.java index 91f801b6..aaf241e4 100644 --- a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/remote/RemoteUserService.java +++ b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/remote/RemoteUserService.java @@ -1,15 +1,20 @@ -package cn.com.mfish.oauth.api.remote; +package cn.com.mfish.common.oauth.api.remote; import cn.com.mfish.common.core.constants.Constants; import cn.com.mfish.common.core.constants.CredentialConstants; import cn.com.mfish.common.core.constants.ServiceConstants; import cn.com.mfish.common.core.web.Result; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.fallback.RemoteUserFallback; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.fallback.RemoteUserFallback; 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; +import java.util.Set; /** * @author ：qiufeng @@ -31,4 +36,25 @@ public interface RemoteUserService { @GetMapping("/user/{id}") Result getUserById(@RequestHeader(CredentialConstants.REQ_ORIGIN) String origin, @PathVariable("id") String id); + /** + * 获取用户角色 + * + * @param origin + * @param userId + * @param clientId + * @return + */ + @GetMapping("/user/roles") + Result> getRoles(@RequestHeader(CredentialConstants.REQ_ORIGIN) String origin, @RequestParam("userId") String userId, @RequestParam("clientId") String clientId); + + /** + * 获取用户权限 + * + * @param origin + * @param userId + * @param clientId + * @return + */ + @GetMapping("/user/permissions") + Result> getPermissions(@RequestHeader(CredentialConstants.REQ_ORIGIN) String origin, @RequestParam("userId") String userId, @RequestParam("clientId") String clientId); } \ No newline at end of file diff --git a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/vo/UserInfoVo.java b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/vo/UserInfoVo.java similarity index 83% rename from mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/vo/UserInfoVo.java rename to mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/vo/UserInfoVo.java index 61c9a222..cc927f04 100644 --- a/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/oauth/api/vo/UserInfoVo.java +++ b/mf-api/mf-oauth-api/src/main/java/cn/com/mfish/common/oauth/api/vo/UserInfoVo.java @@ -1,7 +1,7 @@ -package cn.com.mfish.oauth.api.vo; +package cn.com.mfish.common.oauth.api.vo; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserRole; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/mf-api/mf-oauth-api/src/main/resources/META-INF/spring.factories b/mf-api/mf-oauth-api/src/main/resources/META-INF/spring.factories index 3e85ccd8..1322e560 100644 --- a/mf-api/mf-oauth-api/src/main/resources/META-INF/spring.factories +++ b/mf-api/mf-oauth-api/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.com.mfish.oauth.api.fallback.RemoteUserFallback + cn.com.mfish.common.oauth.api.fallback.RemoteUserFallback diff --git a/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/cache/UserPermissionCache.java b/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/cache/UserPermissionCache.java index 27018429..03854e92 100644 --- a/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/cache/UserPermissionCache.java +++ b/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/cache/UserPermissionCache.java @@ -1,9 +1,13 @@ package cn.com.mfish.common.oauth.cache; +import cn.com.mfish.common.core.constants.CredentialConstants; +import cn.com.mfish.common.core.web.Result; +import cn.com.mfish.common.oauth.api.remote.RemoteUserService; import cn.com.mfish.common.redis.common.RedisPrefix; import cn.com.mfish.common.redis.temp.BaseTempCache; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.Set; /** @@ -14,6 +18,9 @@ import java.util.Set; @Component("userPermissionCache") public class UserPermissionCache extends BaseTempCache> { + @Resource + RemoteUserService remoteUserService; + /** * key [0] userId [1] clientId * @@ -33,6 +40,10 @@ public class UserPermissionCache extends BaseTempCache> { */ @Override protected Set getFromDB(String... key) { - return null; + Result> result = remoteUserService.getPermissions(CredentialConstants.INNER, key[0], key[1]); + if (result == null || !result.isSuccess()) { + return null; + } + return result.getData(); } } \ No newline at end of file diff --git a/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/cache/UserRoleCache.java b/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/cache/UserRoleCache.java index aba07893..2c66740d 100644 --- a/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/cache/UserRoleCache.java +++ b/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/cache/UserRoleCache.java @@ -1,10 +1,14 @@ package cn.com.mfish.common.oauth.cache; +import cn.com.mfish.common.core.constants.CredentialConstants; +import cn.com.mfish.common.core.web.Result; +import cn.com.mfish.common.oauth.api.remote.RemoteUserService; import cn.com.mfish.common.redis.common.RedisPrefix; import cn.com.mfish.common.redis.temp.BaseTempCache; -import cn.com.mfish.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.entity.UserRole; import org.springframework.stereotype.Component; +import javax.annotation.Resource; import java.util.List; /** @@ -15,6 +19,9 @@ import java.util.List; @Component("userRoleCache") public class UserRoleCache extends BaseTempCache> { + @Resource + RemoteUserService remoteUserService; + /** * key [0] userId [1] clientId * @@ -34,6 +41,10 @@ public class UserRoleCache extends BaseTempCache> { */ @Override protected List getFromDB(String... key) { - return null; + Result> result = remoteUserService.getRoles(CredentialConstants.INNER, key[0], key[1]); + if (result == null || !result.isSuccess()) { + return null; + } + return result.getData(); } } \ No newline at end of file diff --git a/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/common/OauthUtils.java b/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/common/OauthUtils.java index fef9be55..5f6a31e2 100644 --- a/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/common/OauthUtils.java +++ b/mf-common/mf-common-oauth/src/main/java/cn/com/mfish/common/oauth/common/OauthUtils.java @@ -6,7 +6,7 @@ import cn.com.mfish.common.oauth.annotation.RequiresPermissions; import cn.com.mfish.common.oauth.annotation.RequiresRoles; import cn.com.mfish.common.oauth.cache.UserPermissionCache; import cn.com.mfish.common.oauth.cache.UserRoleCache; -import cn.com.mfish.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.entity.UserRole; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -40,7 +40,7 @@ public class OauthUtils { */ public static boolean checkRoles(RequiresRoles requiresRoles) { UserRoleCache userRoleCache = SpringBeanFactory.getBean("userRoleCache"); - List list = userRoleCache.getFromCache(AuthInfoUtils.getCurrentUserId(), AuthInfoUtils.getCurrentClientId()); + List list = userRoleCache.getFromCacheAndDB(AuthInfoUtils.getCurrentUserId(), AuthInfoUtils.getCurrentClientId()); Set set = list.stream().map(UserRole::getRoleCode).collect(Collectors.toSet()); //如果用户为超户，直接返回 if (null != set && set.contains(SerConstant.SUPER_ROLE)) { @@ -57,7 +57,7 @@ public class OauthUtils { */ public static boolean checkPermission(RequiresPermissions requiresPermissions) { UserPermissionCache userPermissionCache = SpringBeanFactory.getBean("userPermissionCache"); - Set set = userPermissionCache.getFromCache(AuthInfoUtils.getCurrentUserId(), AuthInfoUtils.getCurrentClientId()); + Set set = userPermissionCache.getFromCacheAndDB(AuthInfoUtils.getCurrentUserId(), AuthInfoUtils.getCurrentClientId()); //如果用户拥有所有权限直接返回true if (null != set && set.contains(SerConstant.ALL_PERMISSION)) { return true; diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/cache/temp/UserRoleTempCache.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/cache/temp/UserRoleTempCache.java index 55bb0b9c..9d0ea14d 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/cache/temp/UserRoleTempCache.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/cache/temp/UserRoleTempCache.java @@ -1,7 +1,7 @@ package cn.com.mfish.oauth.cache.temp; import cn.com.mfish.common.oauth.cache.UserRoleCache; -import cn.com.mfish.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.entity.UserRole; import cn.com.mfish.oauth.mapper.SsoUserMapper; import org.springframework.stereotype.Component; diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/SsoUserController.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/SsoUserController.java index 81c7874d..7103e84f 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/SsoUserController.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/SsoUserController.java @@ -3,23 +3,23 @@ package cn.com.mfish.oauth.controller; import cn.com.mfish.common.core.enums.DeviceType; import cn.com.mfish.common.core.enums.OperateType; import cn.com.mfish.common.core.utils.AuthInfoUtils; +import cn.com.mfish.common.core.utils.StringUtils; import cn.com.mfish.common.core.web.Result; import cn.com.mfish.common.log.annotation.Log; import cn.com.mfish.common.oauth.annotation.RequiresPermissions; import cn.com.mfish.common.web.annotation.InnerUser; import cn.com.mfish.common.web.page.PageResult; import cn.com.mfish.common.web.page.ReqPage; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.vo.UserInfoVo; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.vo.UserInfoVo; import cn.com.mfish.oauth.cache.redis.UserTokenCache; import cn.com.mfish.oauth.entity.SsoUser; import cn.com.mfish.oauth.req.ReqSsoUser; import cn.com.mfish.oauth.service.OAuth2Service; import cn.com.mfish.oauth.service.SsoUserService; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; +import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.SecurityUtils; import org.apache.shiro.subject.Subject; @@ -58,8 +58,36 @@ public class SsoUserController { @ApiOperation("获取用户权限") @GetMapping("/permissions") @Log(title = "获取用户权限", operateType = OperateType.QUERY) - public Result> getPermissions() { - return Result.ok(ssoUserService.getUserPermissions(AuthInfoUtils.getCurrentUserId(), AuthInfoUtils.getCurrentClientId())); + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "用户ID"), + @ApiImplicitParam(name = "clientId", value = "客户端ID") + }) + public Result> getPermissions(String userId, String clientId) { + if (StringUtils.isEmpty(userId)) { + userId = AuthInfoUtils.getCurrentUserId(); + } + if (StringUtils.isEmpty(clientId)) { + clientId = AuthInfoUtils.getCurrentClientId(); + } + return Result.ok(ssoUserService.getUserPermissions(userId, clientId)); + } + + @InnerUser + @ApiOperation("获取用户角色") + @GetMapping("/roles") + @Log(title = "获取用户权限", operateType = OperateType.QUERY) + @ApiImplicitParams({ + @ApiImplicitParam(name = "userId", value = "用户ID"), + @ApiImplicitParam(name = "clientId", value = "客户端ID") + }) + public Result> getRoles(String userId, String clientId) { + if (StringUtils.isEmpty(userId)) { + userId = AuthInfoUtils.getCurrentUserId(); + } + if (StringUtils.isEmpty(clientId)) { + clientId = AuthInfoUtils.getCurrentClientId(); + } + return Result.ok(ssoUserService.getUserRoles(userId, clientId)); } @InnerUser diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/WeChatController.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/WeChatController.java index 913bcadd..767dcfb8 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/WeChatController.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/controller/WeChatController.java @@ -9,7 +9,7 @@ import cn.com.mfish.common.core.utils.Utils; import cn.com.mfish.common.core.web.Result; import cn.com.mfish.common.log.annotation.Log; import cn.com.mfish.common.oauth.common.SerConstant; -import cn.com.mfish.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserInfo; import cn.com.mfish.oauth.entity.AccessToken; import cn.com.mfish.oauth.entity.WeChatToken; import cn.com.mfish.oauth.service.LoginService; diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/entity/SsoUser.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/entity/SsoUser.java index 95c988cd..2ab61073 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/entity/SsoUser.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/entity/SsoUser.java @@ -1,6 +1,6 @@ package cn.com.mfish.oauth.entity; -import cn.com.mfish.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoUserMapper.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoUserMapper.java index c2c7344a..81ba788c 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoUserMapper.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/SsoUserMapper.java @@ -1,7 +1,7 @@ package cn.com.mfish.oauth.mapper; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserRole; import cn.com.mfish.oauth.entity.SsoUser; import cn.com.mfish.oauth.req.ReqSsoUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoUserMapper.xml b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoUserMapper.xml index 5b0c955e..f68ae107 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoUserMapper.xml +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/mapper/xml/SsoUserMapper.xml @@ -28,7 +28,7 @@ - select r.id, r.role_name, r.role_code from sso_user u inner join sso_user_role ur on ur.user_id = u.id @@ -66,7 +66,7 @@ - + diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/service/OAuth2Service.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/service/OAuth2Service.java index 2c8190c4..af2dbcd1 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/service/OAuth2Service.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/service/OAuth2Service.java @@ -1,7 +1,7 @@ package cn.com.mfish.oauth.service; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.vo.UserInfoVo; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.vo.UserInfoVo; import cn.com.mfish.common.oauth.entity.AuthorizationCode; import cn.com.mfish.common.oauth.entity.RedisAccessToken; import org.apache.oltu.oauth2.as.request.OAuthAuthzRequest; diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/service/SsoUserService.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/service/SsoUserService.java index 0041e4e7..234b8158 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/service/SsoUserService.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/service/SsoUserService.java @@ -1,8 +1,8 @@ package cn.com.mfish.oauth.service; import cn.com.mfish.common.core.web.Result; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserRole; import cn.com.mfish.oauth.entity.SsoUser; import cn.com.mfish.oauth.req.ReqSsoUser; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/service/impl/OAuth2ServiceImpl.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/service/impl/OAuth2ServiceImpl.java index ef205f5c..e37c35d4 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/service/impl/OAuth2ServiceImpl.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/service/impl/OAuth2ServiceImpl.java @@ -2,8 +2,8 @@ package cn.com.mfish.oauth.service.impl; import cn.com.mfish.common.core.exception.OAuthValidateException; import cn.com.mfish.common.core.utils.AuthInfoUtils; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.vo.UserInfoVo; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.vo.UserInfoVo; import cn.com.mfish.common.redis.common.RedisPrefix; import cn.com.mfish.common.oauth.entity.AuthorizationCode; import cn.com.mfish.common.oauth.entity.RedisAccessToken; diff --git a/mf-oauth/src/main/java/cn/com/mfish/oauth/service/impl/SsoUserServiceImpl.java b/mf-oauth/src/main/java/cn/com/mfish/oauth/service/impl/SsoUserServiceImpl.java index 06b68a21..70e1faf3 100644 --- a/mf-oauth/src/main/java/cn/com/mfish/oauth/service/impl/SsoUserServiceImpl.java +++ b/mf-oauth/src/main/java/cn/com/mfish/oauth/service/impl/SsoUserServiceImpl.java @@ -4,8 +4,8 @@ import cn.com.mfish.common.core.exception.MyRuntimeException; import cn.com.mfish.common.core.utils.AuthInfoUtils; import cn.com.mfish.common.core.utils.Utils; import cn.com.mfish.common.core.web.Result; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.entity.UserRole; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserRole; import cn.com.mfish.oauth.cache.temp.Account2IdTempCache; import cn.com.mfish.oauth.cache.temp.UserPermissionTempCache; import cn.com.mfish.oauth.cache.temp.UserRoleTempCache; diff --git a/mf-test/src/main/java/cn/com/mfish/test/controller/TestController.java b/mf-test/src/main/java/cn/com/mfish/test/controller/TestController.java index 7149157a..2bbd76e4 100644 --- a/mf-test/src/main/java/cn/com/mfish/test/controller/TestController.java +++ b/mf-test/src/main/java/cn/com/mfish/test/controller/TestController.java @@ -7,8 +7,8 @@ import cn.com.mfish.common.core.enums.ReqSource; import cn.com.mfish.common.core.utils.AuthInfoUtils; import cn.com.mfish.common.core.web.Result; import cn.com.mfish.common.log.annotation.Log; -import cn.com.mfish.oauth.api.entity.UserInfo; -import cn.com.mfish.oauth.api.remote.RemoteUserService; +import cn.com.mfish.common.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.remote.RemoteUserService; import cn.com.mfish.test.entity.TestParam; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; diff --git a/mf-test/src/main/java/cn/com/mfish/test/entity/TestParam.java b/mf-test/src/main/java/cn/com/mfish/test/entity/TestParam.java index 8dbf464e..c60d6977 100644 --- a/mf-test/src/main/java/cn/com/mfish/test/entity/TestParam.java +++ b/mf-test/src/main/java/cn/com/mfish/test/entity/TestParam.java @@ -1,6 +1,6 @@ package cn.com.mfish.test.entity; -import cn.com.mfish.oauth.api.entity.UserInfo; +import cn.com.mfish.common.oauth.api.entity.UserInfo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data;