diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java index fe63beea7..223a53505 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/PigxAuthApplication.java @@ -23,8 +23,6 @@ package com.pig4cloud.pigx.auth; import org.springframework.boot.SpringApplication; import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.openfeign.EnableFeignClients; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; /** * @author lengleng diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/service/PigxUserDetailsServiceImpl.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/service/PigxUserDetailsServiceImpl.java index 4da2fc605..e3b41b968 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/service/PigxUserDetailsServiceImpl.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/service/PigxUserDetailsServiceImpl.java @@ -26,7 +26,6 @@ import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.feign.RemoteUserService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; -import com.pig4cloud.pigx.common.core.constant.enums.EnumLoginType; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.security.util.PigxUserDetailsService; import lombok.AllArgsConstructor; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationFilter.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationFilter.java index 257702b8c..7eb4fdb62 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationFilter.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationFilter.java @@ -28,7 +28,6 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.oauth2.provider.error.OAuth2AuthenticationEntryPoint; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter; import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationProvider.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationProvider.java index b43cad2cb..2eb72390b 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationProvider.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileAuthenticationProvider.java @@ -22,14 +22,12 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.MessageSourceAccessor; -import org.springframework.security.authentication.AuthenticationEventPublisher; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.SpringSecurityMessageSource; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationProcessingFilter; /** * @author lengleng diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileLoginSuccessHandler.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileLoginSuccessHandler.java index 0f8555dcd..69de555b3 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileLoginSuccessHandler.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/mobile/MobileLoginSuccessHandler.java @@ -21,7 +21,6 @@ import cn.hutool.core.util.CharsetUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.security.util.AuthUtils; -import lombok.AllArgsConstructor; import lombok.Builder; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.BadCredentialsException; diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java index d143f4d78..1851fb309 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/util/AuthUtils.java @@ -17,9 +17,9 @@ package com.pig4cloud.pigx.common.security.util; +import cn.hutool.core.codec.Base64; import cn.hutool.core.util.CharsetUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.crypto.codec.Base64; import javax.servlet.http.HttpServletRequest; import java.io.IOException; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java index cf0996c70..ff67a65d7 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java @@ -23,7 +23,8 @@ import com.baomidou.mybatisplus.annotations.TableLogic; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; import lombok.EqualsAndHashCode; - import java.io.Serializable; + +import java.io.Serializable; import java.time.LocalDateTime; /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java index 208a814de..aedf3f15c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java @@ -22,10 +22,10 @@ package com.pig4cloud.pigx.admin.controller; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.admin.api.entity.SysDict; import com.pig4cloud.pigx.admin.service.SysDictService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; +import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java index b5b1a468b..55e4fdae5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java @@ -22,10 +22,10 @@ package com.pig4cloud.pigx.admin.controller; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.admin.api.entity.SysLog; import com.pig4cloud.pigx.admin.service.SysLogService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; +import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java index 65252e3b5..522ebd202 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java @@ -21,9 +21,9 @@ package com.pig4cloud.pigx.admin.controller; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; +import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index 4f8799fd3..1684abc8e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -21,12 +21,12 @@ package com.pig4cloud.pigx.admin.controller; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.admin.api.dto.RoleDTO; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.service.SysRoleMenuService; import com.pig4cloud.pigx.admin.service.SysRoleService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; +import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java index b027e2305..1bf28f160 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java @@ -20,8 +20,8 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.admin.api.entity.SysRole; +import com.pig4cloud.pigx.common.core.util.Query; import java.util.List; import java.util.Map; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java index 7aa2af2ae..ae3b5e550 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java @@ -20,9 +20,9 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.vo.UserVO; +import com.pig4cloud.pigx.common.core.util.Query; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java index d35c8bb31..11435c5b2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java @@ -22,9 +22,9 @@ package com.pig4cloud.pigx.admin.service; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.admin.api.dto.RoleDTO; import com.pig4cloud.pigx.admin.api.entity.SysRole; +import com.pig4cloud.pigx.common.core.util.Query; import java.util.List; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java index 497e0c3cb..2c6d69a66 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java @@ -22,13 +22,13 @@ package com.pig4cloud.pigx.admin.service.impl; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.admin.api.dto.RoleDTO; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.api.entity.SysRoleDept; import com.pig4cloud.pigx.admin.mapper.SysRoleDeptMapper; import com.pig4cloud.pigx.admin.mapper.SysRoleMapper; import com.pig4cloud.pigx.admin.service.SysRoleService; +import com.pig4cloud.pigx.common.core.util.Query; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; 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 fcd37e757..6824dc4e7 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 @@ -22,7 +22,6 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; @@ -41,19 +40,15 @@ import com.pig4cloud.pigx.admin.service.SysUserService; import com.pig4cloud.pigx.common.core.constant.enums.EnumLoginType; import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; -import com.pig4cloud.pigx.common.security.social.WxSocialConfig; -import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; -import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import org.springframework.web.client.RestTemplate; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonApplication.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonApplication.java index cce51c6b2..070848200 100644 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonApplication.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/PigxDaemonApplication.java @@ -19,7 +19,6 @@ package com.pig4cloud.pigx.daemon; import com.pig4cloud.pigx.common.job.annotation.EnablePigxJob; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.SpringCloudApplication; /** diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java index ad092cada..3b64821b8 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/ExecutionLogController.java @@ -17,18 +17,16 @@ package com.pig4cloud.pigx.daemon.controller; -import java.util.Arrays; -import java.util.Map; - import com.baomidou.mybatisplus.mapper.EntityWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.common.core.util.Query; - +import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.daemon.entity.ExecutionLog; import com.pig4cloud.pigx.daemon.service.ExecutionLogService; -import com.pig4cloud.pigx.common.core.util.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; import java.util.Map; diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java index 478d61987..7645c4606 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/controller/StatusTraceLogController.java @@ -17,18 +17,16 @@ package com.pig4cloud.pigx.daemon.controller; -import java.util.Arrays; -import java.util.Map; - import com.baomidou.mybatisplus.mapper.EntityWrapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.plugins.Page; import com.pig4cloud.pigx.common.core.util.Query; - +import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.daemon.entity.StatusTraceLog; import com.pig4cloud.pigx.daemon.service.StatusTraceLogService; -import com.pig4cloud.pigx.common.core.util.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; import java.util.Map; diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java index e57d3184f..641a4dae6 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/entity/ExecutionLog.java @@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; import lombok.EqualsAndHashCode; - import java.io.Serializable; + +import java.io.Serializable; import java.time.LocalDateTime; /** - * + * * * @author lengleng * @date 2018-08-03 22:15:56 @@ -21,48 +22,48 @@ public class ExecutionLog extends Model { private static final long serialVersionUID = 1L; /** - * + * */ @TableId private String id; /** - * + * */ private String jobName; /** - * + * */ private String taskId; /** - * + * */ private String hostname; /** - * + * */ private String ip; /** - * + * */ private Integer shardingItem; /** - * + * */ private String executionSource; /** - * + * */ private String failureCause; /** - * + * */ private Integer isSuccess; /** - * + * */ private LocalDateTime startTime; /** - * + * */ private LocalDateTime completeTime; diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java index 81762b17b..0917ac896 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/entity/StatusTraceLog.java @@ -5,11 +5,12 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import lombok.Data; import lombok.EqualsAndHashCode; - import java.io.Serializable; + +import java.io.Serializable; import java.time.LocalDateTime; /** - * + * * * @author lengleng * @date 2018-08-03 22:15:45 @@ -21,48 +22,48 @@ public class StatusTraceLog extends Model { private static final long serialVersionUID = 1L; /** - * + * */ @TableId private String id; /** - * + * */ private String jobName; /** - * + * */ private String originalTaskId; /** - * + * */ private String taskId; /** - * + * */ private String slaveId; /** - * + * */ private String source; /** - * + * */ private String executionType; /** - * + * */ private String shardingItem; /** - * + * */ private String state; /** - * + * */ private String message; /** - * + * */ private LocalDateTime creationTime; diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java index fed6e61a0..06425591d 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/mapper/ExecutionLogMapper.java @@ -1,11 +1,11 @@ package com.pig4cloud.pigx.daemon.mapper; -import com.pig4cloud.pigx.daemon.entity.ExecutionLog; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.pig4cloud.pigx.daemon.entity.ExecutionLog; import org.apache.ibatis.annotations.Mapper; /** - * + * * * @author lengleng * @date 2018-08-03 22:15:56 diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java index 58ae2daca..2aaab559d 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/mapper/StatusTraceLogMapper.java @@ -1,11 +1,11 @@ package com.pig4cloud.pigx.daemon.mapper; -import com.pig4cloud.pigx.daemon.entity.StatusTraceLog; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.pig4cloud.pigx.daemon.entity.StatusTraceLog; import org.apache.ibatis.annotations.Mapper; /** - * + * * * @author lengleng * @date 2018-08-03 22:15:45 diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java index 5d556c26c..cc1ffc801 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/service/impl/ExecutionLogServiceImpl.java @@ -1,16 +1,16 @@ package com.pig4cloud.pigx.daemon.service.impl; -import org.springframework.stereotype.Service; -import java.util.Map; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; - -import com.pig4cloud.pigx.daemon.mapper.ExecutionLogMapper; import com.pig4cloud.pigx.daemon.entity.ExecutionLog; +import com.pig4cloud.pigx.daemon.mapper.ExecutionLogMapper; import com.pig4cloud.pigx.daemon.service.ExecutionLogService; +import org.springframework.stereotype.Service; - +/** + * @author lengleng + * @date 2018年08月16日 + * elastic-job 任务日志处理 + */ @Service("executionLogService") public class ExecutionLogServiceImpl extends ServiceImpl implements ExecutionLogService { diff --git a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java index 9937f7712..0613cafb6 100755 --- a/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java +++ b/pigx-visual/pigx-daemon/src/main/java/com/pig4cloud/pigx/daemon/service/impl/StatusTraceLogServiceImpl.java @@ -1,16 +1,16 @@ package com.pig4cloud.pigx.daemon.service.impl; -import org.springframework.stereotype.Service; -import java.util.Map; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; - -import com.pig4cloud.pigx.daemon.mapper.StatusTraceLogMapper; import com.pig4cloud.pigx.daemon.entity.StatusTraceLog; +import com.pig4cloud.pigx.daemon.mapper.StatusTraceLogMapper; import com.pig4cloud.pigx.daemon.service.StatusTraceLogService; +import org.springframework.stereotype.Service; - +/** + * @author lengleng + * @date 2018年08月16日 + * elastic-job 任务轨迹处理 + */ @Service("statusTraceLogService") public class StatusTraceLogServiceImpl extends ServiceImpl implements StatusTraceLogService {