From c82f6f27572f4644a8aa62629d0ec1c0caaa6ab7 Mon Sep 17 00:00:00 2001 From: Bunny <1319900154@qq.com> Date: Sat, 28 Sep 2024 20:34:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E4=BF=AE=E6=94=B9):=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E7=9A=84=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/bunny/common/generator/NewCodeGet.java | 2 +- .../java/cn/bunny/dao/entity/i18n/I18n.java | 23 ----------------- .../cn/bunny/dao/entity/i18n/I18nType.java | 25 ------------------- .../services/controller/I18nController.java | 20 --------------- .../controller/I18nTypeController.java | 20 --------------- .../RouterServiceFactory.java} | 4 +-- .../cn/bunny/services/mapper/I18nMapper.java | 18 ------------- .../bunny/services/mapper/I18nTypeMapper.java | 18 ------------- .../SecurityAuthenticationEntryPoint.java | 4 +-- .../SecurityAuthenticationFailureHandler.java | 3 +-- ...CustomAuthorizationManagerServiceImpl.java | 7 +----- ...java => CustomUserDetailsServiceImpl.java} | 2 +- .../bunny/services/service/I18nService.java | 16 ------------ .../services/service/I18nTypeService.java | 16 ------------ .../service/impl/I18nServiceImpl.java | 20 --------------- .../service/impl/I18nTypeServiceImpl.java | 20 --------------- .../service/impl/RouterServiceImpl.java | 6 ++--- .../src/main/resources/mapper/I18nMapper.xml | 23 ----------------- .../main/resources/mapper/I18nTypeMapper.xml | 23 ----------------- 19 files changed, 10 insertions(+), 260 deletions(-) delete mode 100644 dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java delete mode 100644 dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java delete mode 100644 service/src/main/java/cn/bunny/services/controller/I18nController.java delete mode 100644 service/src/main/java/cn/bunny/services/controller/I18nTypeController.java rename service/src/main/java/cn/bunny/services/{service/process/RouterServiceProcess.java => factory/RouterServiceFactory.java} (96%) delete mode 100644 service/src/main/java/cn/bunny/services/mapper/I18nMapper.java delete mode 100644 service/src/main/java/cn/bunny/services/mapper/I18nTypeMapper.java rename service/src/main/java/cn/bunny/services/security/service/iml/{CustomUserDetailsService.java => CustomUserDetailsServiceImpl.java} (96%) delete mode 100644 service/src/main/java/cn/bunny/services/service/I18nService.java delete mode 100644 service/src/main/java/cn/bunny/services/service/I18nTypeService.java delete mode 100644 service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java delete mode 100644 service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java delete mode 100644 service/src/main/resources/mapper/I18nMapper.xml delete mode 100644 service/src/main/resources/mapper/I18nTypeMapper.xml diff --git a/common/common-generator/src/main/java/cn/bunny/common/generator/NewCodeGet.java b/common/common-generator/src/main/java/cn/bunny/common/generator/NewCodeGet.java index 6d8c419..d2542e3 100644 --- a/common/common-generator/src/main/java/cn/bunny/common/generator/NewCodeGet.java +++ b/common/common-generator/src/main/java/cn/bunny/common/generator/NewCodeGet.java @@ -20,7 +20,7 @@ public class NewCodeGet { public static final String entity = "Bunny"; public static void main(String[] args) { - Generation("sys_router"); + Generation("sys_i18n", "sys_i18n_type"); } /** diff --git a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java b/dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java deleted file mode 100644 index 1471c85..0000000 --- a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18n.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.bunny.dao.entity.i18n; - -import cn.bunny.dao.entity.BaseEntity; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -@Getter -@Setter -@Accessors(chain = true) -@Schema(name = "I18n对象", title = "多语言表", description = "多语言表") -public class I18n extends BaseEntity { - - @Schema(name = "typeId", title = "语言类型id") - private Long typeId; - - @Schema(name = "keyName", title = "多语言key") - private String keyName; - - @Schema(name = "summary", title = "翻译") - private String summary; -} \ No newline at end of file diff --git a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java b/dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java deleted file mode 100644 index 540b78b..0000000 --- a/dao/src/main/java/cn/bunny/dao/entity/i18n/I18nType.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.bunny.dao.entity.i18n; - -import cn.bunny.dao.entity.BaseEntity; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Getter; -import lombok.Setter; -import lombok.experimental.Accessors; - -@Getter -@Setter -@Accessors(chain = true) -@TableName("i18n_type") -@Schema(name = "I18nType", title = "多语言类型表", description = "多语言类型表") -public class I18nType extends BaseEntity { - - @Schema(name = "languageName", title = "语言名称") - private String languageName; - - @Schema(name = "summary", title = "语言名") - private String summary; - - @Schema(name = "isDefault", title = "是否作为默认语言") - private Byte isDefault; -} \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/services/controller/I18nController.java b/service/src/main/java/cn/bunny/services/controller/I18nController.java deleted file mode 100644 index 1793e48..0000000 --- a/service/src/main/java/cn/bunny/services/controller/I18nController.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bunny.services.controller; - -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 多语言表 前端控制器 - *

- * - * @author Bunny - * @since 2024-09-26 - */ -@Tag(name = "多语言", description = "多语言相关接口") -@RestController -@RequestMapping("/i18n") -public class I18nController { - -} diff --git a/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java b/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java deleted file mode 100644 index e4252bb..0000000 --- a/service/src/main/java/cn/bunny/services/controller/I18nTypeController.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bunny.services.controller; - -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 多语言类型表 前端控制器 - *

- * - * @author Bunny - * @since 2024-09-26 - */ -@Tag(name = "多语言类型", description = "多语言类型相关接口") -@RestController -@RequestMapping("/i18nType") -public class I18nTypeController { - -} diff --git a/service/src/main/java/cn/bunny/services/service/process/RouterServiceProcess.java b/service/src/main/java/cn/bunny/services/factory/RouterServiceFactory.java similarity index 96% rename from service/src/main/java/cn/bunny/services/service/process/RouterServiceProcess.java rename to service/src/main/java/cn/bunny/services/factory/RouterServiceFactory.java index f894375..0c1e9fa 100644 --- a/service/src/main/java/cn/bunny/services/service/process/RouterServiceProcess.java +++ b/service/src/main/java/cn/bunny/services/factory/RouterServiceFactory.java @@ -1,4 +1,4 @@ -package cn.bunny.services.service.process; +package cn.bunny.services.factory; import cn.bunny.dao.vo.common.TreeSelectVo; import cn.bunny.dao.vo.router.RouterManageVo; @@ -10,7 +10,7 @@ import java.util.ArrayList; import java.util.List; @Component -public class RouterServiceProcess { +public class RouterServiceFactory { /** * * 递归调用设置子路由 diff --git a/service/src/main/java/cn/bunny/services/mapper/I18nMapper.java b/service/src/main/java/cn/bunny/services/mapper/I18nMapper.java deleted file mode 100644 index dae6df7..0000000 --- a/service/src/main/java/cn/bunny/services/mapper/I18nMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.services.mapper; - -import cn.bunny.dao.entity.i18n.I18n; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 多语言表 Mapper 接口 - *

- * - * @author Bunny - * @since 2024-09-26 - */ -@Mapper -public interface I18nMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/services/mapper/I18nTypeMapper.java b/service/src/main/java/cn/bunny/services/mapper/I18nTypeMapper.java deleted file mode 100644 index 53e40fc..0000000 --- a/service/src/main/java/cn/bunny/services/mapper/I18nTypeMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package cn.bunny.services.mapper; - -import cn.bunny.dao.entity.i18n.I18nType; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 多语言类型表 Mapper 接口 - *

- * - * @author Bunny - * @since 2024-09-26 - */ -@Mapper -public interface I18nTypeMapper extends BaseMapper { - -} diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java index c31688f..5f60286 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationEntryPoint.java @@ -9,15 +9,13 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; -import java.io.IOException; - /** * 请求未认证接口 */ @Slf4j public class SecurityAuthenticationEntryPoint implements AuthenticationEntryPoint { @Override - public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) { String token = response.getHeader("token"); String message = authException.getMessage(); // 创建结果对象 diff --git a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java index bf2635b..98ad1cc 100644 --- a/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java +++ b/service/src/main/java/cn/bunny/services/security/handelr/SecurityAuthenticationFailureHandler.java @@ -2,7 +2,6 @@ package cn.bunny.services.security.handelr; import cn.bunny.dao.pojo.result.Result; import com.alibaba.fastjson2.JSON; -import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.springframework.security.core.AuthenticationException; @@ -11,7 +10,7 @@ import java.io.IOException; public class SecurityAuthenticationFailureHandler implements org.springframework.security.web.authentication.AuthenticationFailureHandler { @Override - public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException { + public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException { // 错误消息 String localizedMessage = exception.getLocalizedMessage(); Result result = Result.error(localizedMessage); diff --git a/service/src/main/java/cn/bunny/services/security/service/iml/CustomAuthorizationManagerServiceImpl.java b/service/src/main/java/cn/bunny/services/security/service/iml/CustomAuthorizationManagerServiceImpl.java index cb8e63a..741c94a 100644 --- a/service/src/main/java/cn/bunny/services/security/service/iml/CustomAuthorizationManagerServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/security/service/iml/CustomAuthorizationManagerServiceImpl.java @@ -1,7 +1,6 @@ package cn.bunny.services.security.service.iml; import cn.bunny.common.service.context.BaseContext; -import cn.bunny.common.service.utils.JwtHelper; import cn.bunny.dao.entity.system.Power; import cn.bunny.services.mapper.PowerMapper; import jakarta.servlet.http.HttpServletRequest; @@ -36,10 +35,6 @@ public class CustomAuthorizationManagerServiceImpl implements AuthorizationManag public AuthorizationDecision check(Supplier authentication, RequestAuthorizationContext context) { // 用户的token和用户id、请求Url HttpServletRequest request = context.getRequest(); - String token = request.getHeader("token"); - - // 用户id - Long userId = JwtHelper.getUserId(token); // 请求地址 String requestURI = request.getRequestURI(); @@ -74,6 +69,6 @@ public class CustomAuthorizationManagerServiceImpl implements AuthorizationManag List powerList = powerMapper.selectListByPowerCodes(powerCodes); // 判断是否与请求路径匹配 - return powerList.stream().anyMatch(power -> power.getRequestUrl().equals(requestURI)); + return powerList.stream().anyMatch(power -> requestURI.matches(power.getRequestUrl())); } } diff --git a/service/src/main/java/cn/bunny/services/security/service/iml/CustomUserDetailsService.java b/service/src/main/java/cn/bunny/services/security/service/iml/CustomUserDetailsServiceImpl.java similarity index 96% rename from service/src/main/java/cn/bunny/services/security/service/iml/CustomUserDetailsService.java rename to service/src/main/java/cn/bunny/services/security/service/iml/CustomUserDetailsServiceImpl.java index 5f4f75e..0fd3629 100644 --- a/service/src/main/java/cn/bunny/services/security/service/iml/CustomUserDetailsService.java +++ b/service/src/main/java/cn/bunny/services/security/service/iml/CustomUserDetailsServiceImpl.java @@ -22,7 +22,7 @@ import org.springframework.util.DigestUtils; import java.util.List; @Component -public class CustomUserDetailsService implements cn.bunny.services.security.service.CustomUserDetailsService { +public class CustomUserDetailsServiceImpl implements cn.bunny.services.security.service.CustomUserDetailsService { @Autowired private UserMapper userMapper; diff --git a/service/src/main/java/cn/bunny/services/service/I18nService.java b/service/src/main/java/cn/bunny/services/service/I18nService.java deleted file mode 100644 index 37a209a..0000000 --- a/service/src/main/java/cn/bunny/services/service/I18nService.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bunny.services.service; - -import cn.bunny.dao.entity.i18n.I18n; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 多语言表 服务类 - *

- * - * @author Bunny - * @since 2024-09-26 - */ -public interface I18nService extends IService { - -} diff --git a/service/src/main/java/cn/bunny/services/service/I18nTypeService.java b/service/src/main/java/cn/bunny/services/service/I18nTypeService.java deleted file mode 100644 index db0c25a..0000000 --- a/service/src/main/java/cn/bunny/services/service/I18nTypeService.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.bunny.services.service; - -import cn.bunny.dao.entity.i18n.I18nType; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 多语言类型表 服务类 - *

- * - * @author Bunny - * @since 2024-09-26 - */ -public interface I18nTypeService extends IService { - -} diff --git a/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java deleted file mode 100644 index 2ebd537..0000000 --- a/service/src/main/java/cn/bunny/services/service/impl/I18nServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bunny.services.service.impl; - -import cn.bunny.dao.entity.i18n.I18n; -import cn.bunny.services.mapper.I18nMapper; -import cn.bunny.services.service.I18nService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 多语言表 服务实现类 - *

- * - * @author Bunny - * @since 2024-09-26 - */ -@Service -public class I18nServiceImpl extends ServiceImpl implements I18nService { - -} diff --git a/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java deleted file mode 100644 index 5bc8c5e..0000000 --- a/service/src/main/java/cn/bunny/services/service/impl/I18nTypeServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package cn.bunny.services.service.impl; - -import cn.bunny.dao.entity.i18n.I18nType; -import cn.bunny.services.mapper.I18nTypeMapper; -import cn.bunny.services.service.I18nTypeService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 多语言类型表 服务实现类 - *

- * - * @author Bunny - * @since 2024-09-26 - */ -@Service -public class I18nTypeServiceImpl extends ServiceImpl implements I18nTypeService { - -} diff --git a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java b/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java index d66bcf6..2d51819 100644 --- a/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/impl/RouterServiceImpl.java @@ -11,9 +11,9 @@ import cn.bunny.dao.vo.router.RouterManageVo; import cn.bunny.dao.vo.router.RouterMeta; import cn.bunny.dao.vo.router.UserRouterVo; import cn.bunny.dao.vo.user.LoginVo; +import cn.bunny.services.factory.RouterServiceFactory; import cn.bunny.services.mapper.RouterMapper; import cn.bunny.services.service.RouterService; -import cn.bunny.services.service.process.RouterServiceProcess; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -39,7 +39,7 @@ import java.util.List; @Transactional public class RouterServiceImpl extends ServiceImpl implements RouterService { @Autowired - private RouterServiceProcess routerServiceProcess; + private RouterServiceFactory routerServiceFactory; @Autowired private RedisTemplate redisTemplate; @@ -98,7 +98,7 @@ public class RouterServiceImpl extends ServiceImpl impleme // 构建树形结构 routerVoList.forEach(routerVo -> { if (routerVo.getParentId() == 0) { - routerVo.setChildren(routerServiceProcess.handleGetChildrenWIthRouter(routerVo.getId(), routerVoList)); + routerVo.setChildren(routerServiceFactory.handleGetChildrenWIthRouter(routerVo.getId(), routerVoList)); list.add(routerVo); } }); diff --git a/service/src/main/resources/mapper/I18nMapper.xml b/service/src/main/resources/mapper/I18nMapper.xml deleted file mode 100644 index c8184aa..0000000 --- a/service/src/main/resources/mapper/I18nMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id, type_id, key_name, summary, create_user, create_time, update_time, update_user, is_deleted - - - diff --git a/service/src/main/resources/mapper/I18nTypeMapper.xml b/service/src/main/resources/mapper/I18nTypeMapper.xml deleted file mode 100644 index 1d5347d..0000000 --- a/service/src/main/resources/mapper/I18nTypeMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - id, language_name, summary, is_default, create_user, create_time, update_time, update_user, is_deleted - - -