diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java index 2d2c15907..6cad348ff 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/config/AuthorizationServerConfig.java @@ -82,7 +82,6 @@ public class AuthorizationServerConfig extends AuthorizationServerConfigurerAdap } - @Bean public TokenStore tokenStore() { RedisTokenStore tokenStore = new RedisTokenStore(redisConnectionFactory); diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfig.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfig.java index 14a5952a6..b7690817c 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfig.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/config/JacksonConfig.java @@ -55,9 +55,9 @@ public class JacksonConfig { javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); javaTimeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); javaTimeModule.addSerializer(LocalTime.class, new LocalTimeSerializer(DateTimeFormatter.ofPattern("HH:mm:ss"))); - javaTimeModule.addDeserializer(LocalDateTime.class,new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); - javaTimeModule.addDeserializer(LocalDate.class,new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - javaTimeModule.addDeserializer(LocalTime.class,new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss"))); + javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))); + javaTimeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + javaTimeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateTimeFormatter.ofPattern("HH:mm:ss"))); objectMapper.registerModule(javaTimeModule); return objectMapper; } diff --git a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java index 0b55b399b..aac5ee234 100644 --- a/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java +++ b/pigx-common/pigx-common-log/src/main/java/com/pig4cloud/pigx/common/log/aspect/SysLogAspect.java @@ -19,10 +19,10 @@ package com.pig4cloud.pigx.common.log.aspect; +import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.common.log.event.SysLogEvent; import com.pig4cloud.pigx.common.log.util.SysLogUtils; -import com.pig4cloud.pigx.common.core.util.SpringContextHolder; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java index f5beabd98..7ebd5bb12 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxWebResponseExceptionTranslator.java @@ -75,7 +75,7 @@ public class PigxWebResponseExceptionTranslator implements WebResponseExceptionT return handleOAuth2Exception(new MethodNotAllowed(ase.getMessage(), ase)); } - ase = (OAuth2Exception) throwableAnalyzer.getFirstThrowableOfType( + ase = (OAuth2Exception) throwableAnalyzer.getFirstThrowableOfType( OAuth2Exception.class, causeChain); if (ase != null) { diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java index e50e2299d..d5987914d 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/exception/PigxAuth2Exception.java @@ -19,8 +19,6 @@ package com.pig4cloud.pigx.common.security.exception; import org.springframework.security.oauth2.common.exceptions.OAuth2Exception; -import java.util.Map; - /** * @author lengleng * @date 2018/7/8 diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerAutoConfiguration.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerAutoConfiguration.java index 97afe4707..b7e404104 100644 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerAutoConfiguration.java +++ b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerAutoConfiguration.java @@ -46,16 +46,15 @@ import java.util.List; @EnableAutoConfiguration public class SwaggerAutoConfiguration { + private static final String DEFAULT_EXCLUDE_PATH = "/error"; + private static final String BASE_PATH = "/**"; + @Bean @ConditionalOnMissingBean public SwaggerProperties swaggerProperties() { return new SwaggerProperties(); } - private static final String DEFAULT_EXCLUDE_PATH = "/error"; - private static final String BASE_PATH = "/**"; - - @Bean public Docket api(SwaggerProperties swaggerProperties) { // base-path处理 diff --git a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerProperties.java b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerProperties.java index 2a0a738d3..8c0223cbd 100644 --- a/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerProperties.java +++ b/pigx-common/pigx-common-swagger/src/main/java/com/pig4cloud/pigx/common/swagger/config/SwaggerProperties.java @@ -120,7 +120,7 @@ public class SwaggerProperties { */ private List authorizationScopeList = new ArrayList<>(); - private List tokenUrlList =new ArrayList<>(); + private List tokenUrlList = new ArrayList<>(); } @Data diff --git a/pigx-common/pigx-common-swagger/src/main/resources/META-INF/spring-devtools.properties b/pigx-common/pigx-common-swagger/src/main/resources/META-INF/spring-devtools.properties deleted file mode 100644 index b1fe69c3d..000000000 --- a/pigx-common/pigx-common-swagger/src/main/resources/META-INF/spring-devtools.properties +++ /dev/null @@ -1 +0,0 @@ -restart.include.pigx-common-security=/pigx-common-swagger[\\w-]+\.jar diff --git a/pigx-common/pigx-common-swagger/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-swagger/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 1fdb305f4..000000000 --- a/pigx-common/pigx-common-swagger/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.pig4cloud.pigx.common.swagger.config.SwaggerAutoConfiguration diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ImageCodeGatewayFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ImageCodeGatewayFilter.java index ee7bcefe5..7ebd861a8 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ImageCodeGatewayFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/ImageCodeGatewayFilter.java @@ -45,98 +45,12 @@ import java.io.IOException; public class ImageCodeGatewayFilter extends AbstractGatewayFilterFactory { public static final String DEFAULT_CODE_KEY = "DEFAULT_CODE_KEY"; public static final String OAUTH_TOKEN_URL = "/oauth/token"; + private static final String BASIC_ = "Basic "; @Autowired private RedisTemplate redisTemplate; @Autowired private FilterIgnorePropertiesConfig filterIgnorePropertiesConfig; - @Override - public GatewayFilter apply(Object config) { - return (exchange, chain) -> { - ServerHttpRequest request = exchange.getRequest(); - - // 不是登录请求，直接向下执行 - if (!StrUtil.containsAnyIgnoreCase(request.getURI().getPath(), OAUTH_TOKEN_URL)) { - return chain.filter(exchange); - } - - // 终端设置不校验， 直接向下执行(1. 从请求参数中获取 2.从header取) - String clientId = request.getQueryParams().getFirst("client_id"); - if (StrUtil.isNotBlank(clientId)) { - if (filterIgnorePropertiesConfig.getClients().contains(clientId)) { - return chain.filter(exchange); - } - } - try { - String[] clientInfos = extractAndDecodeHeader(request); - if (filterIgnorePropertiesConfig.getClients().contains(clientInfos[0])) { - return chain.filter(exchange); - } - } catch (Exception e) { - ServerHttpResponse response = exchange.getResponse(); - response.setStatusCode(HttpStatus.PRECONDITION_REQUIRED); - return response.setComplete(); - } - - //校验验证码合法性 - try { - checkCode(request); - } catch (ValidateCodeException e) { - ServerHttpResponse response = exchange.getResponse(); - response.setStatusCode(HttpStatus.PRECONDITION_REQUIRED); - return response.setComplete(); - } - - return chain.filter(exchange); - }; - } - - - /** - * 检查code - * - * @param request - * @throws ValidateCodeException 校验异常 - */ - private void checkCode(ServerHttpRequest request) throws ValidateCodeException { - String code = request.getQueryParams().getFirst("code"); - - if (StrUtil.isBlank(code)) { - throw new ValidateCodeException(); - } - - String randomStr = request.getQueryParams().getFirst("randomStr"); - if (StrUtil.isBlank(randomStr)) { - throw new ValidateCodeException(); - } - - String key = DEFAULT_CODE_KEY + randomStr; - if (!redisTemplate.hasKey(key)) { - throw new ValidateCodeException(); - } - - Object codeObj = redisTemplate.opsForValue().get(key); - - if (codeObj == null) { - throw new ValidateCodeException(); - } - - String saveCode = codeObj.toString(); - if (StrUtil.isBlank(saveCode)) { - redisTemplate.delete(key); - throw new ValidateCodeException(); - } - - if (!StrUtil.equals(saveCode, code)) { - redisTemplate.delete(key); - throw new ValidateCodeException(); - } - - redisTemplate.delete(key); - } - - private static final String BASIC_ = "Basic "; - /** * 从header 请求中的clientId/clientsecect * @@ -183,4 +97,88 @@ public class ImageCodeGatewayFilter extends AbstractGatewayFilterFactory { return extractAndDecodeHeader(header); } + + @Override + public GatewayFilter apply(Object config) { + return (exchange, chain) -> { + ServerHttpRequest request = exchange.getRequest(); + + // 不是登录请求，直接向下执行 + if (!StrUtil.containsAnyIgnoreCase(request.getURI().getPath(), OAUTH_TOKEN_URL)) { + return chain.filter(exchange); + } + + // 终端设置不校验， 直接向下执行(1. 从请求参数中获取 2.从header取) + String clientId = request.getQueryParams().getFirst("client_id"); + if (StrUtil.isNotBlank(clientId)) { + if (filterIgnorePropertiesConfig.getClients().contains(clientId)) { + return chain.filter(exchange); + } + } + try { + String[] clientInfos = extractAndDecodeHeader(request); + if (filterIgnorePropertiesConfig.getClients().contains(clientInfos[0])) { + return chain.filter(exchange); + } + } catch (Exception e) { + ServerHttpResponse response = exchange.getResponse(); + response.setStatusCode(HttpStatus.PRECONDITION_REQUIRED); + return response.setComplete(); + } + + //校验验证码合法性 + try { + checkCode(request); + } catch (ValidateCodeException e) { + ServerHttpResponse response = exchange.getResponse(); + response.setStatusCode(HttpStatus.PRECONDITION_REQUIRED); + return response.setComplete(); + } + + return chain.filter(exchange); + }; + } + + /** + * 检查code + * + * @param request + * @throws ValidateCodeException 校验异常 + */ + private void checkCode(ServerHttpRequest request) throws ValidateCodeException { + String code = request.getQueryParams().getFirst("code"); + + if (StrUtil.isBlank(code)) { + throw new ValidateCodeException(); + } + + String randomStr = request.getQueryParams().getFirst("randomStr"); + if (StrUtil.isBlank(randomStr)) { + throw new ValidateCodeException(); + } + + String key = DEFAULT_CODE_KEY + randomStr; + if (!redisTemplate.hasKey(key)) { + throw new ValidateCodeException(); + } + + Object codeObj = redisTemplate.opsForValue().get(key); + + if (codeObj == null) { + throw new ValidateCodeException(); + } + + String saveCode = codeObj.toString(); + if (StrUtil.isBlank(saveCode)) { + redisTemplate.delete(key); + throw new ValidateCodeException(); + } + + if (!StrUtil.equals(saveCode, code)) { + redisTemplate.delete(key); + throw new ValidateCodeException(); + } + + redisTemplate.delete(key); + } } diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java index 025869e90..4c9394c37 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/filter/PasswordDecoderFilter.java @@ -50,6 +50,15 @@ public class PasswordDecoderFilter extends AbstractGatewayFilterFactory { @Value("${security.encode.key:1234567812345678}") private String encodeKey; + private static String decryptAES(String data, String pass) throws Exception { + Cipher cipher = Cipher.getInstance(DEFAULT_CIPHER_ALGORITHM); + SecretKeySpec keyspec = new SecretKeySpec(pass.getBytes(), KEY_ALGORITHM); + IvParameterSpec ivspec = new IvParameterSpec(pass.getBytes()); + cipher.init(Cipher.DECRYPT_MODE, keyspec, ivspec); + byte[] result = cipher.doFinal(Base64.decode(data.getBytes(CharsetUtil.UTF_8))); + return new String(result, CharsetUtil.UTF_8); + } + @Override public GatewayFilter apply(Object config) { return (exchange, chain) -> { @@ -84,14 +93,4 @@ public class PasswordDecoderFilter extends AbstractGatewayFilterFactory { return chain.filter(exchange.mutate().request(newRequest).build()); }; } - - - private static String decryptAES(String data, String pass) throws Exception { - Cipher cipher = Cipher.getInstance(DEFAULT_CIPHER_ALGORITHM); - SecretKeySpec keyspec = new SecretKeySpec(pass.getBytes(), KEY_ALGORITHM); - IvParameterSpec ivspec = new IvParameterSpec(pass.getBytes()); - cipher.init(Cipher.DECRYPT_MODE, keyspec, ivspec); - byte[] result = cipher.doFinal(Base64.decode(data.getBytes(CharsetUtil.UTF_8))); - return new String(result, CharsetUtil.UTF_8); - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java index 3c4e9619b..dd1b897ef 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java @@ -26,7 +26,6 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; /** *

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index f3c602310..073bff67b 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -28,7 +28,6 @@ import lombok.Data; import java.io.Serializable; import java.time.LocalDateTime; -import java.util.Date; /** *

diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java index 319dc394f..0682f6775 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteUserService.java @@ -29,19 +29,19 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestHeader; /** - * @author lengleng - * @date 2018/6/22 - */ - @FeignClient(value = ServiceNameConstant.UMPS_SERVICE, fallback = RemoteUserServiceFallbackImpl.class) - public interface RemoteUserService { - /** - * 通过用户名查询用户、角色信息 - * - * @param username 用户名 - * @param from 调用标志 - * @return R - */ - @GetMapping("/user/info/{username}") - R info(@PathVariable("username") String username - , @RequestHeader("from") String from); - } + * @author lengleng + * @date 2018/6/22 + */ +@FeignClient(value = ServiceNameConstant.UMPS_SERVICE, fallback = RemoteUserServiceFallbackImpl.class) +public interface RemoteUserService { + /** + * 通过用户名查询用户、角色信息 + * + * @param username 用户名 + * @param from 调用标志 + * @return R + */ + @GetMapping("/user/info/{username}") + R info(@PathVariable("username") String username + , @RequestHeader("from") String from); +} diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ResourceServerConfigurer.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ResourceServerConfigurer.java index b5fe5d4d3..e8746b16c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ResourceServerConfigurer.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/ResourceServerConfigurer.java @@ -44,7 +44,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter { @Override public void configure(HttpSecurity http) throws Exception { http.authorizeRequests() - .antMatchers("/actuator/**", "/user/info/*", "/log/**","/v2/api-docs").permitAll() + .antMatchers("/actuator/**", "/user/info/*", "/log/**", "/v2/api-docs").permitAll() .anyRequest().authenticated() .and().csrf().disable(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java index 52883b095..4f7c13059 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java @@ -99,7 +99,7 @@ public class UserController { @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_user_del')") @ApiOperation(value = "删除用户", notes = "根据ID删除用户") - @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "int", paramType = "path",example = "1000") + @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "int", paramType = "path", example = "1000") public R userDel(@PathVariable Integer id) { SysUser sysUser = userService.selectById(id); return new R<>(userService.deleteUserById(sysUser)); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index 5d06acc8a..14e58c617 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -35,7 +35,6 @@ import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index 1f8c322d5..b5f398e5b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -19,7 +19,6 @@ package com.pig4cloud.pigx.admin.service.impl; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysMenu; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index f03bcf276..c9fef45fe 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -50,7 +50,10 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; /** * @author lengleng diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java index ccc7523d4..607c452c1 100644 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/job/PigxDataflowJob.java @@ -28,13 +28,13 @@ import java.util.List; */ public class PigxDataflowJob implements DataflowJob { - @Override - public List fetchData(ShardingContext shardingContext) { - return null; - } + @Override + public List fetchData(ShardingContext shardingContext) { + return null; + } - @Override - public void processData(ShardingContext shardingContext, List list) { + @Override + public void processData(ShardingContext shardingContext, List list) { - } + } } diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java index 5310ba65b..9dacecacb 100644 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/job/PigxSimpleJob.java @@ -28,13 +28,13 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j public class PigxSimpleJob implements SimpleJob { - /** - * 业务执行逻辑 - * - * @param shardingContext 分片信息 - */ - @Override - public void execute(ShardingContext shardingContext) { - log.info("shardingContext:{}", shardingContext); - } + /** + * 业务执行逻辑 + * + * @param shardingContext 分片信息 + */ + @Override + public void execute(ShardingContext shardingContext) { + log.info("shardingContext:{}", shardingContext); + } }