From 720e8cfadc3fa0da63a1931806b8adf7145585b0 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Sat, 17 Dec 2022 23:49:02 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor:=20token=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=88=B7=E6=96=B0token=E5=92=8Cexpire=E8=BF=87=E6=9C=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/AuthController.java | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/youlai/system/controller/AuthController.java b/src/main/java/com/youlai/system/controller/AuthController.java index d85fa257..7e56505a 100644 --- a/src/main/java/com/youlai/system/controller/AuthController.java +++ b/src/main/java/com/youlai/system/controller/AuthController.java @@ -2,7 +2,8 @@ package com.youlai.system.controller; import com.youlai.system.common.result.Result; -import com.youlai.system.security.jwt.JwtTokenManager; +import com.youlai.system.pojo.dto.TokenResult; +import com.youlai.system.security.JwtTokenManager; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -17,24 +18,27 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/api/v1/auth") @RequiredArgsConstructor public class AuthController { - private final AuthenticationManager authenticationManager; - private final JwtTokenManager jwtTokenManager; - @ApiOperation(value = "登录",notes = "生成token") + @ApiOperation(value = "登录") @PostMapping("/login") - public Result login( + public Result login( @RequestParam String username, @RequestParam String password ) { - UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, - password); + UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken( + username.toLowerCase().trim(), + password + ); Authentication authentication = authenticationManager.authenticate(authenticationToken); SecurityContextHolder.getContext().setAuthentication(authentication); // 生成token - String token = jwtTokenManager.createToken(authentication); - return Result.success("Bearer " + token); + String accessToken = "Bearer " + jwtTokenManager.createToken(authentication); + TokenResult tokenResult = TokenResult.builder() + .accessToken(accessToken) + .build(); + return Result.success(tokenResult); } @ApiOperation(value = "注销") From bbdf915fd1cb54876b38be325b67a61c0d50cbbe Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Sun, 18 Dec 2022 12:45:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=92=8C=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4=E6=9C=AA=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes https://gitee.com/youlaiorg/youlai-boot/issues/I66H7O --- .../youlai/system/pojo/entity/SysDept.java | 15 +++--------- .../system/pojo/entity/SysDictItem.java | 13 +++-------- .../system/pojo/entity/SysDictType.java | 22 +++++------------- .../youlai/system/pojo/entity/SysMenu.java | 2 +- .../youlai/system/pojo/entity/SysRole.java | 20 ++-------------- .../system/pojo/entity/SysRoleMenu.java | 8 +++---- .../youlai/system/pojo/entity/SysUser.java | 23 +++---------------- .../system/pojo/entity/SysUserRole.java | 11 +++++---- 8 files changed, 27 insertions(+), 87 deletions(-) diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDept.java b/src/main/java/com/youlai/system/pojo/entity/SysDept.java index dc84e607..a54e8227 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDept.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysDept.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; + +import com.youlai.system.common.base.BaseEntity; import lombok.Data; /** @@ -14,7 +14,7 @@ import lombok.Data; */ @TableName(value ="sys_dept") @Data -public class SysDept implements Serializable { +public class SysDept extends BaseEntity { /** * 主键 */ @@ -51,15 +51,6 @@ public class SysDept implements Serializable { */ private Integer deleted; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java b/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java index 96f8d346..6e5bb20d 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysDictItem.java @@ -10,7 +10,9 @@ import lombok.Data; /** * 字典数据表 - * @TableName sys_dict_item + * + * @author haoxr + * @date 2022/12/17 */ @TableName(value ="sys_dict_item") @Data @@ -56,15 +58,6 @@ public class SysDictItem implements Serializable { */ private String remark; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; @TableField(exist = false) private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDictType.java b/src/main/java/com/youlai/system/pojo/entity/SysDictType.java index 2ee71d91..5f582183 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysDictType.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysDictType.java @@ -6,15 +6,18 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; + +import com.youlai.system.common.base.BaseEntity; import lombok.Data; /** * 字典类型表 - * @TableName sys_dict_type + * + * @author haoxr + * @date 2022/12/17 */ -@TableName(value ="sys_dict_type") @Data -public class SysDictType implements Serializable { +public class SysDictType extends BaseEntity { /** * 主键 */ @@ -40,17 +43,4 @@ public class SysDictType implements Serializable { * 备注 */ private String remark; - - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/youlai/system/pojo/entity/SysMenu.java b/src/main/java/com/youlai/system/pojo/entity/SysMenu.java index 0b63e9c3..3b49ab86 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysMenu.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysMenu.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.youlai.system.common.base.BaseEntity; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.system.common.enums.MenuTypeEnum; import lombok.Data; /** diff --git a/src/main/java/com/youlai/system/pojo/entity/SysRole.java b/src/main/java/com/youlai/system/pojo/entity/SysRole.java index 6fce20fa..3ba3a56c 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysRole.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysRole.java @@ -1,20 +1,17 @@ package com.youlai.system.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; +import com.youlai.system.common.base.BaseEntity; import lombok.Data; /** * 角色表 - * @TableName sys_role */ @TableName(value ="sys_role") @Data -public class SysRole implements Serializable { +public class SysRole extends BaseEntity { /** * */ @@ -46,19 +43,6 @@ public class SysRole implements Serializable { */ private Integer deleted; - /** - * 更新时间 - */ - private Date createTime; - - /** - * 创建时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; - /** * 数据权限 */ diff --git a/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java b/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java index 991a6178..3b664948 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysRoleMenu.java @@ -1,20 +1,18 @@ package com.youlai.system.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; -import java.io.Serializable; /** * 角色和菜单关联表 - * @TableName sys_role_menu */ -@TableName(value ="sys_role_menu") @Data @AllArgsConstructor -public class SysRoleMenu implements Serializable { +@NoArgsConstructor +public class SysRoleMenu { /** * 角色ID */ diff --git a/src/main/java/com/youlai/system/pojo/entity/SysUser.java b/src/main/java/com/youlai/system/pojo/entity/SysUser.java index cab05f1b..ab801441 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysUser.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysUser.java @@ -1,20 +1,15 @@ package com.youlai.system.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; +import com.youlai.system.common.base.BaseEntity; import lombok.Data; /** - * 用户信息表 - * @TableName sys_user + * 用户表 */ -@TableName(value ="sys_user") @Data -public class SysUser implements Serializable { +public class SysUser extends BaseEntity { /** * */ @@ -71,16 +66,4 @@ public class SysUser implements Serializable { */ private Integer deleted; - /** - * 创建时间 - */ - private Date createTime; - - /** - * 更新时间 - */ - private Date updateTime; - - @TableField(exist = false) - private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java b/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java index b8ebcbeb..ff6def85 100644 --- a/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java +++ b/src/main/java/com/youlai/system/pojo/entity/SysUserRole.java @@ -1,20 +1,21 @@ package com.youlai.system.pojo.entity; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; -import java.io.Serializable; /** * 用户和角色关联表 - * @TableName sys_user_role + * + * @author haoxr + * @date 2022/12/17 */ -@TableName(value ="sys_user_role") @Data @AllArgsConstructor -public class SysUserRole implements Serializable { +@NoArgsConstructor +public class SysUserRole { /** * 用户ID */ From 0e8e56a24a303b803a3d305311b30eaec675d732 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Sun, 18 Dec 2022 12:50:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?refactor:=20=E8=AE=A4=E8=AF=81=E9=89=B4?= =?UTF-8?q?=E6=9D=83=E4=BC=98=E5=8C=96=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youlai/system/pojo/dto/TokenResult.java | 16 +++++++++++++++ .../security/{jwt => }/JwtTokenManager.java | 20 ++----------------- .../filter/JwtAuthenticationFilter.java | 4 ++-- .../security/service/PermissionService.java | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/youlai/system/pojo/dto/TokenResult.java rename src/main/java/com/youlai/system/security/{jwt => }/JwtTokenManager.java (84%) diff --git a/src/main/java/com/youlai/system/pojo/dto/TokenResult.java b/src/main/java/com/youlai/system/pojo/dto/TokenResult.java new file mode 100644 index 00000000..771553cc --- /dev/null +++ b/src/main/java/com/youlai/system/pojo/dto/TokenResult.java @@ -0,0 +1,16 @@ +package com.youlai.system.pojo.dto; + +import lombok.Builder; +import lombok.Data; + +@Data +@Builder +public class TokenResult { + + private String accessToken; + + private String refreshToken; + + private Long expires; + +} diff --git a/src/main/java/com/youlai/system/security/jwt/JwtTokenManager.java b/src/main/java/com/youlai/system/security/JwtTokenManager.java similarity index 84% rename from src/main/java/com/youlai/system/security/jwt/JwtTokenManager.java rename to src/main/java/com/youlai/system/security/JwtTokenManager.java index 963e43e1..f859a255 100644 --- a/src/main/java/com/youlai/system/security/jwt/JwtTokenManager.java +++ b/src/main/java/com/youlai/system/security/JwtTokenManager.java @@ -1,20 +1,4 @@ -/* - * Copyright 1999-2021 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.youlai.system.security.jwt; +package com.youlai.system.security; import cn.hutool.core.convert.Convert; import com.youlai.system.security.userdetails.SysUserDetails; @@ -103,7 +87,7 @@ public class JwtTokenManager { redisTemplate.opsForValue().set("USER_PERMS:" + userDetails.getUserId(), perms); return Jwts.builder().setClaims(claims).setExpiration(validity) - .signWith(SignatureAlgorithm.HS256, Keys.hmacShaKeyFor(this.getSecretKeyBytes())).compact(); + .signWith( Keys.hmacShaKeyFor(this.getSecretKeyBytes()),SignatureAlgorithm.HS256).compact(); } /** diff --git a/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java b/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java index dfdb8687..0d14ad0a 100644 --- a/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/youlai/system/security/filter/JwtAuthenticationFilter.java @@ -2,8 +2,8 @@ package com.youlai.system.security.filter; import cn.hutool.core.util.StrUtil; import com.youlai.system.common.result.ResultCode; -import com.youlai.system.security.jwt.JwtTokenManager; -import com.youlai.system.util.ResponseUtils; +import com.youlai.system.security.JwtTokenManager; +import com.youlai.system.common.util.ResponseUtils; import org.springframework.http.HttpMethod; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/com/youlai/system/security/service/PermissionService.java b/src/main/java/com/youlai/system/security/service/PermissionService.java index 579ba1c3..1e35fc55 100644 --- a/src/main/java/com/youlai/system/security/service/PermissionService.java +++ b/src/main/java/com/youlai/system/security/service/PermissionService.java @@ -2,7 +2,7 @@ package com.youlai.system.security.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.youlai.system.util.SecurityUtils; +import com.youlai.system.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; From e8affeca5174c8cea23e71cb5768ee11fc0bd1e4 Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Sun, 18 Dec 2022 12:50:44 +0800 Subject: [PATCH 4/5] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/{ => common}/enums/DataScopeEnum.java | 2 +- .../system/{ => common}/enums/GenderEnum.java | 2 +- .../system/{ => common}/enums/MenuTypeEnum.java | 2 +- .../system/{ => common}/enums/StatusEnum.java | 2 +- .../common/exception/GlobalExceptionHandler.java | 8 +++----- .../system/{ => common}/util/ResponseUtils.java | 3 +-- .../com/youlai/system/config/SecurityConfig.java | 2 +- .../com/youlai/system/converter/UserConverter.java | 2 +- .../system/handler/MyDataPermissionHandler.java | 14 +++++++------- .../java/com/youlai/system/pojo/bo/RouteBO.java | 2 +- .../com/youlai/system/pojo/vo/menu/MenuVO.java | 2 +- .../security/exception/MyAccessDeniedHandler.java | 2 +- .../exception/MyAuthenticationEntryPoint.java | 2 +- .../system/{ => security}/util/SecurityUtils.java | 2 +- .../system/service/impl/MinioServiceImpl.java | 6 ++++++ .../system/service/impl/SysDeptServiceImpl.java | 2 +- .../system/service/impl/SysMenuServiceImpl.java | 4 ++-- .../system/service/impl/SysRoleServiceImpl.java | 2 +- .../system/service/impl/SysUserServiceImpl.java | 4 ++-- src/main/resources/mapper/SysMenuMapper.xml | 4 ++-- 20 files changed, 36 insertions(+), 33 deletions(-) rename src/main/java/com/youlai/system/{ => common}/enums/DataScopeEnum.java (93%) rename src/main/java/com/youlai/system/{ => common}/enums/GenderEnum.java (91%) rename src/main/java/com/youlai/system/{ => common}/enums/MenuTypeEnum.java (94%) rename src/main/java/com/youlai/system/{ => common}/enums/StatusEnum.java (91%) rename src/main/java/com/youlai/system/{ => common}/util/ResponseUtils.java (95%) rename src/main/java/com/youlai/system/{ => security}/util/SecurityUtils.java (98%) diff --git a/src/main/java/com/youlai/system/enums/DataScopeEnum.java b/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java similarity index 93% rename from src/main/java/com/youlai/system/enums/DataScopeEnum.java rename to src/main/java/com/youlai/system/common/enums/DataScopeEnum.java index d2dd732f..f9e35f1b 100644 --- a/src/main/java/com/youlai/system/enums/DataScopeEnum.java +++ b/src/main/java/com/youlai/system/common/enums/DataScopeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.system.common.enums; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/enums/GenderEnum.java b/src/main/java/com/youlai/system/common/enums/GenderEnum.java similarity index 91% rename from src/main/java/com/youlai/system/enums/GenderEnum.java rename to src/main/java/com/youlai/system/common/enums/GenderEnum.java index d8e5ed04..0b294975 100644 --- a/src/main/java/com/youlai/system/enums/GenderEnum.java +++ b/src/main/java/com/youlai/system/common/enums/GenderEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.system.common.enums; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/enums/MenuTypeEnum.java b/src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java similarity index 94% rename from src/main/java/com/youlai/system/enums/MenuTypeEnum.java rename to src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java index 05fa6b0e..7767ffa0 100644 --- a/src/main/java/com/youlai/system/enums/MenuTypeEnum.java +++ b/src/main/java/com/youlai/system/common/enums/MenuTypeEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.system.common.enums; import com.baomidou.mybatisplus.annotation.EnumValue; import com.youlai.system.common.base.IBaseEnum; diff --git a/src/main/java/com/youlai/system/enums/StatusEnum.java b/src/main/java/com/youlai/system/common/enums/StatusEnum.java similarity index 91% rename from src/main/java/com/youlai/system/enums/StatusEnum.java rename to src/main/java/com/youlai/system/common/enums/StatusEnum.java index d333bbab..6caa2610 100644 --- a/src/main/java/com/youlai/system/enums/StatusEnum.java +++ b/src/main/java/com/youlai/system/common/enums/StatusEnum.java @@ -1,4 +1,4 @@ -package com.youlai.system.enums; +package com.youlai.system.common.enums; import com.youlai.system.common.base.IBaseEnum; import lombok.Getter; diff --git a/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java b/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java index 8dcf5f01..0d87d9c1 100644 --- a/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/youlai/system/common/exception/GlobalExceptionHandler.java @@ -28,12 +28,11 @@ import java.util.stream.Collectors; /** * 全局系统异常处理 + * * 调整异常处理的HTTP状态码，丰富异常处理类型 * - * @author hxrui * @author Gadfly * @date 2020-02-25 13:54 - *

**/ @RestControllerAdvice @Slf4j @@ -166,12 +165,10 @@ public class GlobalExceptionHandler { } - - @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(BusinessException.class) public Result handleBizException(BusinessException e) { - log.error("业务异常，异常原因：{}", e.getMessage(), e); + log.error("biz exception,{}", e.getMessage()); if (e.getResultCode() != null) { return Result.failed(e.getResultCode()); } @@ -181,6 +178,7 @@ public class GlobalExceptionHandler { @ResponseStatus(HttpStatus.BAD_REQUEST) @ExceptionHandler(Exception.class) public Result handleException(Exception e) { + log.error("unknown exception, {}", e.getMessage()); return Result.failed(e.getLocalizedMessage()); } diff --git a/src/main/java/com/youlai/system/util/ResponseUtils.java b/src/main/java/com/youlai/system/common/util/ResponseUtils.java similarity index 95% rename from src/main/java/com/youlai/system/util/ResponseUtils.java rename to src/main/java/com/youlai/system/common/util/ResponseUtils.java index e2ac13df..458f7721 100644 --- a/src/main/java/com/youlai/system/util/ResponseUtils.java +++ b/src/main/java/com/youlai/system/common/util/ResponseUtils.java @@ -1,4 +1,4 @@ -package com.youlai.system.util; +package com.youlai.system.common.util; import cn.hutool.json.JSONUtil; import com.youlai.system.common.result.Result; @@ -8,7 +8,6 @@ import org.springframework.http.MediaType; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.PrintWriter; /** * response 响应工具类 diff --git a/src/main/java/com/youlai/system/config/SecurityConfig.java b/src/main/java/com/youlai/system/config/SecurityConfig.java index 6b02dbdc..7df9e20a 100644 --- a/src/main/java/com/youlai/system/config/SecurityConfig.java +++ b/src/main/java/com/youlai/system/config/SecurityConfig.java @@ -3,7 +3,7 @@ package com.youlai.system.config; import com.youlai.system.security.filter.JwtAuthenticationFilter; import com.youlai.system.security.exception.MyAccessDeniedHandler; import com.youlai.system.security.exception.MyAuthenticationEntryPoint; -import com.youlai.system.security.jwt.JwtTokenManager; +import com.youlai.system.security.JwtTokenManager; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/youlai/system/converter/UserConverter.java b/src/main/java/com/youlai/system/converter/UserConverter.java index 9f610acf..e11be797 100644 --- a/src/main/java/com/youlai/system/converter/UserConverter.java +++ b/src/main/java/com/youlai/system/converter/UserConverter.java @@ -22,7 +22,7 @@ import org.mapstruct.Mappings; public interface UserConverter { @Mappings({ - @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(po.getGender(), com.youlai.system.enums.GenderEnum.class))") + @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(po.getGender(), com.youlai.system.common.enums.GenderEnum.class))") }) UserVO po2Vo(UserBO po); diff --git a/src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java b/src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java index a188397d..ffee4bd0 100644 --- a/src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java +++ b/src/main/java/com/youlai/system/handler/MyDataPermissionHandler.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringPool; import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; import com.youlai.system.common.annotation.DataPermission; import com.youlai.system.common.base.IBaseEnum; -import com.youlai.system.enums.DataScopeEnum; -import com.youlai.system.util.SecurityUtils; +import com.youlai.system.common.enums.DataScopeEnum; +import com.youlai.system.security.util.SecurityUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; @@ -55,7 +55,7 @@ public class MyDataPermissionHandler implements DataPermissionHandler { public static Expression dataScopeFilter(String deptAlias, String deptIdColumnName, String userAlias, String userIdColumnName, Expression where) { - String deptColumnName = StrUtil.isNotBlank(deptAlias) ? (deptAlias +StringPool.DOT+ deptIdColumnName) : deptIdColumnName; + String deptColumnName = StrUtil.isNotBlank(deptAlias) ? (deptAlias + StringPool.DOT + deptIdColumnName) : deptIdColumnName; String userColumnName = StrUtil.isNotBlank(userAlias) ? (userAlias + StringPool.DOT + userIdColumnName) : userIdColumnName; // 获取当前用户的数据权限 @@ -70,11 +70,11 @@ public class MyDataPermissionHandler implements DataPermissionHandler { return where; case DEPT: deptId = SecurityUtils.getDeptId(); - appendSqlStr = deptColumnName + StringPool.EQUALS+ deptId; + appendSqlStr = deptColumnName + StringPool.EQUALS + deptId; break; case SELF: userId = SecurityUtils.getUserId(); - appendSqlStr = userColumnName + StringPool.EQUALS + userId; + appendSqlStr = userColumnName + StringPool.EQUALS + userId; break; // 默认部门及子部门数据权限 default: @@ -87,9 +87,9 @@ public class MyDataPermissionHandler implements DataPermissionHandler { return where; } - Expression appendExpression =CCJSqlParserUtil.parseCondExpression(appendSqlStr); + Expression appendExpression = CCJSqlParserUtil.parseCondExpression(appendSqlStr); - if(where==null){ + if (where == null) { return appendExpression; } diff --git a/src/main/java/com/youlai/system/pojo/bo/RouteBO.java b/src/main/java/com/youlai/system/pojo/bo/RouteBO.java index 725e4b1a..2af90dc2 100644 --- a/src/main/java/com/youlai/system/pojo/bo/RouteBO.java +++ b/src/main/java/com/youlai/system/pojo/bo/RouteBO.java @@ -2,7 +2,7 @@ package com.youlai.system.pojo.bo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.system.common.enums.MenuTypeEnum; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java b/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java index 7738f011..b4f35cb2 100644 --- a/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java +++ b/src/main/java/com/youlai/system/pojo/vo/menu/MenuVO.java @@ -1,7 +1,7 @@ package com.youlai.system.pojo.vo.menu; import com.fasterxml.jackson.annotation.JsonInclude; -import com.youlai.system.enums.MenuTypeEnum; +import com.youlai.system.common.enums.MenuTypeEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java index 34795ea2..f8a9c005 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java +++ b/src/main/java/com/youlai/system/security/exception/MyAccessDeniedHandler.java @@ -1,7 +1,7 @@ package com.youlai.system.security.exception; import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.system.common.util.ResponseUtils; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java index 96ff8f7a..1b03f904 100644 --- a/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java +++ b/src/main/java/com/youlai/system/security/exception/MyAuthenticationEntryPoint.java @@ -1,7 +1,7 @@ package com.youlai.system.security.exception; import com.youlai.system.common.result.ResultCode; -import com.youlai.system.util.ResponseUtils; +import com.youlai.system.common.util.ResponseUtils; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/youlai/system/util/SecurityUtils.java b/src/main/java/com/youlai/system/security/util/SecurityUtils.java similarity index 98% rename from src/main/java/com/youlai/system/util/SecurityUtils.java rename to src/main/java/com/youlai/system/security/util/SecurityUtils.java index d2eb3a9b..84b481bd 100644 --- a/src/main/java/com/youlai/system/util/SecurityUtils.java +++ b/src/main/java/com/youlai/system/security/util/SecurityUtils.java @@ -1,4 +1,4 @@ -package com.youlai.system.util; +package com.youlai.system.security.util; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; diff --git a/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java b/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java index 176b7957..3d3460d7 100644 --- a/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/MinioServiceImpl.java @@ -21,6 +21,12 @@ import java.io.InputStream; import java.time.LocalDateTime; +/** + * MinIO 文件实现类 + * + * @author haoxr + * @date 2022/12/17 + */ @Component @ConfigurationProperties(prefix = "minio") @Slf4j diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java index 4b69ae33..7554cd1e 100644 --- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java @@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.enums.StatusEnum; +import com.youlai.system.common.enums.StatusEnum; import com.youlai.system.pojo.Option; import com.youlai.system.converter.DeptConverter; import com.youlai.system.mapper.SysDeptMapper; diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java index cf49800e..c662b777 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.youlai.system.common.constant.SystemConstants; -import com.youlai.system.enums.MenuTypeEnum; -import com.youlai.system.enums.StatusEnum; +import com.youlai.system.common.enums.MenuTypeEnum; +import com.youlai.system.common.enums.StatusEnum; import com.youlai.system.pojo.Option; import com.youlai.system.converter.MenuConverter; import com.youlai.system.mapper.SysMenuMapper; diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java index b9435e59..cae04593 100644 --- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java @@ -20,7 +20,7 @@ import com.youlai.system.pojo.vo.role.RolePageVO; import com.youlai.system.service.SysRoleMenuService; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; -import com.youlai.system.util.SecurityUtils; +import com.youlai.system.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java index abfc15f4..fe2bee9d 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java @@ -16,7 +16,7 @@ import com.google.common.collect.Lists; import com.youlai.system.common.base.IBaseEnum; import com.youlai.system.common.constant.SystemConstants; import com.youlai.system.converter.UserConverter; -import com.youlai.system.enums.GenderEnum; +import com.youlai.system.common.enums.GenderEnum; import com.youlai.system.listener.UserImportListener; import com.youlai.system.mapper.SysUserMapper; import com.youlai.system.pojo.bo.UserBO; @@ -34,7 +34,7 @@ import com.youlai.system.service.SysMenuService; import com.youlai.system.service.SysRoleService; import com.youlai.system.service.SysUserRoleService; import com.youlai.system.service.SysUserService; -import com.youlai.system.util.SecurityUtils; +import com.youlai.system.security.util.SecurityUtils; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index aaeb3bf3..8ed68d9e 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -40,7 +40,7 @@ LEFT JOIN sys_role_menu t2 ON t1.id = t2.menu_id LEFT JOIN sys_role t3 ON t2.role_id = t3.id WHERE - t1.type != '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}' + t1.type != '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' ORDER BY t1.sort asc @@ -53,7 +53,7 @@ INNER JOIN sys_role_menu t2 INNER JOIN sys_role t3 WHERE - t1.type = '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}' + t1.type = '${@com.youlai.system.common.enums.MenuTypeEnum@BUTTON.getValue()}' AND t1.perm IS NOT NULL From e7a3c2c911a49c2beb27e4c69ce1c95ec2bfbafd Mon Sep 17 00:00:00 2001 From: haoxr <1490493387@qq.com> Date: Sun, 18 Dec 2022 12:53:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7SpringBoot?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=BA2.7.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a5e44e8d..135810a7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,13 +7,13 @@ com.youlai youlai-boot 1.2.0 - SpringBoot单体应用 + 有来权限管理系统(单体) 基于SpringBoot快速构建的后台权限管理系统 org.springframework.boot spring-boot-starter-parent - 2.7.5 + 2.7.6 @@ -30,7 +30,7 @@ 3.0.2 - 2.7.5 + 2.7.6 1.5.2.Final @@ -96,7 +96,6 @@ ${druid.version} - com.github.xiaoymin knife4j-spring-boot-starter