diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java index 8f8aa70e8a4a8c97f3ce9581f1a68d268820efad..d137e8dbea51a7b899c8386b09edb1a2af9580ea 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfig.java @@ -23,7 +23,7 @@ import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.security.component.PigWebResponseExceptionTranslator; import com.pig4cloud.pig.common.security.service.PigClientDetailsService; import com.pig4cloud.pig.common.security.service.PigUser; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -51,7 +51,7 @@ import java.util.Map; * 认证服务器配置 */ @Configuration -@AllArgsConstructor +@RequiredArgsConstructor @EnableAuthorizationServer public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdapter { private final DataSource dataSource; diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java index 4f759ba2c0167c8e7c1f445b9e89a5b2396f4220..59eb55915b80b4ee1c933d39dd40b0373a9f367f 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/endpoint/PigTokenEndpoint.java @@ -26,7 +26,7 @@ import com.pig4cloud.pig.common.core.constant.CommonConstants; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.security.annotation.Inner; import com.pig4cloud.pig.common.security.util.SecurityUtils; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.CacheManager; import org.springframework.data.redis.core.ConvertingCursor; @@ -61,7 +61,7 @@ import java.util.Map; */ @Slf4j @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/token") public class PigTokenEndpoint { private final ClientDetailsService clientDetailsService; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java index f265b727e8aebd19cda66b7447029f859bb2a040..06b02133cffc7915464216d3c9a71ab85a8255fd 100755 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java +++ b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenDsConfController.java @@ -24,7 +24,7 @@ import com.pig4cloud.pig.codegen.service.GenDatasourceConfService; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.log.annotation.SysLog; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.*; * @date 2019-03-31 16:00:20 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/dsconf") @Api(value = "dsconf", tags = "数据源管理模块") public class GenDsConfController { diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFormConfController.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFormConfController.java index 362f5690509954ea914cbf6347f8e87a0c22e9fe..4d34d773309b200755458772b76f84f7d06329b5 100755 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFormConfController.java +++ b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GenFormConfController.java @@ -26,7 +26,7 @@ import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.log.annotation.SysLog; 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.*; @@ -38,7 +38,7 @@ import org.springframework.web.bind.annotation.*; * @date 2019-08-12 15:55:35 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/form") @Api(value = "form", tags = "表单管理") public class GenFormConfController { diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java index 6e9d40a57a71e21f80728041003f2edafcbe524f..8586e94a6fbd8db82515bc838821752ef8cbf6ce 100755 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java +++ b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/controller/GeneratorController.java @@ -24,7 +24,7 @@ import com.pig4cloud.pig.codegen.entity.GenConfig; import com.pig4cloud.pig.codegen.service.GeneratorService; import com.pig4cloud.pig.common.core.util.R; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; @@ -38,7 +38,7 @@ import javax.servlet.http.HttpServletResponse; * @date 2018-07-30 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/generator") @Api(value = "generator", tags = "代码生成模块") public class GeneratorController { diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFormConfServiceImpl.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFormConfServiceImpl.java index b6e072ab45d1b57041239276b400fdb33f33df62..24502d92d34e1bc45fef3a5281531f39704acf2b 100755 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFormConfServiceImpl.java +++ b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenFormConfServiceImpl.java @@ -27,7 +27,7 @@ import com.pig4cloud.pig.codegen.mapper.GenFormConfMapper; import com.pig4cloud.pig.codegen.mapper.GeneratorMapper; import com.pig4cloud.pig.codegen.service.GenFormConfService; import com.pig4cloud.pig.codegen.util.CodeGenUtils; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import org.apache.commons.lang.StringUtils; import org.apache.velocity.Template; @@ -49,7 +49,7 @@ import java.util.Properties; * @date 2019-08-12 15:55:35 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class GenFormConfServiceImpl extends ServiceImpl implements GenFormConfService { private final GeneratorMapper generatorMapper; diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java index 7f61c72812f5c7a043293c407942f373f81314c8..24fd87d5e38678647d1b2a2f1b32764089d87270 100755 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java +++ b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GeneratorServiceImpl.java @@ -32,7 +32,7 @@ import com.pig4cloud.pig.codegen.mapper.GenFormConfMapper; import com.pig4cloud.pig.codegen.mapper.GeneratorMapper; import com.pig4cloud.pig.codegen.service.GeneratorService; import com.pig4cloud.pig.codegen.util.CodeGenUtils; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.io.ByteArrayOutputStream; @@ -47,7 +47,7 @@ import java.util.zip.ZipOutputStream; * 代码生成器 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class GeneratorServiceImpl implements GeneratorService { private final GeneratorMapper generatorMapper; private final GenFormConfMapper genFormConfMapper; diff --git a/pig-codegen/src/main/resources/template/Controller.java.vm b/pig-codegen/src/main/resources/template/Controller.java.vm index 03890d00e389fcd2fbd1e6ea81dceee056623e7a..170c93400c7de9549c61a0281ef90a1f1510b82a 100755 --- a/pig-codegen/src/main/resources/template/Controller.java.vm +++ b/pig-codegen/src/main/resources/template/Controller.java.vm @@ -26,7 +26,7 @@ import ${package}.${moduleName}.service.${className}Service; import org.springframework.security.access.prepost.PreAuthorize; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.*; * @date ${datetime} */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/${pathName}" ) @Api(value = "${pathName}", tags = "${comments}管理") public class ${className}Controller { diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfig.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfig.java index 64688e4596d8b6efdd854716150c8b66bf801407..f3d1fdde9b970ce0975edb6985bd73e155042408 100755 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfig.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/config/RedisTemplateConfig.java @@ -18,7 +18,7 @@ package com.pig4cloud.pig.common.core.config; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration; import org.springframework.cache.annotation.EnableCaching; @@ -36,7 +36,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer; */ @EnableCaching @Configuration -@AllArgsConstructor +@RequiredArgsConstructor @AutoConfigureBefore(RedisAutoConfiguration.class) public class RedisTemplateConfig { private final RedisConnectionFactory factory; diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java index ff93dd7e25b9c73c41ceed7de0297143a2365c1f..30eee05ba2f12709068bc31732c521be5c070466 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/DictTypeEnum.java @@ -18,8 +18,8 @@ package com.pig4cloud.pig.common.core.constant.enums; -import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.RequiredArgsConstructor; /** * @author lengleng @@ -28,7 +28,7 @@ import lombok.Getter; * 字典类型 */ @Getter -@AllArgsConstructor +@RequiredArgsConstructor public enum DictTypeEnum { /** * 字典类型-系统内置（不可修改） @@ -43,9 +43,9 @@ public enum DictTypeEnum { /** * 类型 */ - private String type; + private final String type; /** * 描述 */ - private String description; + private final String description; } diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java index 48d83fbf3f6fc38d33212d783370b2668aaf98df..f9ed6361ae9ea1e76b627b7cc7d4b005f713288a 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/LoginTypeEnum.java @@ -18,8 +18,8 @@ package com.pig4cloud.pig.common.core.constant.enums; -import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.RequiredArgsConstructor; /** * @author lengleng @@ -27,7 +27,7 @@ import lombok.Getter; * 社交登录类型 */ @Getter -@AllArgsConstructor +@RequiredArgsConstructor public enum LoginTypeEnum { /** * 账号密码登录 diff --git a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java index 18516b1ebc26f98805f6cd1a1e7d4ac9e8dc7b99..547337fc68b325bc2839983f5d51042a6e1e4e0a 100644 --- a/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java +++ b/pig-common/pig-common-core/src/main/java/com/pig4cloud/pig/common/core/constant/enums/MenuTypeEnum.java @@ -18,8 +18,8 @@ package com.pig4cloud.pig.common.core.constant.enums; -import lombok.AllArgsConstructor; import lombok.Getter; +import lombok.RequiredArgsConstructor; /** * @author lengleng @@ -28,7 +28,7 @@ import lombok.Getter; * 菜单类型 */ @Getter -@AllArgsConstructor +@RequiredArgsConstructor public enum MenuTypeEnum { /** @@ -49,9 +49,9 @@ public enum MenuTypeEnum { /** * 类型 */ - private String type; + private final String type; /** * 描述 */ - private String description; + private final String description; } diff --git a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java index d9c29922d9fab15f3541ddacb1d600c14c0dad93..533a1887395acc621df115bcb0cce4fd2a5d037e 100644 --- a/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java +++ b/pig-common/pig-common-datasource/src/main/java/com/pig4cloud/pig/common/datasource/DynamicDataSourceAutoConfiguration.java @@ -23,7 +23,7 @@ import com.baomidou.dynamic.datasource.provider.DynamicDataSourceProvider; import com.pig4cloud.pig.common.datasource.config.DataSourceProperties; import com.pig4cloud.pig.common.datasource.config.JdbcDynamicDataSourceProvider; import com.pig4cloud.pig.common.datasource.config.LastParamDsProcessor; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.jasypt.encryption.StringEncryptor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @@ -37,7 +37,7 @@ import org.springframework.context.annotation.Configuration; *

* 动态数据源切换配置 */ -@AllArgsConstructor +@RequiredArgsConstructor @Configuration(proxyBeanMethods = false) @AutoConfigureAfter(DataSourceAutoConfiguration.class) @EnableConfigurationProperties(DataSourceProperties.class) diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java index d13158db89a330eb0ea522f4c39665ad276ec7f6..0b33648d246f1addb417d26d9eda419e3156495f 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/LogAutoConfiguration.java @@ -21,7 +21,7 @@ package com.pig4cloud.pig.common.log; import com.pig4cloud.pig.admin.api.feign.RemoteLogService; import com.pig4cloud.pig.common.log.aspect.SysLogAspect; import com.pig4cloud.pig.common.log.event.SysLogListener; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -33,7 +33,7 @@ import org.springframework.scheduling.annotation.EnableAsync; * 日志自动配置 */ @EnableAsync -@AllArgsConstructor +@RequiredArgsConstructor @ConditionalOnWebApplication @Configuration(proxyBeanMethods = false) public class LogAutoConfiguration { diff --git a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java index 0ed4b649653ad65f0ce4cd09610cd4928183ffe7..83a9505d3173d761be9963abc535926f6c9b5a6f 100755 --- a/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java +++ b/pig-common/pig-common-log/src/main/java/com/pig4cloud/pig/common/log/event/SysLogListener.java @@ -21,7 +21,7 @@ package com.pig4cloud.pig.common.log.event; import com.pig4cloud.pig.admin.api.entity.SysLog; import com.pig4cloud.pig.admin.api.feign.RemoteLogService; import com.pig4cloud.pig.common.core.constant.SecurityConstants; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.core.annotation.Order; @@ -33,7 +33,7 @@ import org.springframework.scheduling.annotation.Async; * 异步监听日志事件 */ @Slf4j -@AllArgsConstructor +@RequiredArgsConstructor public class SysLogListener { private final RemoteLogService remoteLogService; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAccessDeniedHandler.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAccessDeniedHandler.java index 8f9417891d9ab8023172d6b65662101f8728851f..eb934e738bf86cedf1b70b78eedf6da94c3163cc 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAccessDeniedHandler.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigAccessDeniedHandler.java @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.pig4cloud.pig.common.core.constant.CommonConstants; import com.pig4cloud.pig.common.core.exception.PigDeniedException; import com.pig4cloud.pig.common.core.util.R; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.AccessDeniedException; @@ -46,7 +46,7 @@ import java.io.PrintWriter; */ @Slf4j @Component -@AllArgsConstructor +@RequiredArgsConstructor public class PigAccessDeniedHandler extends OAuth2AccessDeniedHandler { private final ObjectMapper objectMapper; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java index e9ed64bcb06ae6b9759bde6a24e55230953abb0c..980ff13b5dc48d271e5d52966c539af0c69b8bd3 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java @@ -21,7 +21,7 @@ package com.pig4cloud.pig.common.security.component; import cn.hutool.core.util.StrUtil; import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.security.annotation.Inner; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; @@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletRequest; */ @Slf4j @Aspect -@AllArgsConstructor +@RequiredArgsConstructor public class PigSecurityInnerAspect implements Ordered { private final HttpServletRequest request; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java index 94527314e2d22a37b3e86fadd8cf5b7eefedfbac..6b9eaa902e1831d2853a93988ec44e378d076ff4 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/ResourceAuthExceptionEntryPoint.java @@ -22,7 +22,7 @@ import cn.hutool.http.HttpStatus; import com.fasterxml.jackson.databind.ObjectMapper; import com.pig4cloud.pig.common.core.constant.CommonConstants; import com.pig4cloud.pig.common.core.util.R; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.AuthenticationException; @@ -41,7 +41,7 @@ import java.io.PrintWriter; */ @Slf4j @Component -@AllArgsConstructor +@RequiredArgsConstructor public class ResourceAuthExceptionEntryPoint implements AuthenticationEntryPoint { private final ObjectMapper objectMapper; diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java index 10a69602821cb03d9594319c4ca9821820340283..acb76bb4bd8ee8a1bd6a528e735401f3d0d0c472 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/feign/PigFeignClientConfiguration.java @@ -19,7 +19,6 @@ package com.pig4cloud.pig.common.security.feign; import feign.RequestInterceptor; -import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.security.oauth2.client.AccessTokenContextRelay; import org.springframework.context.annotation.Bean; @@ -34,7 +33,6 @@ import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResour * 使用hystrix 的信号量模式 */ @Configuration -@AllArgsConstructor @ConditionalOnProperty("security.oauth2.client.client-id") public class PigFeignClientConfiguration { @Bean diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/FormAuthenticationFailureHandler.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/FormAuthenticationFailureHandler.java index 36885da222e7d97bd1929f1f162f9f58e25b02be..553a7161bf23d3c2e33891909a977e7108d3a4c8 100644 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/FormAuthenticationFailureHandler.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/handler/FormAuthenticationFailureHandler.java @@ -47,7 +47,7 @@ public class FormAuthenticationFailureHandler implements AuthenticationFailureHa @SneakyThrows public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) { log.debug("表单登录失败:{}", exception.getLocalizedMessage()); - response.sendRedirect(String.format("/token/login?error=%s" - , HttpUtil.encodeParams(exception.getMessage(), Charset.defaultCharset()))); + String url = HttpUtil.encodeParams(String.format("/token/login?error=%s", exception.getMessage()), Charset.defaultCharset()); + WebUtils.getResponse().sendRedirect(url); } } diff --git a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java index dbbf83d3d8a3d039ebe15af3a7ff6f30af5ea369..c2cf389cc02b3c6916c0af3a5dd0f41f3f6010a8 100755 --- a/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java +++ b/pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/service/PigUserDetailsServiceImpl.java @@ -27,7 +27,7 @@ import com.pig4cloud.pig.common.core.constant.CacheConstants; import com.pig4cloud.pig.common.core.constant.CommonConstants; import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.core.util.R; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.cache.Cache; @@ -51,7 +51,7 @@ import java.util.Set; */ @Slf4j @Service -@AllArgsConstructor +@RequiredArgsConstructor public class PigUserDetailsServiceImpl implements UserDetailsService { private final RemoteUserService remoteUserService; private final CacheManager cacheManager; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RouterFunctionConfiguration.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RouterFunctionConfiguration.java index 6a8febf425b02871a4e46ed74c448a8b95c34106..14733df2afd614b674f17025267960b8349f676c 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RouterFunctionConfiguration.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/RouterFunctionConfiguration.java @@ -18,12 +18,8 @@ package com.pig4cloud.pig.gateway.config; -import com.pig4cloud.pig.gateway.handler.HystrixFallbackHandler; -import com.pig4cloud.pig.gateway.handler.ImageCodeHandler; -import com.pig4cloud.pig.gateway.handler.SwaggerResourceHandler; -import com.pig4cloud.pig.gateway.handler.SwaggerSecurityHandler; -import com.pig4cloud.pig.gateway.handler.SwaggerUiHandler; -import lombok.AllArgsConstructor; +import com.pig4cloud.pig.gateway.handler.*; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -39,7 +35,7 @@ import org.springframework.web.reactive.function.server.RouterFunctions; */ @Slf4j @Configuration -@AllArgsConstructor +@RequiredArgsConstructor public class RouterFunctionConfiguration { private final HystrixFallbackHandler hystrixFallbackHandler; private final ImageCodeHandler imageCodeHandler; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/SwaggerProviderConfiguration.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/SwaggerProviderConfiguration.java index 1a579bb51639894bb1bfc4e317d8f15470bd5f86..e91ba06518dc6ab33945e780c3dd677e22f8d352 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/SwaggerProviderConfiguration.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/config/SwaggerProviderConfiguration.java @@ -18,7 +18,7 @@ package com.pig4cloud.pig.gateway.config; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.cloud.gateway.config.GatewayProperties; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.support.NameUtils; @@ -36,7 +36,7 @@ import java.util.List; */ @Component @Primary -@AllArgsConstructor +@RequiredArgsConstructor public class SwaggerProviderConfiguration implements SwaggerResourcesProvider { private static final String API_URI = "/v2/api-docs"; private final RouteLocator routeLocator; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java index ae4082034863d1c311dfaa35b5ef2ede5073e54a..b34e106c9857fb50642bd3bb70ff163d55237124 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/filter/ValidateCodeGatewayFilter.java @@ -27,13 +27,14 @@ import com.pig4cloud.pig.common.core.exception.ValidateCodeException; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.core.util.WebUtils; import com.pig4cloud.pig.gateway.config.IgnoreClientConfiguration; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.stereotype.Component; @@ -46,7 +47,7 @@ import reactor.core.publisher.Mono; */ @Slf4j @Component -@AllArgsConstructor +@RequiredArgsConstructor public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { private final IgnoreClientConfiguration ignoreClient; private final ObjectMapper objectMapper; @@ -81,6 +82,7 @@ public class ValidateCodeGatewayFilter extends AbstractGatewayFilterFactory { } catch (Exception e) { ServerHttpResponse response = exchange.getResponse(); response.setStatusCode(HttpStatus.PRECONDITION_REQUIRED); + response.getHeaders().setContentType(MediaType.APPLICATION_JSON); try { return response.writeWith(Mono.just(response.bufferFactory() .wrap(objectMapper.writeValueAsBytes( diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/ImageCodeHandler.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/ImageCodeHandler.java index f079a9d8da3ef36a726cd7fba89613df535a49cb..944e5af260bc7206e158adf3cd1900746cee1dbe 100755 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/ImageCodeHandler.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/ImageCodeHandler.java @@ -20,7 +20,7 @@ package com.pig4cloud.pig.gateway.handler; import com.google.code.kaptcha.Producer; import com.pig4cloud.pig.common.core.constant.CommonConstants; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.io.ByteArrayResource; import org.springframework.data.redis.core.RedisTemplate; @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit; */ @Slf4j @Component -@AllArgsConstructor +@RequiredArgsConstructor public class ImageCodeHandler implements HandlerFunction { private final Producer producer; private final RedisTemplate redisTemplate; diff --git a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerResourceHandler.java b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerResourceHandler.java index 60184be57f87063e1e1bda99c0b088fa33af0d02..51c5b6ab1d5e6fb07df1ab7d5dc5722df45d9c70 100644 --- a/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerResourceHandler.java +++ b/pig-gateway/src/main/java/com/pig4cloud/pig/gateway/handler/SwaggerResourceHandler.java @@ -18,7 +18,7 @@ package com.pig4cloud.pig.gateway.handler; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -37,7 +37,7 @@ import springfox.documentation.swagger.web.SwaggerResourcesProvider; */ @Slf4j @Component -@AllArgsConstructor +@RequiredArgsConstructor public class SwaggerResourceHandler implements HandlerFunction { private final SwaggerResourcesProvider swaggerResources; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DeptController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DeptController.java index 9d7b6d0a7aba0845eeadcf78f2bc5c201c4e03ce..66de4e6ba6490aff7e6a17775b4170e528bc0444 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DeptController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DeptController.java @@ -23,7 +23,7 @@ import com.pig4cloud.pig.admin.service.SysDeptService; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.log.annotation.SysLog; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -39,7 +39,7 @@ import java.time.LocalDateTime; * @since 2019/2/1 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/dept") @Api(value = "dept", tags = "部门管理模块") public class DeptController { diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java index f3e850ee8bc116bee4ac00d6ccded4397e7ce16a..33ee3a4f7161d8fb4f732db9c780feffc7f85e24 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/DictController.java @@ -30,7 +30,7 @@ import com.pig4cloud.pig.common.core.constant.CacheConstants; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.log.annotation.SysLog; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.security.access.prepost.PreAuthorize; @@ -47,7 +47,7 @@ import javax.validation.Valid; * @since 2019-03-19 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/dict") @Api(value = "dict", tags = "字典管理模块") public class DictController { diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java index 2c594fbbad43fb1681b4ed3eb8307af9efc79eb0..31cec875d1fd6038bb3ca36836cdd34b7555d5eb 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/LogController.java @@ -24,7 +24,7 @@ import com.pig4cloud.pig.admin.service.SysLogService; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.security.annotation.Inner; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -39,7 +39,7 @@ import javax.validation.Valid; * @since 2019/2/1 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/log") @Api(value = "log", tags = "日志管理模块") public class LogController { diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java index f79f7cfd62e1c75383c0ef617ae1f68b494d692d..e3aba959c63a2190cf0319647450a0710b8d3f71 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/MenuController.java @@ -25,7 +25,7 @@ import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.log.annotation.SysLog; import com.pig4cloud.pig.common.security.util.SecurityUtils; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -39,7 +39,7 @@ import java.util.stream.Collectors; * @date 2017/10/31 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/menu") @Api(value = "menu", tags = "菜单管理模块") public class MenuController { diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/OauthClientDetailsController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/OauthClientDetailsController.java index 38a6d67a12e06d14fa3db834a3f36538cb60d865..c6d6b8dfb502ceb8fb7072ee1b8fb81661de2361 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/OauthClientDetailsController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/OauthClientDetailsController.java @@ -25,7 +25,7 @@ import com.pig4cloud.pig.admin.service.SysOauthClientDetailsService; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.log.annotation.SysLog; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -40,7 +40,7 @@ import javax.validation.Valid; * @since 2018-05-15 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/client") @Api(value = "client", tags = "客户端管理模块") public class OauthClientDetailsController { diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/RoleController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/RoleController.java index 79abda833b10058aafb77737befebb49a706b179..09c03c75728a69f0c9ff5b5d864b9756e9c5d6cd 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/RoleController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/RoleController.java @@ -27,7 +27,7 @@ import com.pig4cloud.pig.admin.service.SysRoleService; import com.pig4cloud.pig.common.core.util.R; import com.pig4cloud.pig.common.log.annotation.SysLog; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -38,7 +38,7 @@ import javax.validation.Valid; * @date 2019/2/1 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/role") @Api(value = "role", tags = "角色管理模块") public class RoleController { diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java index f67360473fe21b6d1430a2a18c15ec877fa02df3..26b29e1cf85750c2ece39f81c2c44ebcbb58d1f7 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/TokenController.java @@ -22,7 +22,7 @@ import com.pig4cloud.pig.admin.api.feign.RemoteTokenService; import com.pig4cloud.pig.common.core.constant.SecurityConstants; import com.pig4cloud.pig.common.core.util.R; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -34,7 +34,7 @@ import java.util.Map; * getTokenPage 管理 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/token") @Api(value = "token", tags = "令牌管理模块") public class TokenController { diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java index 71485375a1a1be9cd8ded9c153395b0df2fef981..c55251e76613f97481b06f3fb70a9ed4f94771f0 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/controller/UserController.java @@ -29,7 +29,7 @@ import com.pig4cloud.pig.common.log.annotation.SysLog; import com.pig4cloud.pig.common.security.annotation.Inner; import com.pig4cloud.pig.common.security.util.SecurityUtils; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -40,7 +40,7 @@ import javax.validation.Valid; * @date 2019/2/1 */ @RestController -@AllArgsConstructor +@RequiredArgsConstructor @RequestMapping("/user") @Api(value = "user", tags = "用户管理模块") public class UserController { diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptRelationServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptRelationServiceImpl.java index 50c1a58addded2329e786826e59c0aed6ce6dc52..d946f497f6924a8495027199e0a23057f7424bbe 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptRelationServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptRelationServiceImpl.java @@ -25,7 +25,7 @@ import com.pig4cloud.pig.admin.api.entity.SysDept; import com.pig4cloud.pig.admin.api.entity.SysDeptRelation; import com.pig4cloud.pig.admin.mapper.SysDeptRelationMapper; import com.pig4cloud.pig.admin.service.SysDeptRelationService; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +41,7 @@ import java.util.stream.Collectors; * @since 2019/2/1 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysDeptRelationServiceImpl extends ServiceImpl implements SysDeptRelationService { private final SysDeptRelationMapper sysDeptRelationMapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java index 5285b20272de8f3785a387e76caf54f5777aa76f..d409eaaa54aa8e25038650873965818c2798288b 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDeptServiceImpl.java @@ -29,7 +29,7 @@ import com.pig4cloud.pig.admin.mapper.SysDeptMapper; import com.pig4cloud.pig.admin.service.SysDeptRelationService; import com.pig4cloud.pig.admin.service.SysDeptService; import com.pig4cloud.pig.common.security.util.SecurityUtils; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -47,7 +47,7 @@ import java.util.stream.Collectors; * @since 2019/2/1 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { private final SysDeptRelationService sysDeptRelationService; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java index eca13e1e4c46da1f633ce2642abc57267e0c693b..1c3ea39a4cd27fb5a9b423147b311b4981af92bc 100755 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictItemServiceImpl.java @@ -26,7 +26,7 @@ import com.pig4cloud.pig.admin.service.SysDictService; import com.pig4cloud.pig.common.core.constant.CacheConstants; import com.pig4cloud.pig.common.core.constant.enums.DictTypeEnum; import com.pig4cloud.pig.common.core.util.R; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -37,7 +37,7 @@ import org.springframework.stereotype.Service; * @date 2019/03/19 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysDictItemServiceImpl extends ServiceImpl implements SysDictItemService { private final SysDictService dictService; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java index 7a150bf9fc063acc8f3b8f9f14b3a1b77bf3186a..a4339b9fb408d1b7939077fabface1256cd0eb41 100755 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysDictServiceImpl.java @@ -27,7 +27,7 @@ import com.pig4cloud.pig.admin.service.SysDictService; import com.pig4cloud.pig.common.core.constant.CacheConstants; import com.pig4cloud.pig.common.core.constant.enums.DictTypeEnum; import com.pig4cloud.pig.common.core.util.R; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,7 +39,7 @@ import org.springframework.transaction.annotation.Transactional; * @date 2019/03/19 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysDictServiceImpl extends ServiceImpl implements SysDictService { private final SysDictItemMapper dictItemMapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java index 5940cbf80d2002614368a0f2d8c0dd0c624ad377..d60aa24a03987e0c67c4d209f433f359eed9226a 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java @@ -33,7 +33,7 @@ import com.pig4cloud.pig.common.core.constant.CacheConstants; import com.pig4cloud.pig.common.core.constant.CommonConstants; import com.pig4cloud.pig.common.core.constant.enums.MenuTypeEnum; import com.pig4cloud.pig.common.core.util.R; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; @@ -53,7 +53,7 @@ import java.util.stream.Collectors; * @since 2017-10-29 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { private final SysRoleMenuMapper sysRoleMenuMapper; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java index d49c265e7c9deebbf5bd86d332a0e63e23cd8a39..4646e8789bfd32acd0920f1ff0d2382ad65cf9d1 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleMenuServiceImpl.java @@ -25,7 +25,7 @@ import com.pig4cloud.pig.admin.api.entity.SysRoleMenu; import com.pig4cloud.pig.admin.mapper.SysRoleMenuMapper; import com.pig4cloud.pig.admin.service.SysRoleMenuService; import com.pig4cloud.pig.common.core.constant.CacheConstants; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -44,7 +44,7 @@ import java.util.stream.Collectors; * @since 2019/2/1 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysRoleMenuServiceImpl extends ServiceImpl implements SysRoleMenuService { private final CacheManager cacheManager; diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java index a8e30501159045e945ac5d37fdf8298170c95553..5c4521eb10841427954a10683c160e70978c297d 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysRoleServiceImpl.java @@ -26,7 +26,7 @@ import com.pig4cloud.pig.admin.mapper.SysRoleMapper; import com.pig4cloud.pig.admin.mapper.SysRoleMenuMapper; import com.pig4cloud.pig.admin.service.SysRoleService; import com.pig4cloud.pig.common.core.constant.CacheConstants; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,9 +42,9 @@ import java.util.List; * @since 2019/2/1 */ @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysRoleServiceImpl extends ServiceImpl implements SysRoleService { - private SysRoleMenuMapper sysRoleMenuMapper; + private final SysRoleMenuMapper sysRoleMenuMapper; /** * 通过用户ID，查询角色信息 diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java index 8306a5fa087d92a3c3a3774efb0e97d437c878b1..6750c88a78d5abd4634e762e5324c16d594d5ac8 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysUserServiceImpl.java @@ -37,7 +37,7 @@ import com.pig4cloud.pig.admin.service.*; import com.pig4cloud.pig.common.core.constant.CacheConstants; import com.pig4cloud.pig.common.core.constant.CommonConstants; import com.pig4cloud.pig.common.core.util.R; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; @@ -59,7 +59,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -@AllArgsConstructor +@RequiredArgsConstructor public class SysUserServiceImpl extends ServiceImpl implements SysUserService { private static final PasswordEncoder ENCODER = new BCryptPasswordEncoder(); private final SysMenuService sysMenuService;