From 1648230072ea5e993b422deda0b9f01aabd3c168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=89=E6=9D=A5=E6=8A=80=E6=9C=AF?= <1490493387@qq.com> Date: Sun, 28 Nov 2021 10:08:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=9C=89?= =?UTF-8?q?=E6=9D=A5=E5=AE=9E=E9=AA=8C=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 41 ++++++++++------- pom.xml | 1 + .../admin/api/OAuthClientFeignClient.java | 7 +-- .../com/youlai/admin/api/UserFeignClient.java | 3 +- .../api/fallback/UserFeignFallbackClient.java | 1 - .../com/youlai/admin/dto/OAuth2ClientDTO.java | 45 +++++++++++++++++++ .../{pojo => }/dto/RolePermissionDTO.java | 2 +- .../admin/{pojo => }/dto/UserAuthDTO.java | 2 +- .../{ => cache}/InitPermissionRolesCache.java | 3 +- .../handler/DefaultBlockExceptionHandler.java | 2 +- .../handler/UserBlockHandler.java | 2 +- .../listener/CanalListener.java | 2 +- .../controller/OauthClientController.java | 18 ++++++-- .../admin/controller/RoleController.java | 2 +- .../admin/controller/UserController.java | 2 +- .../admin/controller/v2/MenuV2Controller.java | 35 +++++++++++++++ .../youlai/admin/mapper/SysUserMapper.java | 2 +- .../com/youlai/admin/pojo/entity/SysDept.java | 0 .../com/youlai/admin/pojo/entity/SysDict.java | 0 .../youlai/admin/pojo/entity/SysDictItem.java | 0 .../com/youlai/admin/pojo/entity/SysMenu.java | 0 .../admin/pojo/entity/SysOauthClient.java | 2 +- .../admin/pojo/entity/SysPermission.java | 0 .../com/youlai/admin/pojo/entity/SysRole.java | 0 .../youlai/admin/pojo/entity/SysRoleMenu.java | 0 .../admin/pojo/entity/SysRolePermission.java | 0 .../com/youlai/admin/pojo/entity/SysUser.java | 0 .../youlai/admin/pojo/entity/SysUserRole.java | 0 .../com/youlai/admin/pojo/vo/CascadeVO.java | 0 .../java/com/youlai/admin/pojo/vo/DeptVO.java | 0 .../java/com/youlai/admin/pojo/vo/MenuVO.java | 0 .../com/youlai/admin/pojo/vo/NextRouteVO.java | 41 +++++++++++++++++ .../youlai/admin/pojo/vo/PermissionVO.java | 0 .../com/youlai/admin/pojo/vo/RouteVO.java | 0 .../com/youlai/admin/pojo/vo/SelectVO.java | 0 .../youlai/admin/pojo/vo/TreeSelectVO.java | 0 .../java/com/youlai/admin/pojo/vo/UserVO.java | 0 .../service/ISysRolePermissionService.java | 2 +- .../youlai/admin/service/ISysUserService.java | 2 +- .../impl/SysRolePermissionServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 2 +- .../main/resources/mapper/SysUserMapper.xml | 2 +- .../ClientDetailsServiceImpl.java | 6 +-- .../core/userdetails/user/SysUserDetails.java | 2 +- .../user/SysUserDetailsServiceImpl.java | 2 +- youlai-laboratory/README.md | 9 ++++ youlai-laboratory/pom.xml | 20 +++++++++ .../base/config/SwaggerConfiguration.java | 8 ++++ .../com/youlai/laboratory/canal/Test.java | 8 ++++ .../youlai/laboratory/elasticsearch/Test.java | 8 ++++ .../java/com/youlai/laboratory/jvm/Test.java | 8 ++++ .../com/youlai/laboratory/mybatis/Test.java | 8 ++++ .../com/youlai/laboratory/mysql/Test.java | 8 ++++ .../com/youlai/laboratory/netty/Test.java | 8 ++++ .../com/youlai/laboratory/rabbitmq/Test.java | 8 ++++ .../com/youlai/laboratory/redis/Test.java | 8 ++++ .../com/youlai/laboratory/seata/Test.java | 8 ++++ .../com/youlai/laboratory/sentinel/Test.java | 8 ++++ .../com/youlai/laboratory/spring/Test.java | 8 ++++ 59 files changed, 313 insertions(+), 45 deletions(-) create mode 100644 youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/OAuth2ClientDTO.java rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{pojo => }/dto/RolePermissionDTO.java (87%) rename youlai-admin/admin-api/src/main/java/com/youlai/admin/{pojo => }/dto/UserAuthDTO.java (94%) rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/{ => cache}/InitPermissionRolesCache.java (90%) rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/{ => component}/handler/DefaultBlockExceptionHandler.java (97%) rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/{ => component}/handler/UserBlockHandler.java (94%) rename youlai-admin/admin-boot/src/main/java/com/youlai/admin/{ => component}/listener/CanalListener.java (97%) create mode 100644 youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/v2/MenuV2Controller.java rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysDept.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysDict.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysDictItem.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysOauthClient.java (98%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysPermission.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysRole.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysRoleMenu.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysRolePermission.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysUser.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/entity/SysUserRole.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/vo/CascadeVO.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/vo/DeptVO.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java (100%) create mode 100644 youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/NextRouteVO.java rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/vo/PermissionVO.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/vo/RouteVO.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/vo/SelectVO.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/vo/TreeSelectVO.java (100%) rename youlai-admin/{admin-api => admin-boot}/src/main/java/com/youlai/admin/pojo/vo/UserVO.java (100%) create mode 100644 youlai-laboratory/README.md create mode 100644 youlai-laboratory/pom.xml create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/base/config/SwaggerConfiguration.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/canal/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/elasticsearch/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/jvm/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/mybatis/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/mysql/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/netty/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/rabbitmq/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/redis/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/seata/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/sentinel/Test.java create mode 100644 youlai-laboratory/src/main/java/com/youlai/laboratory/spring/Test.java diff --git a/README.md b/README.md index 9c620754..3da22ecf 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ | ![](https://gitee.com/haoxr/image/raw/master/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210621005349.jpg) | ![](https://gitee.com/haoxr/image/raw/master/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210621005356.jpg) | ![](https://gitee.com/haoxr/image/raw/master/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210621005344.jpg) | -### 项目架构流程图 +### 项目架构图 ![](https://gitee.com/haoxr/image/raw/master/default/OAuth2.jpg) @@ -76,14 +76,15 @@ | 项目名称 | 源码地址 |项目名称 | 源码地址 | | ---------- | ------------------------------------------------------------ |---------- | ------------------------------------------------------------ | -| 微服务后台 | [youlai-mall](https://gitee.com/youlaitech/youlai-mall) | 微信小程序 | [youlai-mall-weapp](https://gitee.com/youlaitech/youlai-mall-weapp) | +| 微服务接口 | [youlai-mall](https://gitee.com/youlaitech/youlai-mall) | 微信小程序 | [youlai-mall-weapp](https://gitee.com/youlaitech/youlai-mall-weapp) | | 管理前端 | [youlai-mall-admin](https://gitee.com/youlaitech/youlai-mall-admin) |APP应用 | [youlai-mall-app](https://gitee.com/youlaitech/youlai-mall-app) | ### 项目结构 ``` lua youlai-mall -├── docs +├── doc + ├── diagram -- 框架图解 ├── nacos -- Nacos配置文件 ├── sql -- mysql数据库脚本 ├── mall-oms @@ -104,7 +105,8 @@ youlai-mall ├── admin-boot -- 系统管理服务 ├── youlai-auth -- 认证中心【OAuth2认证服务器】 ├── youlai-common -- 公共模块 -└── youlai-gateway -- Gateway网关【OAuth2资源服务器】 +├── youlai-gateway -- Gateway网关【OAuth2资源服务器】 +└── youlai-loboratory -- 实验室 ``` ## 项目启动 @@ -131,7 +133,7 @@ youlai-mall - 导入配置 - 浏览器输入 http://localhost:8848/nacos ,输入用户名/密码:nacos/nacos 进入控制台，在 配置管理→配置列表 页面选择项目里的文件`docs/nacos/DEFAULT_GROUP.zip`导入。 + 浏览器输入 http://localhost:8848/nacos ,输入用户名/密码:nacos/nacos 进入控制台，在 配置管理→配置列表 页面选择项目里的文件`doc/nacos/DEFAULT_GROUP.zip`导入。 ![](https://gitee.com/haoxr/image/raw/master/20210623012937.png) @@ -145,28 +147,35 @@ youlai-mall #### 二. 本地环境启动 1. **安装环境** - 安装`MySQL`、`Redis`中间件，MySQL的版本5.x和8.x都可以 + 安装`MySQL`、`Redis`中间件，MySQL的版本5.x和8.x皆可。 -2. **创建数据库** - - 新建平台数据库，进入项目`docs/sql`，根据MySQL版本选择，先执行`database.sql`创建数据库，再执行`youlai.sql`、`mall_*.sql`完成表的创建和数据的导入。 + +2. **数据库创建** + - 新建平台数据库，进入`doc/sql`目录，根据MySQL版本选择，先执行`database.sql`创建数据库，再执行`youlai.sql`、`mall_*.sql`完成表的创建和数据的导入。 - 创建`Nacos`数据库，执行脚本`middleware/nacos/conf/nacos-mysql.sql`完成`Nacos`数据库的初始化。 -3. **Nacos 启动和配置** +3. **Nacos 配置和启动** - - 修改`Nacos`数据源，进入配置`middleware/nacos/conf/application.properties`将数据源修改为您自己的环境； - - - 启动`Nacos`, IDEA下方工具栏点击Terminal终端命令行，执行`cd middleware/nacos/bin`命令切换到`Nacos`的启动脚本文件夹下，然后执行`startup -m standalone`命令启动`Nacos`服务； + - 修改`Nacos`数据源： 进入`middleware/nacos/conf/application.properties`将数据源修改为您自己的环境； + ![image-20211128094228864](https://gitee.com/haoxr/image/raw/master/default/image-20211128094228864.png) + - 启动`Nacos`： IDEA下方工具栏点击Terminal终端命令行，执行`cd middleware/nacos/bin`命令切换到`Nacos`的启动脚本文件夹下，然后执行`startup -m standalone`命令启动`Nacos`服务； - - 浏览器输入 http://localhost:8848/nacos ,输入用户名/密码:nacos/nacos 进入控制台，在 配置管理→配置列表 页面选择项目里的文件`docs/nacos/DEFAULT_GROUP.zip`导入。 + - 导入配置： 浏览器输入 http://localhost:8848/nacos ,输入用户名/密码:nacos/nacos 进入控制台，在 配置管理→配置列表 页面选择项目里的文件`docs/nacos/DEFAULT_GROUP.zip`导入。 ![](https://gitee.com/haoxr/image/raw/master/20210623012937.png) - - 导入`Nacos`配置，在启动`Nacos`服务进入控制台导入`docs/nacos/DEFAULT_GROUP.zip`配置，进入共享配置`youlai-common.yaml`修改MySQL、Redis、RabbitMQ等中间件的信息，默认是`有来技术团队`云服务器环境。 + - 修改配置： 进入共享配置`youlai-common.yaml`修改MySQL、Redis、RabbitMQ等中间件的信息，默认是`有来技术团队`云服务器环境。 ![](https://gitee.com/haoxr/image/raw/master/default/20210829124804.png) -4. `Nacos`启动完成和MySQL、Redis连接信息修改完成后，分别启动`youlai-gateway`、`youlai-auth`、 `youlai-admin`模块， - 启动类分别对应的是GatewayApplication、AuthApplication以及`youlai-admin`的子模块`admin-boot`的AdminApplication类，至此完成整个项目基础服务的启动； +4. **微服务启动** + + 分别启动`youlai-gateway`、`youlai-auth`、 `youlai-admin`模块， + 启动类分别对应的是GatewayApplication、AuthApplication以及`youlai-admin`的子模块`admin-boot`的AdminApplication类，至此完成整个项目基础服务的启动。 + +5. **启动验证** + + 访问接口文档： http://localhost:9999/doc.html ### 管理前端启动 diff --git a/pom.xml b/pom.xml index 4d49e287..8d732383 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ mall-ums mall-pms mall-oms + youlai-laboratory diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/OAuthClientFeignClient.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/OAuthClientFeignClient.java index b12ae8ff..51ec9d0f 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/OAuthClientFeignClient.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/OAuthClientFeignClient.java @@ -1,14 +1,15 @@ package com.youlai.admin.api; -import com.youlai.admin.pojo.entity.SysOauthClient; +import com.youlai.admin.dto.OAuth2ClientDTO; import com.youlai.common.result.Result; 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.RequestParam; @FeignClient(value = "youlai-admin", contextId = "oauth-client") public interface OAuthClientFeignClient { - @GetMapping("/api/v1/oauth-clients/{clientId}") - Result getOAuthClientById(@PathVariable String clientId); + @GetMapping("/api/v1/oauth-clients/getOAuth2ClientById") + Result getOAuth2ClientById(@RequestParam String clientId); } diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignClient.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignClient.java index edadde87..89adc541 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignClient.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/UserFeignClient.java @@ -1,8 +1,7 @@ package com.youlai.admin.api; import com.youlai.admin.api.fallback.UserFeignFallbackClient; -import com.youlai.admin.pojo.dto.UserAuthDTO; -import com.youlai.admin.pojo.entity.SysUser; +import com.youlai.admin.dto.UserAuthDTO; import com.youlai.common.result.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/fallback/UserFeignFallbackClient.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/fallback/UserFeignFallbackClient.java index 238275bf..3181acc2 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/fallback/UserFeignFallbackClient.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/api/fallback/UserFeignFallbackClient.java @@ -1,7 +1,6 @@ package com.youlai.admin.api.fallback; import com.youlai.admin.api.UserFeignClient; -import com.youlai.admin.pojo.entity.SysUser; import com.youlai.common.result.Result; import com.youlai.common.result.ResultCode; import lombok.extern.slf4j.Slf4j; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/OAuth2ClientDTO.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/OAuth2ClientDTO.java new file mode 100644 index 00000000..58a30d1c --- /dev/null +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/OAuth2ClientDTO.java @@ -0,0 +1,45 @@ +package com.youlai.admin.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 客户端实体 + */ +@Data +public class OAuth2ClientDTO { + + @ApiModelProperty(value = "客户端ID") + private String clientId; + + @ApiModelProperty(value = "客户端密钥") + private String clientSecret; + + @ApiModelProperty(value = "资源id列表") + private String resourceIds; + + @ApiModelProperty(value = "域") + private String scope; + + @ApiModelProperty(value = "授权方式") + private String authorizedGrantTypes; + + @ApiModelProperty("回调地址") + private String webServerRedirectUri; + + @ApiModelProperty(value = "权限列表") + private String authorities; + + @ApiModelProperty(value = "认证令牌时效") + private Integer accessTokenValidity; + + @ApiModelProperty(value = "刷新令牌时效") + private Integer refreshTokenValidity; + + @ApiModelProperty(value = "扩展信息") + private String additionalInformation; + + @ApiModelProperty(value = "是否自动放行") + private String autoapprove; + +} diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/dto/RolePermissionDTO.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/RolePermissionDTO.java similarity index 87% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/dto/RolePermissionDTO.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/RolePermissionDTO.java index 03d80fd7..17c7cee3 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/dto/RolePermissionDTO.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/RolePermissionDTO.java @@ -1,4 +1,4 @@ -package com.youlai.admin.pojo.dto; +package com.youlai.admin.dto; import lombok.Data; import lombok.experimental.Accessors; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/dto/UserAuthDTO.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/UserAuthDTO.java similarity index 94% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/dto/UserAuthDTO.java rename to youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/UserAuthDTO.java index 8942c038..a1283c79 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/dto/UserAuthDTO.java +++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/dto/UserAuthDTO.java @@ -1,4 +1,4 @@ -package com.youlai.admin.pojo.dto; +package com.youlai.admin.dto; import lombok.Data; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/InitPermissionRolesCache.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/cache/InitPermissionRolesCache.java similarity index 90% rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/InitPermissionRolesCache.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/cache/InitPermissionRolesCache.java index ee9163f6..3f578641 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/InitPermissionRolesCache.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/cache/InitPermissionRolesCache.java @@ -1,4 +1,4 @@ -package com.youlai.admin.component; +package com.youlai.admin.component.cache; import com.youlai.admin.service.ISysPermissionService; import lombok.AllArgsConstructor; @@ -7,6 +7,7 @@ import org.springframework.stereotype.Component; /** * 容器启动完成时加载角色权限规则至Redis缓存 + * @author haoxr */ @Component @AllArgsConstructor diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/DefaultBlockExceptionHandler.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/handler/DefaultBlockExceptionHandler.java similarity index 97% rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/DefaultBlockExceptionHandler.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/handler/DefaultBlockExceptionHandler.java index 494b2401..06712ece 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/DefaultBlockExceptionHandler.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/handler/DefaultBlockExceptionHandler.java @@ -1,4 +1,4 @@ -package com.youlai.admin.handler; +package com.youlai.admin.component.handler; import com.alibaba.csp.sentinel.adapter.spring.webmvc.callback.BlockExceptionHandler; import com.alibaba.csp.sentinel.slots.block.BlockException; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/UserBlockHandler.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/handler/UserBlockHandler.java similarity index 94% rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/UserBlockHandler.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/handler/UserBlockHandler.java index 8fe514d7..6bae3392 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/handler/UserBlockHandler.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/handler/UserBlockHandler.java @@ -1,4 +1,4 @@ -package com.youlai.admin.handler; +package com.youlai.admin.component.handler; import com.alibaba.csp.sentinel.slots.block.BlockException; import com.youlai.admin.pojo.vo.UserVO; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/CanalListener.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/listener/CanalListener.java similarity index 97% rename from youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/CanalListener.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/listener/CanalListener.java index f3a3fd11..1b5ba93f 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/listener/CanalListener.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/component/listener/CanalListener.java @@ -1,4 +1,4 @@ -package com.youlai.admin.listener; +package com.youlai.admin.component.listener; import cn.hutool.json.JSONUtil; import com.youlai.admin.service.ISysMenuService; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/OauthClientController.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/OauthClientController.java index 011b0721..5c43cd00 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/OauthClientController.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/OauthClientController.java @@ -1,9 +1,12 @@ package com.youlai.admin.controller; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.youlai.admin.dto.OAuth2ClientDTO; import com.youlai.admin.pojo.entity.SysOauthClient; import com.youlai.admin.service.ISysOauthClientService; import com.youlai.common.result.Result; @@ -33,9 +36,7 @@ public class OauthClientController { @ApiImplicitParam(name = "clientId", value = "客户端ID", paramType = "query", dataType = "String") }) @GetMapping - public Result list(Integer page, - Integer limit, - String clientId) { + public Result list(Integer page, Integer limit, String clientId) { IPage result = iSysOauthClientService.page( new Page<>(page, limit), new LambdaQueryWrapper() @@ -79,4 +80,15 @@ public class OauthClientController { boolean status = iSysOauthClientService.removeByIds(Arrays.asList(ids.split(","))); return Result.judge(status); } + + + @ApiOperation(hidden = true, value = "获取 OAuth2 客户端认证信息", notes = "Feign 调用") + @GetMapping("/getOAuth2ClientById") + public Result getOAuth2ClientById(@RequestParam String clientId) { + SysOauthClient client = iSysOauthClientService.getById(clientId); + Assert.isNull(client, "OAuth2 客户端不存在"); + OAuth2ClientDTO oAuth2ClientDTO = new OAuth2ClientDTO(); + BeanUtil.copyProperties(client, oAuth2ClientDTO); + return Result.success(oAuth2ClientDTO); + } } diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/RoleController.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/RoleController.java index 6c920741..d23c0665 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/RoleController.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/RoleController.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.admin.pojo.dto.RolePermissionDTO; +import com.youlai.admin.dto.RolePermissionDTO; import com.youlai.admin.pojo.entity.SysRole; import com.youlai.admin.service.ISysPermissionService; import com.youlai.admin.service.ISysRoleMenuService; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/UserController.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/UserController.java index 8c5b5a07..90da5535 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/UserController.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/UserController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.admin.pojo.dto.UserAuthDTO; +import com.youlai.admin.dto.UserAuthDTO; import com.youlai.admin.pojo.entity.SysUser; import com.youlai.admin.pojo.entity.SysUserRole; import com.youlai.admin.pojo.vo.UserVO; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/v2/MenuV2Controller.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/v2/MenuV2Controller.java new file mode 100644 index 00000000..c4e97f2b --- /dev/null +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/controller/v2/MenuV2Controller.java @@ -0,0 +1,35 @@ +package com.youlai.admin.controller.v2; + +import com.youlai.admin.pojo.vo.RouteVO; +import com.youlai.admin.service.ISysMenuService; +import com.youlai.common.result.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 菜单控制器V2版本适配Vue3的vue-next-router + * + * @author xianrui + * @date 2020/11/28 + */ +@Api(tags = "菜单接口(V2)",value = "适配Vue3的vue-next-router") +@RestController +@RequestMapping("/api/v2/menus") +@RequiredArgsConstructor +public class MenuV2Controller { + + private final ISysMenuService menuService; + + @ApiOperation(value = "菜单路由（Route）层级列表") + @GetMapping("/route") + public Result getRouteList() { + List routeList = menuService.listRoute(); + return Result.success(routeList); + } +} diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/mapper/SysUserMapper.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/mapper/SysUserMapper.java index 7946efcc..82cc989c 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/mapper/SysUserMapper.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/mapper/SysUserMapper.java @@ -2,7 +2,7 @@ package com.youlai.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.admin.pojo.dto.UserAuthDTO; +import com.youlai.admin.dto.UserAuthDTO; import com.youlai.admin.pojo.entity.SysUser; import org.apache.ibatis.annotations.Mapper; diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDept.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysDept.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDept.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysDept.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDict.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysDict.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDict.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysDict.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDictItem.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysDictItem.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysDictItem.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysDictItem.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysOauthClient.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysOauthClient.java similarity index 98% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysOauthClient.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysOauthClient.java index bbe5decb..4d1678d5 100644 --- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysOauthClient.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysOauthClient.java @@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** - * 客户端信息 + * 客户端实体 */ @Data public class SysOauthClient { diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysPermission.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysPermission.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysPermission.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysPermission.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRole.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysRole.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRole.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysRole.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRoleMenu.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysRoleMenu.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRoleMenu.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysRoleMenu.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRolePermission.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysRolePermission.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysRolePermission.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysRolePermission.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUser.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysUser.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUser.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysUser.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUserRole.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysUserRole.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysUserRole.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/entity/SysUserRole.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/CascadeVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/CascadeVO.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/CascadeVO.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/CascadeVO.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/DeptVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/DeptVO.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/DeptVO.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/DeptVO.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/NextRouteVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/NextRouteVO.java new file mode 100644 index 00000000..16335491 --- /dev/null +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/NextRouteVO.java @@ -0,0 +1,41 @@ +package com.youlai.admin.pojo.vo; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author haoxr + * @date 2020-11-06 + */ +@Data +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class NextRouteVO { + + private String path; + + private String component; + + private String redirect; + + private boolean alwaysShow; + + private String name; + + private Boolean hidden; + + private Meta meta; + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class Meta { + private String title; + private String icon; + private List roles; + } + private List children; +} diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/PermissionVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/PermissionVO.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/PermissionVO.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/PermissionVO.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/RouteVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/RouteVO.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/RouteVO.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/RouteVO.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/SelectVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/SelectVO.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/SelectVO.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/SelectVO.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/TreeSelectVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/TreeSelectVO.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/TreeSelectVO.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/TreeSelectVO.java diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/UserVO.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/UserVO.java similarity index 100% rename from youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/UserVO.java rename to youlai-admin/admin-boot/src/main/java/com/youlai/admin/pojo/vo/UserVO.java diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/ISysRolePermissionService.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/ISysRolePermissionService.java index 379a912c..3ecbc81a 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/ISysRolePermissionService.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/ISysRolePermissionService.java @@ -2,7 +2,7 @@ package com.youlai.admin.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.admin.pojo.dto.RolePermissionDTO; +import com.youlai.admin.dto.RolePermissionDTO; import com.youlai.admin.pojo.entity.SysRolePermission; import java.util.List; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/ISysUserService.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/ISysUserService.java index 4be8c7b4..93177775 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/ISysUserService.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/ISysUserService.java @@ -4,7 +4,7 @@ package com.youlai.admin.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.youlai.admin.pojo.dto.UserAuthDTO; +import com.youlai.admin.dto.UserAuthDTO; import com.youlai.admin.pojo.entity.SysUser; public interface ISysUserService extends IService { diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRolePermissionServiceImpl.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRolePermissionServiceImpl.java index 309a5a97..b16c476c 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRolePermissionServiceImpl.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysRolePermissionServiceImpl.java @@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.admin.mapper.SysRolePermissionMapper; -import com.youlai.admin.pojo.dto.RolePermissionDTO; +import com.youlai.admin.dto.RolePermissionDTO; import com.youlai.admin.pojo.entity.SysRolePermission; import com.youlai.admin.service.ISysRolePermissionService; import org.springframework.stereotype.Service; diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java index 819831d3..84e0b8ca 100644 --- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java +++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysUserServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.youlai.admin.pojo.dto.UserAuthDTO; +import com.youlai.admin.dto.UserAuthDTO; import com.youlai.admin.pojo.entity.SysUser; import com.youlai.admin.mapper.SysUserMapper; import com.youlai.admin.pojo.entity.SysUserRole; diff --git a/youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml b/youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml index 296f5aa0..ffe920e8 100644 --- a/youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml +++ b/youlai-admin/admin-boot/src/main/resources/mapper/SysUserMapper.xml @@ -32,7 +32,7 @@ deleted - + diff --git a/youlai-auth/src/main/java/com/youlai/auth/security/core/clientdetails/ClientDetailsServiceImpl.java b/youlai-auth/src/main/java/com/youlai/auth/security/core/clientdetails/ClientDetailsServiceImpl.java index c8466c7a..3cc9e51c 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/security/core/clientdetails/ClientDetailsServiceImpl.java +++ b/youlai-auth/src/main/java/com/youlai/auth/security/core/clientdetails/ClientDetailsServiceImpl.java @@ -1,7 +1,7 @@ package com.youlai.auth.security.core.clientdetails; import com.youlai.admin.api.OAuthClientFeignClient; -import com.youlai.admin.pojo.entity.SysOauthClient; +import com.youlai.admin.dto.OAuth2ClientDTO; import com.youlai.auth.common.enums.PasswordEncoderTypeEnum; import com.youlai.common.result.Result; import lombok.RequiredArgsConstructor; @@ -26,9 +26,9 @@ public class ClientDetailsServiceImpl implements ClientDetailsService { @Cacheable(cacheNames = "auth", key = "'oauth-client:'+#clientId") public ClientDetails loadClientByClientId(String clientId) { try { - Result result = oAuthClientFeignClient.getOAuthClientById(clientId); + Result result = oAuthClientFeignClient.getOAuth2ClientById(clientId); if (Result.success().getCode().equals(result.getCode())) { - SysOauthClient client = result.getData(); + OAuth2ClientDTO client = result.getData(); BaseClientDetails clientDetails = new BaseClientDetails( client.getClientId(), client.getResourceIds(), diff --git a/youlai-auth/src/main/java/com/youlai/auth/security/core/userdetails/user/SysUserDetails.java b/youlai-auth/src/main/java/com/youlai/auth/security/core/userdetails/user/SysUserDetails.java index af25fbd3..8f6de7ed 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/security/core/userdetails/user/SysUserDetails.java +++ b/youlai-auth/src/main/java/com/youlai/auth/security/core/userdetails/user/SysUserDetails.java @@ -1,7 +1,7 @@ package com.youlai.auth.security.core.userdetails.user; import cn.hutool.core.collection.CollectionUtil; -import com.youlai.admin.pojo.dto.UserAuthDTO; +import com.youlai.admin.dto.UserAuthDTO; import com.youlai.auth.common.enums.PasswordEncoderTypeEnum; import com.youlai.common.constant.GlobalConstants; import lombok.Data; diff --git a/youlai-auth/src/main/java/com/youlai/auth/security/core/userdetails/user/SysUserDetailsServiceImpl.java b/youlai-auth/src/main/java/com/youlai/auth/security/core/userdetails/user/SysUserDetailsServiceImpl.java index 161b89d7..a275ba4d 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/security/core/userdetails/user/SysUserDetailsServiceImpl.java +++ b/youlai-auth/src/main/java/com/youlai/auth/security/core/userdetails/user/SysUserDetailsServiceImpl.java @@ -1,7 +1,7 @@ package com.youlai.auth.security.core.userdetails.user; import com.youlai.admin.api.UserFeignClient; -import com.youlai.admin.pojo.dto.UserAuthDTO; +import com.youlai.admin.dto.UserAuthDTO; import com.youlai.common.result.Result; import com.youlai.common.result.ResultCode; import lombok.RequiredArgsConstructor; diff --git a/youlai-laboratory/README.md b/youlai-laboratory/README.md new file mode 100644 index 00000000..c9352e82 --- /dev/null +++ b/youlai-laboratory/README.md @@ -0,0 +1,9 @@ +### 项目结构 + +``` lua +youlai-loboratory +├── base 基础设置 + ├── config -- 公共配置（Swagger配置） +├── seata 分布式事务 +└── end +``` \ No newline at end of file diff --git a/youlai-laboratory/pom.xml b/youlai-laboratory/pom.xml new file mode 100644 index 00000000..299b813b --- /dev/null +++ b/youlai-laboratory/pom.xml @@ -0,0 +1,20 @@ + + + + youlai-mall + com.youlai + 2.0.0 + + 4.0.0 + + youlai-laboratory + 有来实验室 + + + 8 + 8 + + + \ No newline at end of file diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/base/config/SwaggerConfiguration.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/base/config/SwaggerConfiguration.java new file mode 100644 index 00000000..99bfd656 --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/base/config/SwaggerConfiguration.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.base.config; + +/** + * @author haoxr + * @date 2021/11/28 10:05 + */ +public class SwaggerConfiguration { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/canal/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/canal/Test.java new file mode 100644 index 00000000..2a413432 --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/canal/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.canal; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/elasticsearch/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/elasticsearch/Test.java new file mode 100644 index 00000000..0ee928e9 --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/elasticsearch/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.elasticsearch; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/jvm/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/jvm/Test.java new file mode 100644 index 00000000..203dc6fd --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/jvm/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.jvm; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/mybatis/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/mybatis/Test.java new file mode 100644 index 00000000..63ddc68e --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/mybatis/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.mybatis; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/mysql/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/mysql/Test.java new file mode 100644 index 00000000..f9b22660 --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/mysql/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.mysql; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/netty/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/netty/Test.java new file mode 100644 index 00000000..e404eb1b --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/netty/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.netty; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/rabbitmq/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/rabbitmq/Test.java new file mode 100644 index 00000000..d6c1a622 --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/rabbitmq/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.rabbitmq; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/redis/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/redis/Test.java new file mode 100644 index 00000000..2dce42c5 --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/redis/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.redis; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/seata/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/seata/Test.java new file mode 100644 index 00000000..e1441228 --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/seata/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.seata; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/sentinel/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/sentinel/Test.java new file mode 100644 index 00000000..10b96432 --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/sentinel/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.sentinel; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} diff --git a/youlai-laboratory/src/main/java/com/youlai/laboratory/spring/Test.java b/youlai-laboratory/src/main/java/com/youlai/laboratory/spring/Test.java new file mode 100644 index 00000000..580ad0db --- /dev/null +++ b/youlai-laboratory/src/main/java/com/youlai/laboratory/spring/Test.java @@ -0,0 +1,8 @@ +package com.youlai.laboratory.spring; + +/** + * @author haoxr + * @date 2021/11/28 10:06 + */ +public class Test { +} -- GitLab