Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
有来技术
youlai-boot
提交
28646fdf
Y
youlai-boot
项目概览
有来技术
/
youlai-boot
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Y
youlai-boot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
28646fdf
编写于
12月 12, 2023
作者:
H
hxr
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 验证码不刷新问题修复,项目包结构调整
上级
e16ffe3a
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
83 addition
and
61 deletion
+83
-61
README.md
README.md
+4
-4
src/main/java/com/youlai/system/base/mybatisplus/annotation/DataPermission.java
...ai/system/base/mybatisplus/annotation/DataPermission.java
+1
-1
src/main/java/com/youlai/system/base/mybatisplus/config/MybatisPlusConfig.java
...lai/system/base/mybatisplus/config/MybatisPlusConfig.java
+3
-4
src/main/java/com/youlai/system/base/mybatisplus/handler/MyDataPermissionHandler.java
...tem/base/mybatisplus/handler/MyDataPermissionHandler.java
+2
-3
src/main/java/com/youlai/system/base/mybatisplus/handler/MyMetaObjectHandler.java
.../system/base/mybatisplus/handler/MyMetaObjectHandler.java
+1
-1
src/main/java/com/youlai/system/base/security/config/SecurityConfig.java
...om/youlai/system/base/security/config/SecurityConfig.java
+5
-5
src/main/java/com/youlai/system/base/security/exception/MyAccessDeniedHandler.java
...system/base/security/exception/MyAccessDeniedHandler.java
+1
-1
src/main/java/com/youlai/system/base/security/exception/MyAuthenticationEntryPoint.java
...m/base/security/exception/MyAuthenticationEntryPoint.java
+1
-1
src/main/java/com/youlai/system/base/security/jwt/JwtTokenFilter.java
...a/com/youlai/system/base/security/jwt/JwtTokenFilter.java
+1
-1
src/main/java/com/youlai/system/base/security/jwt/JwtTokenProvider.java
...com/youlai/system/base/security/jwt/JwtTokenProvider.java
+2
-2
src/main/java/com/youlai/system/base/security/model/SysUserDetails.java
...com/youlai/system/base/security/model/SysUserDetails.java
+1
-1
src/main/java/com/youlai/system/base/security/service/PermissionService.java
...oulai/system/base/security/service/PermissionService.java
+1
-1
src/main/java/com/youlai/system/base/security/service/SysUserDetailsService.java
...i/system/base/security/service/SysUserDetailsService.java
+2
-2
src/main/java/com/youlai/system/common/util/SecurityUtils.java
...ain/java/com/youlai/system/common/util/SecurityUtils.java
+1
-1
src/main/java/com/youlai/system/mapper/SysDeptMapper.java
src/main/java/com/youlai/system/mapper/SysDeptMapper.java
+1
-1
src/main/java/com/youlai/system/mapper/SysUserMapper.java
src/main/java/com/youlai/system/mapper/SysUserMapper.java
+1
-1
src/main/java/com/youlai/system/model/dto/CaptchaResult.java
src/main/java/com/youlai/system/model/dto/CaptchaResult.java
+4
-0
src/main/java/com/youlai/system/plugin/captcha/CaptchaGenerator.java
...va/com/youlai/system/plugin/captcha/CaptchaGenerator.java
+17
-5
src/main/java/com/youlai/system/plugin/captcha/CaptchaModel.java
...n/java/com/youlai/system/plugin/captcha/CaptchaModel.java
+24
-0
src/main/java/com/youlai/system/plugin/dupsubmit/aspect/DuplicateSubmitAspect.java
...system/plugin/dupsubmit/aspect/DuplicateSubmitAspect.java
+1
-1
src/main/java/com/youlai/system/plugin/websocket/StompPrincipal.java
...va/com/youlai/system/plugin/websocket/StompPrincipal.java
+0
-9
src/main/java/com/youlai/system/plugin/websocket/WebsocketChannelInterceptor.java
.../system/plugin/websocket/WebsocketChannelInterceptor.java
+1
-1
src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java
.../java/com/youlai/system/service/impl/AuthServiceImpl.java
+7
-13
src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
...va/com/youlai/system/service/impl/SysRoleServiceImpl.java
+1
-2
未找到文件。
README.md
浏览文件 @
28646fdf
<p
align=
"center"
>
<img
alt=
"有来技术"
src=
"https://img.shields.io/badge/Java -17-brightgreen.svg"
/>
<img
alt=
"有来技术"
src=
"https://img.shields.io/badge/SpringBoot-3.
1.5
-green.svg"
/>
<img
alt=
"有来技术"
src=
"https://img.shields.io/badge/SpringBoot-3.
2.0
-green.svg"
/>
<a
href=
"https://gitee.com/youlaitech/youlai-boot"
target=
"_blank"
>
<img
alt=
"有来技术"
src=
"https://gitee.com/youlaiorg/youlai-boot/badge/star.svg"
/>
</a>
...
...
@@ -45,6 +45,9 @@ youlai-boot
├── mysql5 # MySQL5 脚本
├── mysql8 # MySQL8 脚本
├── src # 源码目录
├── base # 核心模块
├── mybatisplus # Mybatis-Plus 配置和插件
├── security # Spring Security 安全配置和扩展
├── common # 公共模块
├── config # 自动装配配置
├── CorsConfig # 跨域共享配置
...
...
@@ -53,9 +56,6 @@ youlai-boot
├── WebMvcConfig # WebMvc 配置
├── controller # 控制层
├── converter # MapStruct转换器
├── core # 核心模块
├── mybatisplus # Mybatis-Plus 配置和插件
├── security # Spring Security 安全配置和扩展
├── filter # 过滤器
├── RequestLogFilter # 请求日志过滤器
├── VerifyCodeFilter # 验证码过滤器
...
...
src/main/java/com/youlai/system/
cor
e/mybatisplus/annotation/DataPermission.java
→
src/main/java/com/youlai/system/
bas
e/mybatisplus/annotation/DataPermission.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.mybatisplus.annotation
;
package
com.youlai.system.
bas
e.mybatisplus.annotation
;
import
java.lang.annotation.*
;
...
...
src/main/java/com/youlai/system/
cor
e/mybatisplus/config/MybatisPlusConfig.java
→
src/main/java/com/youlai/system/
bas
e/mybatisplus/config/MybatisPlusConfig.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.mybatisplus.config
;
package
com.youlai.system.
bas
e.mybatisplus.config
;
import
com.baomidou.mybatisplus.annotation.DbType
;
import
com.baomidou.mybatisplus.core.config.GlobalConfig
;
import
com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor
;
import
com.baomidou.mybatisplus.extension.plugins.inner.DataPermissionInterceptor
;
import
com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor
;
import
com.youlai.system.core.mybatisplus.handler.MyDataPermissionHandler
;
import
com.youlai.system.core.mybatisplus.handler.MyMetaObjectHandler
;
import
org.springframework.beans.factory.annotation.Value
;
import
com.youlai.system.base.mybatisplus.handler.MyDataPermissionHandler
;
import
com.youlai.system.base.mybatisplus.handler.MyMetaObjectHandler
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.transaction.annotation.EnableTransactionManagement
;
...
...
src/main/java/com/youlai/system/
cor
e/mybatisplus/handler/MyDataPermissionHandler.java
→
src/main/java/com/youlai/system/
bas
e/mybatisplus/handler/MyDataPermissionHandler.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.mybatisplus.handler
;
package
com.youlai.system.
bas
e.mybatisplus.handler
;
import
cn.hutool.core.util.StrUtil
;
import
com.baomidou.mybatisplus.core.toolkit.ObjectUtils
;
import
com.baomidou.mybatisplus.core.toolkit.StringPool
;
import
com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler
;
import
com.youlai.system.
cor
e.mybatisplus.annotation.DataPermission
;
import
com.youlai.system.
bas
e.mybatisplus.annotation.DataPermission
;
import
com.youlai.system.common.base.IBaseEnum
;
import
com.youlai.system.common.enums.DataScopeEnum
;
import
com.youlai.system.common.util.SecurityUtils
;
...
...
src/main/java/com/youlai/system/
cor
e/mybatisplus/handler/MyMetaObjectHandler.java
→
src/main/java/com/youlai/system/
bas
e/mybatisplus/handler/MyMetaObjectHandler.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.mybatisplus.handler
;
package
com.youlai.system.
bas
e.mybatisplus.handler
;
import
com.baomidou.mybatisplus.core.handlers.MetaObjectHandler
;
import
org.apache.ibatis.reflection.MetaObject
;
...
...
src/main/java/com/youlai/system/
cor
e/security/config/SecurityConfig.java
→
src/main/java/com/youlai/system/
bas
e/security/config/SecurityConfig.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.security.config
;
package
com.youlai.system.
bas
e.security.config
;
import
com.youlai.system.common.constant.SecurityConstants
;
import
com.youlai.system.
cor
e.security.exception.MyAccessDeniedHandler
;
import
com.youlai.system.
cor
e.security.exception.MyAuthenticationEntryPoint
;
import
com.youlai.system.
cor
e.security.jwt.JwtTokenFilter
;
import
com.youlai.system.
bas
e.security.exception.MyAccessDeniedHandler
;
import
com.youlai.system.
bas
e.security.exception.MyAuthenticationEntryPoint
;
import
com.youlai.system.
bas
e.security.jwt.JwtTokenFilter
;
import
com.youlai.system.filter.VerifyCodeFilter
;
import
com.youlai.system.
cor
e.security.jwt.JwtTokenProvider
;
import
com.youlai.system.
bas
e.security.jwt.JwtTokenProvider
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
src/main/java/com/youlai/system/
cor
e/security/exception/MyAccessDeniedHandler.java
→
src/main/java/com/youlai/system/
bas
e/security/exception/MyAccessDeniedHandler.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.security.exception
;
package
com.youlai.system.
bas
e.security.exception
;
import
com.youlai.system.common.result.ResultCode
;
import
com.youlai.system.common.util.ResponseUtils
;
...
...
src/main/java/com/youlai/system/
cor
e/security/exception/MyAuthenticationEntryPoint.java
→
src/main/java/com/youlai/system/
bas
e/security/exception/MyAuthenticationEntryPoint.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.security.exception
;
package
com.youlai.system.
bas
e.security.exception
;
import
com.youlai.system.common.result.ResultCode
;
import
com.youlai.system.common.util.ResponseUtils
;
...
...
src/main/java/com/youlai/system/
cor
e/security/jwt/JwtTokenFilter.java
→
src/main/java/com/youlai/system/
bas
e/security/jwt/JwtTokenFilter.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.security.jwt
;
package
com.youlai.system.
bas
e.security.jwt
;
import
com.youlai.system.common.result.ResultCode
;
import
com.youlai.system.common.util.ResponseUtils
;
...
...
src/main/java/com/youlai/system/
cor
e/security/jwt/JwtTokenProvider.java
→
src/main/java/com/youlai/system/
bas
e/security/jwt/JwtTokenProvider.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.security.jwt
;
package
com.youlai.system.
bas
e.security.jwt
;
import
cn.hutool.core.convert.Convert
;
import
com.youlai.system.common.constant.JwtClaimConstants
;
import
com.youlai.system.
cor
e.security.model.SysUserDetails
;
import
com.youlai.system.
bas
e.security.model.SysUserDetails
;
import
io.jsonwebtoken.Claims
;
import
io.jsonwebtoken.Jwts
;
import
io.jsonwebtoken.SignatureAlgorithm
;
...
...
src/main/java/com/youlai/system/
cor
e/security/model/SysUserDetails.java
→
src/main/java/com/youlai/system/
bas
e/security/model/SysUserDetails.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.security.model
;
package
com.youlai.system.
bas
e.security.model
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.util.ObjectUtil
;
...
...
src/main/java/com/youlai/system/
cor
e/security/service/PermissionService.java
→
src/main/java/com/youlai/system/
bas
e/security/service/PermissionService.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.security.service
;
package
com.youlai.system.
bas
e.security.service
;
import
cn.hutool.core.collection.CollectionUtil
;
import
cn.hutool.core.util.StrUtil
;
...
...
src/main/java/com/youlai/system/
cor
e/security/service/SysUserDetailsService.java
→
src/main/java/com/youlai/system/
bas
e/security/service/SysUserDetailsService.java
浏览文件 @
28646fdf
package
com.youlai.system.
cor
e.security.service
;
package
com.youlai.system.
bas
e.security.service
;
import
com.youlai.system.
cor
e.security.model.SysUserDetails
;
import
com.youlai.system.
bas
e.security.model.SysUserDetails
;
import
com.youlai.system.model.dto.UserAuthInfo
;
import
com.youlai.system.service.SysUserService
;
import
lombok.RequiredArgsConstructor
;
...
...
src/main/java/com/youlai/system/common/util/SecurityUtils.java
浏览文件 @
28646fdf
...
...
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
import
cn.hutool.core.convert.Convert
;
import
cn.hutool.core.util.StrUtil
;
import
com.youlai.system.common.constant.SystemConstants
;
import
com.youlai.system.
cor
e.security.model.SysUserDetails
;
import
com.youlai.system.
bas
e.security.model.SysUserDetails
;
import
org.springframework.security.core.Authentication
;
import
org.springframework.security.core.GrantedAuthority
;
import
org.springframework.security.core.context.SecurityContextHolder
;
...
...
src/main/java/com/youlai/system/mapper/SysDeptMapper.java
浏览文件 @
28646fdf
...
...
@@ -3,7 +3,7 @@ package com.youlai.system.mapper;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.core.toolkit.Constants
;
import
com.youlai.system.
cor
e.mybatisplus.annotation.DataPermission
;
import
com.youlai.system.
bas
e.mybatisplus.annotation.DataPermission
;
import
com.youlai.system.model.entity.SysDept
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Param
;
...
...
src/main/java/com/youlai/system/mapper/SysUserMapper.java
浏览文件 @
28646fdf
...
...
@@ -2,7 +2,7 @@ package com.youlai.system.mapper;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.youlai.system.
cor
e.mybatisplus.annotation.DataPermission
;
import
com.youlai.system.
bas
e.mybatisplus.annotation.DataPermission
;
import
com.youlai.system.model.bo.UserBO
;
import
com.youlai.system.model.entity.SysUser
;
import
com.youlai.system.model.dto.UserAuthInfo
;
...
...
src/main/java/com/youlai/system/model/dto/CaptchaResult.java
浏览文件 @
28646fdf
package
com.youlai.system.model.dto
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* 验证码响应对象
...
...
@@ -13,6 +15,8 @@ import lombok.Data;
@Schema
(
description
=
"验证码响应对象"
)
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
CaptchaResult
{
@Schema
(
description
=
"验证码缓存key"
)
...
...
src/main/java/com/youlai/system/plugin/captcha/Captcha
Config
.java
→
src/main/java/com/youlai/system/plugin/captcha/Captcha
Generator
.java
浏览文件 @
28646fdf
...
...
@@ -5,6 +5,7 @@ import cn.hutool.captcha.CircleCaptcha;
import
cn.hutool.captcha.generator.CodeGenerator
;
import
cn.hutool.captcha.generator.MathGenerator
;
import
cn.hutool.captcha.generator.RandomGenerator
;
import
com.youlai.system.model.dto.CaptchaResult
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
@@ -16,7 +17,7 @@ import org.springframework.context.annotation.Configuration;
* @since 2023/11/24
*/
@Configuration
public
class
Captcha
Config
{
public
class
Captcha
Generator
{
@Autowired
private
CaptchaProperties
captchaProperties
;
...
...
@@ -27,7 +28,7 @@ public class CaptchaConfig {
* @return CodeGenerator
*/
@Bean
public
CodeGenerator
c
aptcha
Generator
()
{
public
CodeGenerator
c
ode
Generator
()
{
String
codeType
=
captchaProperties
.
getCode
().
getType
();
int
codeLength
=
captchaProperties
.
getCode
().
getLength
();
if
(
"math"
.
equalsIgnoreCase
(
codeType
))
{
...
...
@@ -39,13 +40,24 @@ public class CaptchaConfig {
}
}
/**
* 生成验证码
*
* @return CaptchaModel 验证码
*/
public
CaptchaModel
generate
()
{
AbstractCaptcha
captcha
=
getCaptcha
();
captcha
.
createCode
();
return
new
CaptchaModel
(
captcha
.
getCode
(),
captcha
.
getImageBase64Data
());
}
/**
* 验证码类
*
* @return AbstractCaptcha
*/
@Bean
public
AbstractCaptcha
abstractCaptcha
()
{
public
AbstractCaptcha
getCaptcha
()
{
AbstractCaptcha
captcha
=
null
;
String
type
=
captchaProperties
.
getType
();
...
...
@@ -67,7 +79,7 @@ public class CaptchaConfig {
throw
new
IllegalArgumentException
(
"Invalid captcha type: "
+
type
);
}
captcha
.
setGenerator
(
c
aptcha
Generator
());
captcha
.
setGenerator
(
c
ode
Generator
());
return
captcha
;
}
...
...
src/main/java/com/youlai/system/plugin/captcha/CaptchaModel.java
0 → 100644
浏览文件 @
28646fdf
package
com.youlai.system.plugin.captcha
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
/**
* 验证码对象
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public
class
CaptchaModel
{
/**
* 验证码编码
*/
private
String
code
;
/**
* 验证码图片Base64
*/
private
String
base64
;
}
src/main/java/com/youlai/system/plugin/dupsubmit/aspect/DuplicateSubmitAspect.java
浏览文件 @
28646fdf
...
...
@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
import
com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit
;
import
com.youlai.system.common.result.ResultCode
;
import
com.youlai.system.common.exception.BusinessException
;
import
com.youlai.system.
cor
e.security.jwt.JwtTokenProvider
;
import
com.youlai.system.
bas
e.security.jwt.JwtTokenProvider
;
import
jakarta.servlet.http.HttpServletRequest
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
...
...
src/main/java/com/youlai/system/plugin/websocket/StompPrincipal.java
已删除
100644 → 0
浏览文件 @
e16ffe3a
package
com.youlai.system.plugin.websocket
;
/**
* @author haoxr
* @since 2023/11/7
*/
public
class
StompPrincipal
{
}
src/main/java/com/youlai/system/plugin/websocket/WebsocketChannelInterceptor.java
浏览文件 @
28646fdf
package
com.youlai.system.plugin.websocket
;
import
cn.hutool.core.util.StrUtil
;
import
com.youlai.system.
cor
e.security.jwt.JwtTokenProvider
;
import
com.youlai.system.
bas
e.security.jwt.JwtTokenProvider
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.messaging.Message
;
import
org.springframework.messaging.MessageChannel
;
...
...
src/main/java/com/youlai/system/service/impl/AuthServiceImpl.java
浏览文件 @
28646fdf
package
com.youlai.system.service.impl
;
import
cn.hutool.captcha.AbstractCaptcha
;
import
cn.hutool.captcha.CircleCaptcha
;
import
cn.hutool.captcha.ICaptcha
;
import
cn.hutool.captcha.generator.MathGenerator
;
import
cn.hutool.core.util.IdUtil
;
import
cn.hutool.core.util.StrUtil
;
import
com.youlai.system.common.constant.CacheConstants
;
import
com.youlai.system.
cor
e.security.jwt.JwtTokenProvider
;
import
com.youlai.system.
bas
e.security.jwt.JwtTokenProvider
;
import
com.youlai.system.model.dto.CaptchaResult
;
import
com.youlai.system.model.dto.LoginResult
;
import
com.youlai.system.plugin.captcha.CaptchaGenerator
;
import
com.youlai.system.plugin.captcha.CaptchaModel
;
import
com.youlai.system.plugin.captcha.CaptchaProperties
;
import
com.youlai.system.service.AuthService
;
import
io.jsonwebtoken.Claims
;
import
jakarta.servlet.http.HttpServletRequest
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.redis.core.StringRedisTemplate
;
import
org.springframework.security.authentication.AuthenticationManager
;
import
org.springframework.security.authentication.UsernamePasswordAuthenticationToken
;
...
...
@@ -25,12 +23,9 @@ import org.springframework.stereotype.Service;
import
org.springframework.web.context.request.RequestContextHolder
;
import
org.springframework.web.context.request.ServletRequestAttributes
;
import
java.awt.*
;
import
java.util.Date
;
import
java.util.concurrent.TimeUnit
;
import
static
java
.
awt
.
Font
.
SANS_SERIF
;
/**
* 认证服务实现类
*
...
...
@@ -44,7 +39,7 @@ public class AuthServiceImpl implements AuthService {
private
final
AuthenticationManager
authenticationManager
;
private
final
StringRedisTemplate
redisTemplate
;
private
final
JwtTokenProvider
jwtTokenProvider
;
private
final
AbstractCaptcha
abstractCaptcha
;
private
final
CaptchaGenerator
captchaGenerator
;
private
final
CaptchaProperties
captchaProperties
;
/**
...
...
@@ -94,17 +89,16 @@ public class AuthServiceImpl implements AuthService {
*/
@Override
public
CaptchaResult
getCaptcha
()
{
String
captchaCode
=
abstractCaptcha
.
getCode
();
// 验证码
String
captchaBase64
=
abstractCaptcha
.
getImageBase64Data
();
// 验证码图片Base64
CaptchaModel
captchaModel
=
captchaGenerator
.
generate
();
// 验证码文本缓存至Redis,用于登录校验
String
captchaKey
=
IdUtil
.
fastSimpleUUID
();
redisTemplate
.
opsForValue
().
set
(
CacheConstants
.
CAPTCHA_CODE_PREFIX
+
captchaKey
,
captcha
Code
,
redisTemplate
.
opsForValue
().
set
(
CacheConstants
.
CAPTCHA_CODE_PREFIX
+
captchaKey
,
captcha
Model
.
getCode
()
,
captchaProperties
.
getExpireSeconds
(),
TimeUnit
.
SECONDS
);
return
CaptchaResult
.
builder
()
.
captchaKey
(
captchaKey
)
.
captchaBase64
(
captcha
Base64
)
.
captchaBase64
(
captcha
Model
.
getBase64
()
)
.
build
();
}
...
...
src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
浏览文件 @
28646fdf
...
...
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
com.youlai.system.common.constant.SystemConstants
;
import
com.youlai.system.common.model.Option
;
import
com.youlai.system.converter.RoleConverter
;
import
com.youlai.system.
cor
e.security.service.PermissionService
;
import
com.youlai.system.
bas
e.security.service.PermissionService
;
import
com.youlai.system.mapper.SysRoleMapper
;
import
com.youlai.system.model.entity.SysRole
;
import
com.youlai.system.model.entity.SysRoleMenu
;
...
...
@@ -27,7 +27,6 @@ import org.springframework.stereotype.Service;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.*
;
import
java.util.stream.Collectors
;
/**
* 角色业务实现类
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录