feat: 登录功能修改
This commit is contained in:
parent
9737a326d6
commit
3bd1f2140a
|
@ -3,6 +3,7 @@ package cn.bunny.dao.dto.system.user;
|
|||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Pattern;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Data;
|
||||
|
@ -23,6 +24,7 @@ public class LoginDto {
|
|||
@Schema(name = "password", title = "密码")
|
||||
@NotBlank(message = "密码不能为空")
|
||||
@NotNull(message = "密码不能为空")
|
||||
@Pattern(regexp = "^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)]|[()])+$)(?!^.*[\\u4E00-\\u9FA5].*$)([^(0-9a-zA-Z)]|[()]|[a-z]|[A-Z]|[0-9]){8,18}$", message = "密码格式应为8-18位数字、字母、符号的任意两种组合")
|
||||
private String password;
|
||||
|
||||
@Schema(name = "emailCode", title = "邮箱验证码")
|
||||
|
|
|
@ -89,7 +89,8 @@ public class TokenLoginFilterService extends UsernamePasswordAuthenticationFilte
|
|||
Authentication authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
|
||||
return getAuthenticationManager().authenticate(authenticationToken);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException(e);
|
||||
out(response, Result.error(ResultCodeEnum.ILLEGAL_DATA_REQUEST));
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -218,15 +218,8 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
|
|||
*/
|
||||
@Override
|
||||
public void addMenu(RouterAddDto dto) {
|
||||
// 查找是否添加过路由名称
|
||||
Router router = getOne(Wrappers.<Router>lambdaQuery()
|
||||
.eq(Router::getRouteName, dto.getRouteName())
|
||||
.or()
|
||||
.eq(Router::getPath, dto.getPath()));
|
||||
if (router != null) throw new BunnyException(ResultCodeEnum.DATA_EXIST);
|
||||
|
||||
// 添加路由
|
||||
router = new Router();
|
||||
Router router = new Router();
|
||||
BeanUtils.copyProperties(dto, router);
|
||||
|
||||
save(router);
|
||||
|
@ -239,16 +232,6 @@ public class RouterServiceImpl extends ServiceImpl<RouterMapper, Router> impleme
|
|||
*/
|
||||
@Override
|
||||
public void updateMenu(RouterUpdateDto dto) {
|
||||
LambdaQueryWrapper<Router> wrapper = new LambdaQueryWrapper<>();
|
||||
wrapper.ne(Router::getId, dto.getId())
|
||||
.and(qw -> qw.eq(Router::getRouteName, dto.getRouteName())
|
||||
.or()
|
||||
.eq(Router::getPath, dto.getPath()));
|
||||
List<Router> routerList = list(wrapper);
|
||||
|
||||
// 判断更新数据是否存在
|
||||
if (!routerList.isEmpty()) throw new BunnyException(ResultCodeEnum.DATA_EXIST);
|
||||
|
||||
// 如果设置的不是外部页面
|
||||
if (!dto.getMenuType().equals(2)) dto.setFrameSrc("");
|
||||
|
||||
|
|
Loading…
Reference in New Issue