b2baccline/ballcat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎨 修改注入方式为 spring5.x 推荐的构造注入

Browse Source
This commit is contained in:
b2baccline
2020-01-13 14:22:30 +08:00
parent d02d54f7e1
commit 1d8b7946c1
26 changed files with 85 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/config/controller/BaseConfigController.java
View File

@@ -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;
/**

10
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java
View File

@@ -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;
/**

4
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java
View File

@@ -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;
/**

12
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java
View File

@@ -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;
/**

7
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java
View File

@@ -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<AdminAccessLog> {
@Autowired
private AccessLogAdminSaveThread accessLogAdminSaveThread;
private final AccessLogAdminSaveThread accessLogAdminSaveThread;
/**
* 生产一个日志

4
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java
View File

@@ -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<AdminAccessLog> {
private final AdminAccessLogService adminAccessLogService;

7
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java
View File

@@ -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

7
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java
View File

@@ -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;
/**
* 返回当前用户的路由集合

12
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java
View File

@@ -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;
/**
* 分页查询角色信息

4
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java
View File

@@ -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;

4
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java
View File

@@ -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;

4
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java
View File

@@ -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<SysPermissionMapper, SysPermission> implements SysPermissionService {
private final SysRolePermissionMapper sysRolePermissionMapper;

11
ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java
View File

@@ -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<SysRoleMapper, SysRole> implements SysRoleService {
@Autowired
private SysRolePermissionMapper sysRolePermissionMapper;
private final SysRolePermissionMapper sysRolePermissionMapper;
/**
* 通过角色ID，删除角色,并清空角色菜单缓存

1
ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java
View File

@@ -20,7 +20,6 @@ import java.io.IOException;
* @date 2019/9/25 22:04
*/
public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint {
@Autowired
private ObjectMapper objectMapper;

7
ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java
View File

@@ -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 {

22
ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java
View File

@@ -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;
/**
* 定义资源权限控制的配置

7
ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java
View File

@@ -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;
/**

6
ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java
View File

@@ -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