From 1d8b7946c1a65a4fa3b37220e0346b1c750f2e05 Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Mon, 13 Jan 2020 14:22:30 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=85=A5?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=B8=BA=20spring5.x=20=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E7=9A=84=E6=9E=84=E9=80=A0=E6=B3=A8=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BaseConfigController.java | 9 ++++---- .../controller/AdminAccessLogController.java | 10 +++++---- .../AdminOperationLogController.java | 4 ++-- .../controller/ApiAccessLogController.java | 12 +++++----- .../AdminAccessLogHandlerServiceImpl.java | 7 +++--- .../log/thread/AccessLogAdminSaveThread.java | 4 ++-- .../sys/controller/AuthController.java | 7 +++--- .../controller/SysPermissionController.java | 7 +++--- .../sys/controller/SysRoleController.java | 12 +++++----- .../sys/controller/SysUserController.java | 4 ++-- .../sys/service/impl/FileServiceImpl.java | 4 ++-- .../impl/SysPermissionServiceImpl.java | 4 ++-- .../sys/service/impl/SysRoleServiceImpl.java | 11 +++++----- .../oauth/CustomAuthenticationEntryPoint.java | 1 - .../oauth/SysUserDetailsServiceImpl.java | 7 +++--- .../CustomAuthorizationServerConfigurer.java | 22 +++++++------------ .../CustomResourceServerConfigurer.java | 7 +++--- .../filter/LoginPasswordDecoderFilter.java | 6 ++--- .../api/controller/TestController.java | 7 +++--- .../ApiAccessLogHandlerServiceImpl.java | 7 +++--- .../log/thread/ApiAccessLogSaveThread.java | 4 ++-- .../controller/GeneratorController.java | 12 ++++------ .../service/impl/GeneratorServiceImpl.java | 7 +++--- .../resources/template/Controller.java.vm | 2 +- .../web/GlobalExceptionHandlerResolver.java | 7 +++--- .../access/AccessLogAutoConfiguration.java | 7 +++--- 26 files changed, 85 insertions(+), 106 deletions(-) diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java index 7faf4c60..f4803ffe 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java @@ -3,13 +3,13 @@ package com.hccake.ballcat.admin.modules.config.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hccake.ballcat.commom.log.operation.annotation.OperationLogging; -import com.hccake.ballcat.common.core.result.R; import com.hccake.ballcat.api.modules.config.model.entity.BaseConfig; import com.hccake.ballcat.api.modules.config.service.BaseConfigService; +import com.hccake.ballcat.commom.log.operation.annotation.OperationLogging; +import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -21,11 +21,10 @@ import org.springframework.web.bind.annotation.*; * @date 2019-10-14 17:42:23 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("config/baseconfig") @Api(value = "config/baseconfig", tags = "系统配置") public class BaseConfigController { - private final BaseConfigService baseConfigService; /** diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java index 04bb4dd5..7b41e25c 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java @@ -8,8 +8,11 @@ import com.hccake.ballcat.admin.modules.log.service.AdminAccessLogService; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** @@ -19,11 +22,10 @@ import org.springframework.web.bind.annotation.*; * @date 2019-10-16 16:09:25 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/log/adminaccesslog" ) @Api(value = "adminaccesslog", tags = "访问日志管理") public class AdminAccessLogController { - private final AdminAccessLogService adminAccessLogService; /** diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java index 84bf17df..1c668917 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java @@ -9,6 +9,7 @@ import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -19,11 +20,10 @@ import org.springframework.web.bind.annotation.*; * @date 2019-10-15 20:42:32 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/log/adminoperationlog") @Api(value = "adminoperationlog", tags = "操作日志管理") public class AdminOperationLogController { - private final OperationLogAdminService operationLogAdminService; /** diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java index 74690a77..6fbc039e 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java @@ -3,13 +3,16 @@ package com.hccake.ballcat.admin.modules.log.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hccake.ballcat.common.core.result.R; import com.hccake.ballcat.api.modules.api.model.entity.ApiAccessLog; import com.hccake.ballcat.api.modules.log.service.ApiAccessLogService; +import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** @@ -19,11 +22,10 @@ import org.springframework.web.bind.annotation.*; * @date 2019-10-16 16:09:25 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/log/apiaccesslog") @Api(value = "/log/apiaccesslog", tags = "访问日志管理") public class ApiAccessLogController { - private final ApiAccessLogService apiAccessLogService; /** diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java index 989cde4c..b3b62676 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java @@ -9,8 +9,8 @@ import com.hccake.ballcat.admin.oauth.util.SecurityUtils; import com.hccake.ballcat.commom.log.access.service.AccessLogHandlerService; import com.hccake.ballcat.commom.log.util.LogUtils; import com.hccake.ballcat.common.core.util.IPUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.servlet.HandlerMapping; @@ -27,10 +27,9 @@ import java.util.Optional; */ @Slf4j @Service +@RequiredArgsConstructor public class AdminAccessLogHandlerServiceImpl implements AccessLogHandlerService { - - @Autowired - private AccessLogAdminSaveThread accessLogAdminSaveThread; + private final AccessLogAdminSaveThread accessLogAdminSaveThread; /** * 生产一个日志 diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java index dbccef69..dd2f59b7 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java @@ -3,7 +3,7 @@ package com.hccake.ballcat.admin.modules.log.thread; import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog; import com.hccake.ballcat.admin.modules.log.service.AdminAccessLogService; import com.hccake.ballcat.common.core.thread.AbstractQueueThread; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -15,8 +15,8 @@ import java.util.List; * @date 2019/10/16 15:30 */ @Slf4j -@AllArgsConstructor @Component +@RequiredArgsConstructor public class AccessLogAdminSaveThread extends AbstractQueueThread { private final AdminAccessLogService adminAccessLogService; diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java index d33c446b..f4441358 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java @@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil; import com.hccake.ballcat.common.core.result.R; import com.hccake.ballcat.common.core.result.ResultStatus; import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.security.oauth2.common.OAuth2AccessToken; import org.springframework.security.oauth2.common.OAuth2RefreshToken; @@ -22,10 +22,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/oauth") @Api(value = "oauth", tags = "用户认证模块") +@RequiredArgsConstructor public class AuthController { - - @Autowired - TokenStore tokenStore; + private final TokenStore tokenStore; /** * 退出token diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java index be7da482..f35e9547 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java @@ -14,7 +14,7 @@ import com.hccake.ballcat.commom.log.operation.annotation.OperationLogging; import com.hccake.ballcat.common.core.result.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -29,10 +29,9 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/syspermission") @Api(value = "syspermission", tags = "权限管理模块") +@RequiredArgsConstructor public class SysPermissionController { - - @Autowired - private SysPermissionService sysPermissionService; + private final SysPermissionService sysPermissionService; /** * 返回当前用户的路由集合 diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java index 519b98a5..ce0dab5e 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java @@ -12,7 +12,7 @@ import com.hccake.ballcat.common.core.result.R; import com.hccake.ballcat.common.core.vo.SelectData; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -26,13 +26,11 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/sysrole") @Api(value = "sysrole", tags = "角色管理模块") +@RequiredArgsConstructor public class SysRoleController { - @Autowired - private SysRoleService sysRoleService; - @Autowired - private SysRolePermissionService sysRolePermissionService; - @Autowired - private SysPermissionService sysPermissionService; + private final SysRoleService sysRoleService; + private final SysRolePermissionService sysRolePermissionService; + private final SysPermissionService sysPermissionService; /** * 分页查询角色信息 diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java index 6b915ad5..95d029bb 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java @@ -17,7 +17,7 @@ import com.hccake.ballcat.common.core.result.R; import com.hccake.ballcat.common.core.result.ResultStatus; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -36,10 +36,10 @@ import java.util.List; * @date 2018/12/16 */ @Slf4j -@AllArgsConstructor @RestController @RequestMapping("/sysuser") @Api(value = "sysuser", tags = "用户管理模块") +@RequiredArgsConstructor public class SysUserController { private final SysUserService sysUserService; private final SysUserRoleService sysUserRoleService; diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java index abd05706..ead986d1 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java @@ -2,7 +2,7 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; import com.hccake.ballcat.admin.modules.sys.service.FileService; import com.hccake.ballcat.commom.storage.FileStorageClient; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -14,7 +14,7 @@ import java.io.IOException; * @date 2020/1/8 11:16 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class FileServiceImpl implements FileService { private final FileStorageClient fileStorageClient; diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java index c9db0aef..4ee3aab6 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java @@ -11,7 +11,7 @@ import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO; import com.hccake.ballcat.admin.modules.sys.service.SysPermissionService; import com.hccake.ballcat.common.core.exception.BallCatException; import com.hccake.ballcat.common.core.result.ResultStatus; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -26,7 +26,7 @@ import java.util.List; * @since 2017-10-29 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysPermissionServiceImpl extends ServiceImpl implements SysPermissionService { private final SysRolePermissionMapper sysRolePermissionMapper; diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java index f5535ce2..e30bddbc 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java @@ -2,13 +2,13 @@ package com.hccake.ballcat.admin.modules.sys.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRolePermission; import com.hccake.ballcat.admin.modules.sys.mapper.SysRoleMapper; import com.hccake.ballcat.admin.modules.sys.mapper.SysRolePermissionMapper; +import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; +import com.hccake.ballcat.admin.modules.sys.model.entity.SysRolePermission; import com.hccake.ballcat.admin.modules.sys.service.SysRoleService; import com.hccake.ballcat.common.core.vo.SelectData; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -23,10 +23,9 @@ import java.util.List; * @since 2017-10-29 */ @Service +@RequiredArgsConstructor public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { - - @Autowired - private SysRolePermissionMapper sysRolePermissionMapper; + private final SysRolePermissionMapper sysRolePermissionMapper; /** * 通过角色ID，删除角色,并清空角色菜单缓存 diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java index 69943686..3da8f7ca 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java @@ -20,7 +20,6 @@ import java.io.IOException; * @date 2019/9/25 22:04 */ public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint { - @Autowired private ObjectMapper objectMapper; diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java index 061eac4d..69435c47 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollectionUtil; import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser; import com.hccake.ballcat.admin.modules.sys.model.vo.UserInfo; import com.hccake.ballcat.admin.modules.sys.service.SysUserService; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.AuthorityUtils; import org.springframework.security.core.userdetails.UserDetails; @@ -25,10 +25,9 @@ import java.util.Set; */ @Slf4j @Service +@RequiredArgsConstructor public class SysUserDetailsServiceImpl implements UserDetailsService { - - @Autowired - private SysUserService sysUserService; + private final SysUserService sysUserService; @Override public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java index f28e9910..6312d5bf 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java @@ -4,7 +4,7 @@ import com.hccake.ballcat.admin.constants.SecurityConst; import com.hccake.ballcat.admin.oauth.CustomTokenEnhancer; import com.hccake.ballcat.admin.oauth.SysUserDetailsServiceImpl; import com.hccake.ballcat.admin.oauth.exception.CustomWebResponseExceptionTranslator; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; @@ -30,20 +30,14 @@ import javax.sql.DataSource; */ @Configuration @EnableAuthorizationServer +@RequiredArgsConstructor public class CustomAuthorizationServerConfigurer implements AuthorizationServerConfigurer { - - @Autowired - private DataSource dataSource; - @Autowired - private SysUserDetailsServiceImpl sysUserDetailsService; - @Autowired - private AuthenticationManager authenticationManager; - @Autowired - private RedisConnectionFactory redisConnectionFactory; - @Autowired - private AuthenticationEntryPoint authenticationEntryPoint; - @Autowired - private CustomWebResponseExceptionTranslator customWebResponseExceptionTranslator; + private final DataSource dataSource; + private final SysUserDetailsServiceImpl sysUserDetailsService; + private final AuthenticationManager authenticationManager; + private final RedisConnectionFactory redisConnectionFactory; + private final AuthenticationEntryPoint authenticationEntryPoint; + private final CustomWebResponseExceptionTranslator customWebResponseExceptionTranslator; /** * 定义资源权限控制的配置 diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java index b420449f..345f4537 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java @@ -1,6 +1,6 @@ package com.hccake.ballcat.admin.oauth.config; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -19,10 +19,9 @@ import org.springframework.security.web.AuthenticationEntryPoint; @Configuration @EnableResourceServer @EnableGlobalMethodSecurity(prePostEnabled = true) +@RequiredArgsConstructor public class CustomResourceServerConfigurer extends ResourceServerConfigurerAdapter { - - @Autowired - private AuthenticationEntryPoint authenticationEntryPoint; + private final AuthenticationEntryPoint authenticationEntryPoint; /** diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java index e0272b94..c198a007 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java +++ b/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java @@ -6,8 +6,8 @@ import com.hccake.ballcat.common.core.filter.ModifyParamMapRequestWrapper; import com.hccake.ballcat.common.core.result.R; import com.hccake.ballcat.common.core.result.ResultStatus; import com.hccake.ballcat.common.core.util.PasswordUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; @@ -36,7 +36,9 @@ import java.util.Optional; @Slf4j @Order(0) @WebFilter(urlPatterns = {UrlMappingConst.OAUTH_LOGIN}) +@RequiredArgsConstructor public class LoginPasswordDecoderFilter extends OncePerRequestFilter { + private final ObjectMapper objectMapper; @Value("${password.secret-key}") private String secretKey; @@ -47,8 +49,6 @@ public class LoginPasswordDecoderFilter extends OncePerRequestFilter { private static final String TEST_CLIENT = "test"; - @Autowired - private ObjectMapper objectMapper; /** * Same contract as for {@code doFilter}, but guaranteed to be diff --git a/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/api/controller/TestController.java b/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/api/controller/TestController.java index 6877d3b6..862441ea 100644 --- a/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/api/controller/TestController.java +++ b/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/api/controller/TestController.java @@ -6,7 +6,7 @@ import com.hccake.ballcat.api.modules.api.model.entity.ApiAccessLog; import com.hccake.ballcat.api.modules.log.service.ApiAccessLogService; import com.hccake.ballcat.common.core.exception.BallCatException; import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; import java.time.LocalDate; @@ -19,10 +19,9 @@ import java.time.LocalDateTime; */ @RequestMapping @RestController +@RequiredArgsConstructor public class TestController { - - @Autowired - private ApiAccessLogService apiAccessLogService; + private final ApiAccessLogService apiAccessLogService; @ApiOperation("测试地址") diff --git a/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/log/service/ApiAccessLogHandlerServiceImpl.java b/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/log/service/ApiAccessLogHandlerServiceImpl.java index 8c1c750a..1a1ba9d2 100644 --- a/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/log/service/ApiAccessLogHandlerServiceImpl.java +++ b/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/log/service/ApiAccessLogHandlerServiceImpl.java @@ -7,8 +7,8 @@ import com.hccake.ballcat.api.modules.log.thread.ApiAccessLogSaveThread; import com.hccake.ballcat.commom.log.access.service.AccessLogHandlerService; import com.hccake.ballcat.commom.log.util.LogUtils; import com.hccake.ballcat.common.core.util.IPUtil; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.servlet.HandlerMapping; @@ -25,10 +25,9 @@ import java.util.Optional; */ @Slf4j @Service +@RequiredArgsConstructor public class ApiAccessLogHandlerServiceImpl implements AccessLogHandlerService { - - @Autowired - private ApiAccessLogSaveThread apiAccessLogSaveThread; + private final ApiAccessLogSaveThread apiAccessLogSaveThread; /** * 生产一个日志 diff --git a/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/log/thread/ApiAccessLogSaveThread.java b/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/log/thread/ApiAccessLogSaveThread.java index d709b4e4..705638c4 100644 --- a/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/log/thread/ApiAccessLogSaveThread.java +++ b/ballcat-api/src/main/java/com/hccake/ballcat/api/modules/log/thread/ApiAccessLogSaveThread.java @@ -3,7 +3,7 @@ package com.hccake.ballcat.api.modules.log.thread; import com.hccake.ballcat.api.modules.api.model.entity.ApiAccessLog; import com.hccake.ballcat.api.modules.log.service.ApiAccessLogService; import com.hccake.ballcat.common.core.thread.AbstractQueueThread; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; @@ -15,8 +15,8 @@ import java.util.List; * @date 2019/10/16 15:30 */ @Slf4j -@AllArgsConstructor @Component +@RequiredArgsConstructor public class ApiAccessLogSaveThread extends AbstractQueueThread { private final ApiAccessLogService apiAccessLogService; diff --git a/ballcat-codegen/src/main/java/com/hccake/ballcat/codegen/controller/GeneratorController.java b/ballcat-codegen/src/main/java/com/hccake/ballcat/codegen/controller/GeneratorController.java index 32b6764e..f00bd210 100644 --- a/ballcat-codegen/src/main/java/com/hccake/ballcat/codegen/controller/GeneratorController.java +++ b/ballcat-codegen/src/main/java/com/hccake/ballcat/codegen/controller/GeneratorController.java @@ -8,12 +8,11 @@ import com.hccake.ballcat.codegen.config.GenConfig; import com.hccake.ballcat.codegen.config.ReqGenConfig; import com.hccake.ballcat.codegen.service.GeneratorService; import com.hccake.ballcat.codegen.vo.GeneratorVo; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.Optional; @@ -26,13 +25,10 @@ import java.util.Optional; @CrossOrigin @RestController @RequestMapping("/generator") +@RequiredArgsConstructor public class GeneratorController { - - @Autowired - private GeneratorService generatorService; - - @Resource - private DefaultGenConfig defaultGenConfig; + private final GeneratorService generatorService; + private final DefaultGenConfig defaultGenConfig; /** * 列表 diff --git a/ballcat-codegen/src/main/java/com/hccake/ballcat/codegen/service/impl/GeneratorServiceImpl.java b/ballcat-codegen/src/main/java/com/hccake/ballcat/codegen/service/impl/GeneratorServiceImpl.java index 19879244..9d7d9dc5 100644 --- a/ballcat-codegen/src/main/java/com/hccake/ballcat/codegen/service/impl/GeneratorServiceImpl.java +++ b/ballcat-codegen/src/main/java/com/hccake/ballcat/codegen/service/impl/GeneratorServiceImpl.java @@ -7,7 +7,7 @@ import com.hccake.ballcat.codegen.config.GenConfig; import com.hccake.ballcat.codegen.mapper.GeneratorMapper; import com.hccake.ballcat.codegen.service.GeneratorService; import com.hccake.ballcat.codegen.util.GenUtils; -import org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.io.ByteArrayOutputStream; @@ -19,10 +19,9 @@ import java.util.zip.ZipOutputStream; * @author Hccake */ @Service +@RequiredArgsConstructor public class GeneratorServiceImpl implements GeneratorService { - - @Autowired - private GeneratorMapper generatorMapper; + private final GeneratorMapper generatorMapper; /** * 生成代码 diff --git a/ballcat-codegen/src/main/resources/template/Controller.java.vm b/ballcat-codegen/src/main/resources/template/Controller.java.vm index 92ec8017..8f18e095 100644 --- a/ballcat-codegen/src/main/resources/template/Controller.java.vm +++ b/ballcat-codegen/src/main/resources/template/Controller.java.vm @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; * @date ${datetime} */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/${moduleName}/${pathName}" ) @Api(value = "${pathName}", tags = "${comments}管理") public class ${className}Controller { diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/GlobalExceptionHandlerResolver.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/GlobalExceptionHandlerResolver.java index 125e74f7..033822ea 100644 --- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/GlobalExceptionHandlerResolver.java +++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/GlobalExceptionHandlerResolver.java @@ -4,8 +4,8 @@ import com.hccake.ballcat.commom.log.error.service.ErrorLogHandlerService; import com.hccake.ballcat.common.core.exception.BallCatException; import com.hccake.ballcat.common.core.result.R; import com.hccake.ballcat.common.core.result.ResultStatus; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.SpringSecurityMessageSource; @@ -25,10 +25,9 @@ import java.util.List; */ @Slf4j @RestControllerAdvice +@RequiredArgsConstructor public class GlobalExceptionHandlerResolver { - - @Autowired - private ErrorLogHandlerService errorLogHandlerService; + private final ErrorLogHandlerService errorLogHandlerService; /** * 全局异常捕获 diff --git a/ballcat-common/ballcat-common-log/src/main/java/com/hccake/ballcat/commom/log/access/AccessLogAutoConfiguration.java b/ballcat-common/ballcat-common-log/src/main/java/com/hccake/ballcat/commom/log/access/AccessLogAutoConfiguration.java index 58c5211d..e5c49fbd 100644 --- a/ballcat-common/ballcat-common-log/src/main/java/com/hccake/ballcat/commom/log/access/AccessLogAutoConfiguration.java +++ b/ballcat-common/ballcat-common-log/src/main/java/com/hccake/ballcat/commom/log/access/AccessLogAutoConfiguration.java @@ -2,8 +2,8 @@ package com.hccake.ballcat.commom.log.access; import com.hccake.ballcat.commom.log.access.filter.AccessLogFilter; import com.hccake.ballcat.commom.log.access.service.AccessLogHandlerService; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -18,10 +18,9 @@ import org.springframework.context.annotation.Configuration; @Slf4j @Configuration @ConditionalOnWebApplication +@RequiredArgsConstructor public class AccessLogAutoConfiguration { - - @Autowired - private AccessLogHandlerService accessLogService; + private final AccessLogHandlerService accessLogService; @Bean @ConditionalOnClass(AccessLogHandlerService.class)