diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/RequestMethodException.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/RequestMethodException.java index c3e5f00a..a1ad04ff 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/RequestMethodException.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/exception/RequestMethodException.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.core.exception; -import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; import lombok.Getter; +import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; /** * 请求方法异常 diff --git a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/IpAddressUtil.java b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/IpAddressUtil.java index d4b30f37..a6e79d74 100644 --- a/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/IpAddressUtil.java +++ b/snowy-base/snowy-core/src/main/java/vip/xiaonuo/core/util/IpAddressUtil.java @@ -34,7 +34,6 @@ import com.alibaba.fastjson.JSONPath; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.core.context.constant.ConstantContextHolder; -import vip.xiaonuo.core.context.requestno.RequestNoContext; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/CacheConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/CacheConfig.java index 38152c52..98f8098e 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/CacheConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/CacheConfig.java @@ -26,6 +26,8 @@ package vip.xiaonuo.sys.config; import cn.hutool.cache.CacheUtil; import cn.hutool.cache.impl.TimedCache; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.StringRedisSerializer; @@ -33,9 +35,8 @@ import vip.xiaonuo.core.pojo.login.SysLoginUser; import vip.xiaonuo.sys.core.cache.MappingCache; import vip.xiaonuo.sys.core.cache.ResourceCache; import vip.xiaonuo.sys.core.cache.UserCache; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import vip.xiaonuo.sys.core.redis.FastJson2JsonRedisSerializer; + import java.util.Map; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/FileConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/FileConfig.java index 4c1e8b46..6515644f 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/FileConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/FileConfig.java @@ -25,12 +25,12 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.config; import cn.hutool.core.util.ObjectUtil; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.file.FileOperator; import vip.xiaonuo.core.file.modular.local.LocalFileOperator; import vip.xiaonuo.core.file.modular.local.prop.LocalFileProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * 文件存储的配置 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/MailSenderConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/MailSenderConfig.java index 65edf337..b82b143d 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/MailSenderConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/MailSenderConfig.java @@ -26,12 +26,12 @@ package vip.xiaonuo.sys.config; import cn.hutool.core.bean.BeanUtil; import cn.hutool.extra.mail.MailAccount; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.email.MailSender; import vip.xiaonuo.core.email.modular.SimpleMailSender; import vip.xiaonuo.core.pojo.email.EmailConfigs; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * 邮件发送控制器 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/MybatisConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/MybatisConfig.java index 4716ebbd..b4519aea 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/MybatisConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/MybatisConfig.java @@ -26,14 +26,13 @@ package vip.xiaonuo.sys.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import vip.xiaonuo.sys.core.mybatis.dbid.SnowyDatabaseIdProvider; -import vip.xiaonuo.sys.core.mybatis.fieldfill.CustomMetaObjectHandler; -import vip.xiaonuo.sys.core.mybatis.sqlfilter.DemoProfileSqlInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import vip.xiaonuo.sys.core.mybatis.dbid.SnowyDatabaseIdProvider; +import vip.xiaonuo.sys.core.mybatis.fieldfill.CustomMetaObjectHandler; +import vip.xiaonuo.sys.core.mybatis.sqlfilter.DemoProfileSqlInterceptor; /** * mybatis扩展插件配置 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SmsSenderConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SmsSenderConfig.java index b0910c27..f1747104 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SmsSenderConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SmsSenderConfig.java @@ -25,14 +25,14 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.config; import cn.hutool.core.bean.BeanUtil; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.pojo.sms.AliyunSmsConfigs; import vip.xiaonuo.core.sms.SmsSender; import vip.xiaonuo.core.sms.modular.aliyun.AliyunSmsSender; import vip.xiaonuo.core.sms.modular.aliyun.msign.impl.MapBasedMultiSignManager; import vip.xiaonuo.core.sms.modular.aliyun.prop.AliyunSmsProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; /** * 短信发送配置，短信发送的配置属性都在数据库的sys_config表中 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SpringSecurityConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SpringSecurityConfig.java index e3d0a9f3..bded75bc 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SpringSecurityConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/SpringSecurityConfig.java @@ -24,10 +24,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.config; -import vip.xiaonuo.core.consts.SpringSecurityConstant; -import vip.xiaonuo.sys.core.filter.security.JwtAuthenticationTokenFilter; -import vip.xiaonuo.sys.core.filter.security.entrypoint.JwtAuthenticationEntryPoint; -import vip.xiaonuo.sys.modular.auth.service.impl.AuthServiceImpl; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -37,6 +33,10 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; +import vip.xiaonuo.core.consts.SpringSecurityConstant; +import vip.xiaonuo.sys.core.filter.security.JwtAuthenticationTokenFilter; +import vip.xiaonuo.sys.core.filter.security.entrypoint.JwtAuthenticationEntryPoint; +import vip.xiaonuo.sys.modular.auth.service.impl.AuthServiceImpl; import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/WebMvcConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/WebMvcConfig.java index 51d4e8e9..023361e8 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/WebMvcConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/config/WebMvcConfig.java @@ -24,11 +24,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.config; -import vip.xiaonuo.core.web.SnowyRequestResponseBodyMethodProcessor; -import vip.xiaonuo.sys.core.error.SnowyErrorAttributes; -import vip.xiaonuo.sys.core.filter.RequestNoFilter; -import vip.xiaonuo.sys.core.filter.xss.XssFilter; -import vip.xiaonuo.sys.core.validator.SnowyValidator; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.boot.web.servlet.FilterRegistrationBean; @@ -39,6 +34,11 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; +import vip.xiaonuo.core.web.SnowyRequestResponseBodyMethodProcessor; +import vip.xiaonuo.sys.core.error.SnowyErrorAttributes; +import vip.xiaonuo.sys.core.filter.RequestNoFilter; +import vip.xiaonuo.sys.core.filter.xss.XssFilter; +import vip.xiaonuo.sys.core.validator.SnowyValidator; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/BusinessLogAop.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/BusinessLogAop.java index 7792aac5..1ec31458 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/BusinessLogAop.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/BusinessLogAop.java @@ -26,12 +26,6 @@ package vip.xiaonuo.sys.core.aop; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; -import vip.xiaonuo.core.annotion.BusinessLog; -import vip.xiaonuo.core.consts.AopSortConstant; -import vip.xiaonuo.core.consts.CommonConstant; -import vip.xiaonuo.core.context.login.LoginContextHolder; -import vip.xiaonuo.core.pojo.login.SysLoginUser; -import vip.xiaonuo.sys.core.log.LogManager; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterThrowing; @@ -39,6 +33,12 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.core.annotation.Order; +import vip.xiaonuo.core.annotion.BusinessLog; +import vip.xiaonuo.core.consts.AopSortConstant; +import vip.xiaonuo.core.consts.CommonConstant; +import vip.xiaonuo.core.context.login.LoginContextHolder; +import vip.xiaonuo.core.pojo.login.SysLoginUser; +import vip.xiaonuo.sys.core.log.LogManager; import java.lang.reflect.Method; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/DataScopeAop.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/DataScopeAop.java index bc87811c..704f2d44 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/DataScopeAop.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/DataScopeAop.java @@ -24,14 +24,14 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.core.aop; -import vip.xiaonuo.core.consts.AopSortConstant; -import vip.xiaonuo.core.context.login.LoginContextHolder; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.annotation.Pointcut; import org.springframework.core.annotation.Order; +import vip.xiaonuo.core.consts.AopSortConstant; +import vip.xiaonuo.core.context.login.LoginContextHolder; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/PermissionAop.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/PermissionAop.java index 61142542..031f8ef4 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/PermissionAop.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/PermissionAop.java @@ -26,6 +26,12 @@ package vip.xiaonuo.sys.core.aop; import cn.hutool.core.util.StrUtil; import cn.hutool.log.Log; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.core.annotation.Order; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.consts.AopSortConstant; @@ -36,12 +42,6 @@ import vip.xiaonuo.core.exception.PermissionException; import vip.xiaonuo.core.exception.enums.PermissionExceptionEnum; import vip.xiaonuo.core.util.HttpServletUtil; import vip.xiaonuo.sys.core.log.LogManager; -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.core.annotation.Order; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/WrapperAop.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/WrapperAop.java index b94d043e..c0a56b79 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/WrapperAop.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/aop/WrapperAop.java @@ -29,6 +29,12 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.log.Log; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.core.annotation.Order; import vip.xiaonuo.core.annotion.Wrapper; import vip.xiaonuo.core.consts.AopSortConstant; import vip.xiaonuo.core.exception.ServiceException; @@ -36,12 +42,6 @@ import vip.xiaonuo.core.exception.enums.WrapperExceptionEnum; import vip.xiaonuo.core.pojo.base.wrapper.BaseWrapper; import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.core.pojo.response.ResponseData; -import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; -import org.aspectj.lang.reflect.MethodSignature; -import org.springframework.core.annotation.Order; import java.lang.reflect.Array; import java.lang.reflect.Method; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractRedisCacheOperator.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractRedisCacheOperator.java index 3ee89d1e..0daee8c6 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractRedisCacheOperator.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/cache/base/AbstractRedisCacheOperator.java @@ -26,9 +26,10 @@ package vip.xiaonuo.sys.core.cache.base; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import org.springframework.data.redis.core.RedisTemplate; import vip.xiaonuo.core.cache.CacheOperator; import vip.xiaonuo.core.consts.SymbolConstant; -import org.springframework.data.redis.core.RedisTemplate; + import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/context/SystemContextImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/context/SystemContextImpl.java index 57f671af..1a058c3d 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/context/SystemContextImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/context/SystemContextImpl.java @@ -29,6 +29,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.log.Log; import com.baomidou.mybatisplus.extension.toolkit.SqlRunner; +import org.springframework.stereotype.Component; import vip.xiaonuo.core.context.system.SystemContext; import vip.xiaonuo.core.pojo.base.validate.UniqueValidateParam; import vip.xiaonuo.core.pojo.login.SysLoginUser; @@ -40,7 +41,6 @@ import vip.xiaonuo.sys.modular.role.service.SysRoleService; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.param.SysUserParam; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/error/GlobalExceptionHandler.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/error/GlobalExceptionHandler.java index 05b3c5f2..57db3102 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/error/GlobalExceptionHandler.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/error/GlobalExceptionHandler.java @@ -28,21 +28,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.log.Log; -import vip.xiaonuo.core.consts.AopSortConstant; -import vip.xiaonuo.core.consts.CommonConstant; -import vip.xiaonuo.core.consts.SymbolConstant; -import vip.xiaonuo.core.context.requestno.RequestNoContext; -import vip.xiaonuo.core.exception.AuthException; -import vip.xiaonuo.core.exception.DemoException; -import vip.xiaonuo.core.exception.PermissionException; -import vip.xiaonuo.core.exception.ServiceException; -import vip.xiaonuo.core.exception.enums.*; -import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; -import vip.xiaonuo.core.pojo.response.ErrorResponseData; -import vip.xiaonuo.core.sms.modular.aliyun.exp.AliyunSmsException; -import vip.xiaonuo.core.sms.modular.tencent.exp.TencentSmsException; -import vip.xiaonuo.core.util.HttpServletUtil; -import vip.xiaonuo.core.util.ResponseUtil; import org.apache.ibatis.exceptions.PersistenceException; import org.mybatis.spring.MyBatisSystemException; import org.springframework.core.annotation.Order; @@ -60,6 +45,21 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.servlet.NoHandlerFoundException; +import vip.xiaonuo.core.consts.AopSortConstant; +import vip.xiaonuo.core.consts.CommonConstant; +import vip.xiaonuo.core.consts.SymbolConstant; +import vip.xiaonuo.core.context.requestno.RequestNoContext; +import vip.xiaonuo.core.exception.AuthException; +import vip.xiaonuo.core.exception.DemoException; +import vip.xiaonuo.core.exception.PermissionException; +import vip.xiaonuo.core.exception.ServiceException; +import vip.xiaonuo.core.exception.enums.*; +import vip.xiaonuo.core.exception.enums.abs.AbstractBaseExceptionEnum; +import vip.xiaonuo.core.pojo.response.ErrorResponseData; +import vip.xiaonuo.core.sms.modular.aliyun.exp.AliyunSmsException; +import vip.xiaonuo.core.sms.modular.tencent.exp.TencentSmsException; +import vip.xiaonuo.core.util.HttpServletUtil; +import vip.xiaonuo.core.util.ResponseUtil; import javax.servlet.http.HttpServletRequest; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/error/SnowyErrorAttributes.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/error/SnowyErrorAttributes.java index 22d17ce0..f4d10582 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/error/SnowyErrorAttributes.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/error/SnowyErrorAttributes.java @@ -26,13 +26,13 @@ package vip.xiaonuo.sys.core.error; import cn.hutool.core.bean.BeanUtil; import cn.hutool.http.HttpStatus; +import org.springframework.boot.web.error.ErrorAttributeOptions; +import org.springframework.boot.web.servlet.error.DefaultErrorAttributes; +import org.springframework.web.context.request.WebRequest; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.exception.enums.PermissionExceptionEnum; import vip.xiaonuo.core.exception.enums.ServerExceptionEnum; import vip.xiaonuo.core.pojo.response.ErrorResponseData; -import org.springframework.boot.web.error.ErrorAttributeOptions; -import org.springframework.boot.web.servlet.error.DefaultErrorAttributes; -import org.springframework.web.context.request.WebRequest; import java.util.Map; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/filter/security/JwtAuthenticationTokenFilter.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/filter/security/JwtAuthenticationTokenFilter.java index 6465d0e0..7006d6ee 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/filter/security/JwtAuthenticationTokenFilter.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/filter/security/JwtAuthenticationTokenFilter.java @@ -27,17 +27,16 @@ package vip.xiaonuo.sys.core.filter.security; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.log.Log; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; import vip.xiaonuo.core.context.requestno.RequestNoContext; import vip.xiaonuo.core.exception.AuthException; import vip.xiaonuo.core.exception.enums.ServerExceptionEnum; import vip.xiaonuo.core.pojo.login.SysLoginUser; import vip.xiaonuo.core.util.ResponseUtil; import vip.xiaonuo.sys.modular.auth.service.AuthService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; -import javax.annotation.Resource; import javax.servlet.FilterChain; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/filter/security/entrypoint/JwtAuthenticationEntryPoint.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/filter/security/entrypoint/JwtAuthenticationEntryPoint.java index 874a6af8..14954432 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/filter/security/entrypoint/JwtAuthenticationEntryPoint.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/filter/security/entrypoint/JwtAuthenticationEntryPoint.java @@ -26,15 +26,15 @@ package vip.xiaonuo.sys.core.filter.security.entrypoint; import cn.hutool.core.util.ObjectUtil; import cn.hutool.log.Log; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.exception.enums.AuthExceptionEnum; import vip.xiaonuo.core.exception.enums.PermissionExceptionEnum; import vip.xiaonuo.core.exception.enums.ServerExceptionEnum; import vip.xiaonuo.core.util.ResponseUtil; import vip.xiaonuo.sys.core.cache.ResourceCache; -import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.AuthenticationEntryPoint; -import org.springframework.stereotype.Component; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/jwt/JwtTokenUtil.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/jwt/JwtTokenUtil.java index b2a680ab..4ddc6a67 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/jwt/JwtTokenUtil.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/jwt/JwtTokenUtil.java @@ -28,8 +28,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import vip.xiaonuo.core.context.constant.ConstantContextHolder; import io.jsonwebtoken.*; +import vip.xiaonuo.core.context.constant.ConstantContextHolder; import java.util.Date; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/ConstantsInitListener.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/ConstantsInitListener.java index cabb7edf..e6f61b98 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/ConstantsInitListener.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/ConstantsInitListener.java @@ -30,15 +30,15 @@ import cn.hutool.db.Entity; import cn.hutool.db.handler.EntityListHandler; import cn.hutool.db.sql.SqlExecutor; import cn.hutool.log.Log; +import org.springframework.boot.context.event.ApplicationContextInitializedEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.core.Ordered; +import org.springframework.core.env.ConfigurableEnvironment; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.context.constant.ConstantContext; import vip.xiaonuo.core.enums.CommonStatusEnum; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.sys.modular.consts.enums.SysConfigExceptionEnum; -import org.springframework.boot.context.event.ApplicationContextInitializedEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.core.Ordered; -import org.springframework.core.env.ConfigurableEnvironment; import java.sql.Connection; import java.sql.DriverManager; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/RemoveRequestParamListener.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/RemoveRequestParamListener.java index 04fc6e72..1856b656 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/RemoveRequestParamListener.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/RemoveRequestParamListener.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.core.listener; -import vip.xiaonuo.core.context.param.RequestParamContext; import org.springframework.context.ApplicationListener; import org.springframework.web.context.support.ServletRequestHandledEvent; +import vip.xiaonuo.core.context.param.RequestParamContext; /** * 用来清除临时缓存的@RequestBody的请求参数 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/ResourceCollectListener.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/ResourceCollectListener.java index 1f701568..2d66948c 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/ResourceCollectListener.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/ResourceCollectListener.java @@ -27,12 +27,12 @@ package vip.xiaonuo.sys.core.listener; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.log.Log; -import vip.xiaonuo.sys.core.cache.ResourceCache; import org.springframework.boot.CommandLineRunner; import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; +import vip.xiaonuo.sys.core.cache.ResourceCache; import javax.annotation.Resource; import java.util.Collection; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/TimerTaskRunListener.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/TimerTaskRunListener.java index 34744cdb..9ed0bad7 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/TimerTaskRunListener.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/listener/TimerTaskRunListener.java @@ -26,14 +26,14 @@ package vip.xiaonuo.sys.core.listener; import cn.hutool.cron.CronUtil; import cn.hutool.extra.spring.SpringUtil; +import org.springframework.boot.context.event.ApplicationStartedEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.core.Ordered; import vip.xiaonuo.sys.modular.timer.entity.SysTimers; import vip.xiaonuo.sys.modular.timer.enums.TimerJobStatusEnum; import vip.xiaonuo.sys.modular.timer.param.SysTimersParam; import vip.xiaonuo.sys.modular.timer.service.SysTimersService; import vip.xiaonuo.sys.modular.timer.service.TimerExeService; -import org.springframework.boot.context.event.ApplicationStartedEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.core.Ordered; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/LogManager.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/LogManager.java index abab0315..95e7efc2 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/LogManager.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/LogManager.java @@ -25,6 +25,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.core.log; import cn.hutool.core.util.ObjectUtil; +import org.aspectj.lang.JoinPoint; +import org.springframework.scheduling.concurrent.ScheduledExecutorFactoryBean; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.exception.ServiceException; @@ -36,8 +38,6 @@ import vip.xiaonuo.sys.core.log.factory.LogFactory; import vip.xiaonuo.sys.core.log.factory.LogTaskFactory; import vip.xiaonuo.sys.modular.log.entity.SysOpLog; import vip.xiaonuo.sys.modular.log.entity.SysVisLog; -import org.aspectj.lang.JoinPoint; -import org.springframework.scheduling.concurrent.ScheduledExecutorFactoryBean; import javax.servlet.http.HttpServletRequest; import java.util.TimerTask; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/factory/LogFactory.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/factory/LogFactory.java index c7920dcf..c3fc9671 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/factory/LogFactory.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/factory/LogFactory.java @@ -25,6 +25,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.core.log.factory; import cn.hutool.core.date.DateTime; +import org.aspectj.lang.JoinPoint; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.core.util.JoinPointUtil; @@ -32,7 +33,6 @@ import vip.xiaonuo.sys.core.enums.LogSuccessStatusEnum; import vip.xiaonuo.sys.core.enums.VisLogTypeEnum; import vip.xiaonuo.sys.modular.log.entity.SysOpLog; import vip.xiaonuo.sys.modular.log.entity.SysVisLog; -import org.aspectj.lang.JoinPoint; import java.util.Arrays; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/factory/LogTaskFactory.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/factory/LogTaskFactory.java index 5e8b7bb5..31dbcd3d 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/factory/LogTaskFactory.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/log/factory/LogTaskFactory.java @@ -26,13 +26,13 @@ package vip.xiaonuo.sys.core.log.factory; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.log.Log; +import org.aspectj.lang.JoinPoint; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.context.requestno.RequestNoContext; import vip.xiaonuo.sys.modular.log.entity.SysOpLog; import vip.xiaonuo.sys.modular.log.entity.SysVisLog; import vip.xiaonuo.sys.modular.log.service.SysOpLogService; import vip.xiaonuo.sys.modular.log.service.SysVisLogService; -import org.aspectj.lang.JoinPoint; import java.util.TimerTask; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/dbid/SnowyDatabaseIdProvider.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/dbid/SnowyDatabaseIdProvider.java index 0fb6fe57..da76f5e6 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/dbid/SnowyDatabaseIdProvider.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/dbid/SnowyDatabaseIdProvider.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.core.mybatis.dbid; -import vip.xiaonuo.core.enums.DbIdEnum; import org.apache.ibatis.mapping.DatabaseIdProvider; +import vip.xiaonuo.core.enums.DbIdEnum; import javax.sql.DataSource; import java.sql.SQLException; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/fieldfill/CustomMetaObjectHandler.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/fieldfill/CustomMetaObjectHandler.java index 027984c8..087b49d3 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/fieldfill/CustomMetaObjectHandler.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/fieldfill/CustomMetaObjectHandler.java @@ -27,9 +27,9 @@ package vip.xiaonuo.sys.core.mybatis.fieldfill; import cn.hutool.core.util.ObjectUtil; import cn.hutool.log.Log; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import vip.xiaonuo.core.context.login.LoginContextHolder; import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.ReflectionException; +import vip.xiaonuo.core.context.login.LoginContextHolder; import vip.xiaonuo.core.pojo.login.SysLoginUser; import java.util.Date; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/sqlfilter/DemoProfileSqlInterceptor.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/sqlfilter/DemoProfileSqlInterceptor.java index 731866d6..44111fa6 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/sqlfilter/DemoProfileSqlInterceptor.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/mybatis/sqlfilter/DemoProfileSqlInterceptor.java @@ -25,10 +25,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.core.mybatis.sqlfilter; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; -import vip.xiaonuo.core.consts.SpringSecurityConstant; -import vip.xiaonuo.core.context.constant.ConstantContextHolder; -import vip.xiaonuo.core.exception.DemoException; -import vip.xiaonuo.core.util.HttpServletUtil; import org.apache.ibatis.executor.statement.StatementHandler; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlCommandType; @@ -39,6 +35,10 @@ import org.apache.ibatis.plugin.Signature; import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.SystemMetaObject; import org.springframework.util.AntPathMatcher; +import vip.xiaonuo.core.consts.SpringSecurityConstant; +import vip.xiaonuo.core.context.constant.ConstantContextHolder; +import vip.xiaonuo.core.exception.DemoException; +import vip.xiaonuo.core.util.HttpServletUtil; import java.sql.Connection; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/provider/CaptchaCacheServiceProvider.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/provider/CaptchaCacheServiceProvider.java index 85b2bdf2..3d089591 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/provider/CaptchaCacheServiceProvider.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/provider/CaptchaCacheServiceProvider.java @@ -27,6 +27,7 @@ package vip.xiaonuo.sys.core.provider; import com.anji.captcha.service.CaptchaCacheService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; + import java.util.concurrent.TimeUnit; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/redis/FastJson2JsonRedisSerializer.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/redis/FastJson2JsonRedisSerializer.java index 49c17207..e30f3c19 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/redis/FastJson2JsonRedisSerializer.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/redis/FastJson2JsonRedisSerializer.java @@ -30,6 +30,7 @@ import com.alibaba.fastjson.parser.ParserConfig; import com.alibaba.fastjson.serializer.SerializerFeature; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.SerializationException; + import java.nio.charset.Charset; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/scanner/ApiResourceScanner.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/scanner/ApiResourceScanner.java index 97c2e678..15350979 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/scanner/ApiResourceScanner.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/scanner/ApiResourceScanner.java @@ -26,9 +26,6 @@ package vip.xiaonuo.sys.core.scanner; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import vip.xiaonuo.core.consts.SymbolConstant; -import vip.xiaonuo.core.context.resources.ApiResourceContext; -import vip.xiaonuo.core.util.AopTargetUtil; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.stereotype.Controller; @@ -36,6 +33,9 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import vip.xiaonuo.core.consts.SymbolConstant; +import vip.xiaonuo.core.context.resources.ApiResourceContext; +import vip.xiaonuo.core.util.AopTargetUtil; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/validator/SnowyValidator.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/validator/SnowyValidator.java index 193df9b6..5e0af1c9 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/validator/SnowyValidator.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/core/validator/SnowyValidator.java @@ -50,11 +50,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.core.validator; import cn.hutool.log.Log; +import org.springframework.validation.Errors; +import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.context.group.RequestGroupContext; import vip.xiaonuo.core.context.group.RequestParamIdContext; -import org.springframework.validation.Errors; -import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import java.beans.PropertyDescriptor; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/IndexController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/IndexController.java index 75713261..95254c21 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/IndexController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/IndexController.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular; -import vip.xiaonuo.core.consts.CommonConstant; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import vip.xiaonuo.core.consts.CommonConstant; /** * 首页控制器 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/controller/SysAppController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/controller/SysAppController.java index 98f0cfb2..ef4e43da 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/controller/SysAppController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/controller/SysAppController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.app.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,11 +36,6 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.app.param.SysAppParam; import vip.xiaonuo.sys.modular.app.service.SysAppService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/entity/SysApp.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/entity/SysApp.java index 92ab5a72..e0cf54d9 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/entity/SysApp.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/entity/SysApp.java @@ -27,9 +27,9 @@ package vip.xiaonuo.sys.modular.app.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 系统应用表 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/param/SysAppParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/param/SysAppParam.java index a910f7ba..0d821a3f 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/param/SysAppParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/param/SysAppParam.java @@ -24,10 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.app.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; -import vip.xiaonuo.core.validation.flag.FlagValue; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; +import vip.xiaonuo.core.validation.flag.FlagValue; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/service/impl/SysAppServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/service/impl/SysAppServiceImpl.java index b9946258..ea28ebdf 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/service/impl/SysAppServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/app/service/impl/SysAppServiceImpl.java @@ -30,6 +30,8 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.enums.CommonStatusEnum; import vip.xiaonuo.core.enums.YesOrNotEnum; @@ -45,8 +47,6 @@ import vip.xiaonuo.sys.modular.app.service.SysAppService; import vip.xiaonuo.sys.modular.menu.service.SysMenuService; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/entity/SysArea.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/entity/SysArea.java index 9a9011ff..4315bb64 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/entity/SysArea.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/entity/SysArea.java @@ -34,7 +34,6 @@ import lombok.Data; import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import java.math.BigDecimal; -import java.util.Collection; import java.util.List; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/mapper/SysAreaMapper.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/mapper/SysAreaMapper.java index 97a371ee..3afc9083 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/mapper/SysAreaMapper.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/mapper/SysAreaMapper.java @@ -24,13 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.area.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Param; import vip.xiaonuo.sys.modular.area.entity.SysArea; -import java.util.List; - /** * 系统区域mapper接口 * diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/service/SysAreaService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/service/SysAreaService.java index 2d0bccdc..feeb6a01 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/service/SysAreaService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/service/SysAreaService.java @@ -25,7 +25,6 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.area.service; import com.baomidou.mybatisplus.extension.service.IService; -import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.sys.modular.area.entity.SysArea; import vip.xiaonuo.sys.modular.area.param.SysAreaParam; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/service/impl/SysAreaServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/service/impl/SysAreaServiceImpl.java index 050ed0eb..e51248b4 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/service/impl/SysAreaServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/area/service/impl/SysAreaServiceImpl.java @@ -26,10 +26,8 @@ package vip.xiaonuo.sys.modular.area.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; -import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.sys.modular.area.entity.SysArea; import vip.xiaonuo.sys.modular.area.mapper.SysAreaMapper; import vip.xiaonuo.sys.modular.area.param.SysAreaParam; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/context/LoginContextSpringSecurityImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/context/LoginContextSpringSecurityImpl.java index cc783fee..f2d54dc1 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/context/LoginContextSpringSecurityImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/context/LoginContextSpringSecurityImpl.java @@ -27,6 +27,10 @@ package vip.xiaonuo.sys.modular.auth.context; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import org.springframework.security.authentication.AnonymousAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.core.context.login.LoginContext; @@ -38,10 +42,6 @@ import vip.xiaonuo.sys.core.enums.AdminTypeEnum; import vip.xiaonuo.sys.modular.auth.service.AuthService; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import org.springframework.security.authentication.AnonymousAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/controller/SysLoginController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/controller/SysLoginController.java index e7529b1c..f23626c0 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/controller/SysLoginController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/controller/SysLoginController.java @@ -27,6 +27,11 @@ package vip.xiaonuo.sys.modular.auth.controller; import cn.hutool.core.lang.Dict; import com.anji.captcha.model.vo.CaptchaVO; import com.anji.captcha.service.CaptchaService; +import org.springframework.context.annotation.Lazy; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.context.login.LoginContextHolder; import vip.xiaonuo.core.exception.AuthException; @@ -34,11 +39,6 @@ import vip.xiaonuo.core.exception.enums.AuthExceptionEnum; import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.auth.service.AuthService; -import org.springframework.context.annotation.Lazy; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/service/AuthService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/service/AuthService.java index 5da5632e..5ca30d36 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/service/AuthService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/service/AuthService.java @@ -24,9 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.auth.service; +import org.springframework.security.core.Authentication; import vip.xiaonuo.core.pojo.login.SysLoginUser; import vip.xiaonuo.sys.modular.user.entity.SysUser; -import org.springframework.security.core.Authentication; + import javax.servlet.http.HttpServletRequest; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/service/impl/AuthServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/service/impl/AuthServiceImpl.java index 1b9b878e..416602cd 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/service/impl/AuthServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/auth/service/impl/AuthServiceImpl.java @@ -30,6 +30,13 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.security.crypto.bcrypt.BCrypt; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.dbs.CurrentDataSourceContext; @@ -56,13 +63,6 @@ import vip.xiaonuo.sys.modular.auth.factory.LoginUserFactory; import vip.xiaonuo.sys.modular.auth.service.AuthService; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.core.userdetails.UsernameNotFoundException; -import org.springframework.security.crypto.bcrypt.BCrypt; -import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/controller/SysConfigController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/controller/SysConfigController.java index 78b76c97..0f705e42 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/controller/SysConfigController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/controller/SysConfigController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.consts.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,11 +36,7 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.consts.param.SysConfigParam; import vip.xiaonuo.sys.modular.consts.service.SysConfigService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; + import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/entity/SysConfig.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/entity/SysConfig.java index 18d857f3..cc2483fc 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/entity/SysConfig.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/entity/SysConfig.java @@ -25,9 +25,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.consts.entity; import com.baomidou.mybatisplus.annotation.*; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** *

diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/param/SysConfigParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/param/SysConfigParam.java index c6df4678..b0bff6f0 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/param/SysConfigParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/param/SysConfigParam.java @@ -24,10 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.consts.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; -import vip.xiaonuo.core.validation.flag.FlagValue; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; +import vip.xiaonuo.core.validation.flag.FlagValue; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/SysConfigService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/SysConfigService.java index 5a11be31..8cb1b000 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/SysConfigService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/SysConfigService.java @@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.sys.modular.consts.entity.SysConfig; import vip.xiaonuo.sys.modular.consts.param.SysConfigParam; + import java.util.List; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/impl/SysConfigServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/impl/SysConfigServiceImpl.java index 15486f2f..76093a1b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/impl/SysConfigServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/consts/service/impl/SysConfigServiceImpl.java @@ -28,6 +28,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.context.constant.ConstantContext; import vip.xiaonuo.core.enums.CommonStatusEnum; import vip.xiaonuo.core.enums.YesOrNotEnum; @@ -39,7 +40,7 @@ import vip.xiaonuo.sys.modular.consts.enums.SysConfigExceptionEnum; import vip.xiaonuo.sys.modular.consts.mapper.SysConfigMapper; import vip.xiaonuo.sys.modular.consts.param.SysConfigParam; import vip.xiaonuo.sys.modular.consts.service.SysConfigService; -import org.springframework.stereotype.Service; + import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/controller/SysDictDataController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/controller/SysDictDataController.java index d5975c64..c2a7df29 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/controller/SysDictDataController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/controller/SysDictDataController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.dict.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,11 +36,6 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.dict.param.SysDictDataParam; import vip.xiaonuo.sys.modular.dict.service.SysDictDataService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/controller/SysDictTypeController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/controller/SysDictTypeController.java index f55fe652..f543d735 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/controller/SysDictTypeController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/controller/SysDictTypeController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.dict.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,11 +36,6 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.dict.param.SysDictTypeParam; import vip.xiaonuo.sys.modular.dict.service.SysDictTypeService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/entity/SysDictData.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/entity/SysDictData.java index 6aec86e2..3ac451ae 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/entity/SysDictData.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/entity/SysDictData.java @@ -25,9 +25,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.dict.entity; import com.baomidou.mybatisplus.annotation.*; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 系统字典值表 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/entity/SysDictType.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/entity/SysDictType.java index 894afc8d..a9871ee7 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/entity/SysDictType.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/entity/SysDictType.java @@ -25,9 +25,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.dict.entity; import com.baomidou.mybatisplus.annotation.*; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 系统字典类型表 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/param/SysDictDataParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/param/SysDictDataParam.java index 395da0ec..b4a648c7 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/param/SysDictDataParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/param/SysDictDataParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.dict.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/param/SysDictTypeParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/param/SysDictTypeParam.java index c55ee509..b1f8722e 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/param/SysDictTypeParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/param/SysDictTypeParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.dict.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/result/SysDictTreeNode.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/result/SysDictTreeNode.java index c4fc26b3..5a4916dc 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/result/SysDictTreeNode.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/result/SysDictTreeNode.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.dict.result; -import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import lombok.Data; +import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/service/impl/SysDictDataServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/service/impl/SysDictDataServiceImpl.java index b991a52e..6d8fbd2b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/service/impl/SysDictDataServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/service/impl/SysDictDataServiceImpl.java @@ -31,6 +31,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.enums.CommonStatusEnum; import vip.xiaonuo.core.exception.ServiceException; @@ -42,7 +43,6 @@ import vip.xiaonuo.sys.modular.dict.enums.SysDictDataExceptionEnum; import vip.xiaonuo.sys.modular.dict.mapper.SysDictDataMapper; import vip.xiaonuo.sys.modular.dict.param.SysDictDataParam; import vip.xiaonuo.sys.modular.dict.service.SysDictDataService; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/service/impl/SysDictTypeServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/service/impl/SysDictTypeServiceImpl.java index 5bd7d16c..5ef02176 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/service/impl/SysDictTypeServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/dict/service/impl/SysDictTypeServiceImpl.java @@ -31,6 +31,8 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.enums.CommonStatusEnum; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.exception.enums.StatusExceptionEnum; @@ -45,8 +47,6 @@ import vip.xiaonuo.sys.modular.dict.param.SysDictTypeParam; import vip.xiaonuo.sys.modular.dict.result.SysDictTreeNode; import vip.xiaonuo.sys.modular.dict.service.SysDictDataService; import vip.xiaonuo.sys.modular.dict.service.SysDictTypeService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/email/controler/EmailController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/email/controler/EmailController.java index e5c8d571..a50d8170 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/email/controler/EmailController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/email/controler/EmailController.java @@ -27,6 +27,9 @@ package vip.xiaonuo.sys.modular.email.controler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.extra.mail.MailException; import cn.hutool.log.Log; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.context.requestno.RequestNoContext; import vip.xiaonuo.core.email.MailSender; @@ -36,9 +39,6 @@ import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.email.enums.SysEmailExceptionEnum; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/param/SysEmpParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/param/SysEmpParam.java index 931472fb..0cbfcef5 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/param/SysEmpParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/param/SysEmpParam.java @@ -25,9 +25,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.emp.param; import cn.hutool.core.lang.Dict; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpExtOrgPosPosServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpExtOrgPosPosServiceImpl.java index f05a37f2..3f5d5033 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpExtOrgPosPosServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpExtOrgPosPosServiceImpl.java @@ -28,6 +28,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Dict; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.sys.modular.emp.entity.SysEmpExtOrgPos; import vip.xiaonuo.sys.modular.emp.mapper.SysEmpExtOrgPosMapper; import vip.xiaonuo.sys.modular.emp.service.SysEmpExtOrgPosService; @@ -35,7 +36,6 @@ import vip.xiaonuo.sys.modular.org.entity.SysOrg; import vip.xiaonuo.sys.modular.org.service.SysOrgService; import vip.xiaonuo.sys.modular.pos.entity.SysPos; import vip.xiaonuo.sys.modular.pos.service.SysPosService; -import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpPosServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpPosServiceImpl.java index ed781a0a..1b45813b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpPosServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpPosServiceImpl.java @@ -29,12 +29,12 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.sys.modular.emp.entity.SysEmpPos; import vip.xiaonuo.sys.modular.emp.mapper.SysEmpPosMapper; import vip.xiaonuo.sys.modular.emp.service.SysEmpPosService; import vip.xiaonuo.sys.modular.pos.entity.SysPos; import vip.xiaonuo.sys.modular.pos.service.SysPosService; -import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpServiceImpl.java index 59daf1a8..f7bf9ba0 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/emp/service/impl/SysEmpServiceImpl.java @@ -30,6 +30,8 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.pojo.login.LoginEmpInfo; import vip.xiaonuo.sys.modular.emp.entity.SysEmp; import vip.xiaonuo.sys.modular.emp.mapper.SysEmpMapper; @@ -38,8 +40,6 @@ import vip.xiaonuo.sys.modular.emp.result.SysEmpInfo; import vip.xiaonuo.sys.modular.emp.service.SysEmpExtOrgPosService; import vip.xiaonuo.sys.modular.emp.service.SysEmpPosService; import vip.xiaonuo.sys.modular.emp.service.SysEmpService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/controller/SysFileInfoController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/controller/SysFileInfoController.java index 5b671f1c..fe6d8d3d 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/controller/SysFileInfoController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/controller/SysFileInfoController.java @@ -24,6 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.file.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,9 +34,6 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.file.param.SysFileInfoParam; import vip.xiaonuo.sys.modular.file.service.SysFileInfoService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/entity/SysFileInfo.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/entity/SysFileInfo.java index 6107f348..5e33a5f7 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/entity/SysFileInfo.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/entity/SysFileInfo.java @@ -27,9 +27,9 @@ package vip.xiaonuo.sys.modular.file.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** *

diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/param/SysFileInfoParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/param/SysFileInfoParam.java index cbb4149d..1a1be9f8 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/param/SysFileInfoParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/param/SysFileInfoParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.file.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/service/SysFileInfoService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/service/SysFileInfoService.java index b4e69447..37d3c2e0 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/service/SysFileInfoService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/service/SysFileInfoService.java @@ -25,11 +25,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.file.service; import com.baomidou.mybatisplus.extension.service.IService; +import org.springframework.web.multipart.MultipartFile; import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.sys.modular.file.entity.SysFileInfo; import vip.xiaonuo.sys.modular.file.param.SysFileInfoParam; import vip.xiaonuo.sys.modular.file.result.SysFileInfoResult; -import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/service/impl/SysFileInfoServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/service/impl/SysFileInfoServiceImpl.java index ec3f424e..f3d153aa 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/service/impl/SysFileInfoServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/file/service/impl/SysFileInfoServiceImpl.java @@ -35,6 +35,10 @@ import cn.hutool.log.Log; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.core.context.requestno.RequestNoContext; import vip.xiaonuo.core.exception.LibreOfficeException; @@ -51,10 +55,6 @@ import vip.xiaonuo.sys.modular.file.param.SysFileInfoParam; import vip.xiaonuo.sys.modular.file.result.SysFileInfoResult; import vip.xiaonuo.sys.modular.file.service.SysFileInfoService; import vip.xiaonuo.sys.modular.file.util.DownloadUtil; -import org.springframework.http.MediaType; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/controller/SysLogController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/controller/SysLogController.java index 9270e214..2d0eb8d8 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/controller/SysLogController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/controller/SysLogController.java @@ -24,6 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.log.controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -33,9 +36,7 @@ import vip.xiaonuo.sys.modular.log.param.SysOpLogParam; import vip.xiaonuo.sys.modular.log.param.SysVisLogParam; import vip.xiaonuo.sys.modular.log.service.SysOpLogService; import vip.xiaonuo.sys.modular.log.service.SysVisLogService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; + import javax.annotation.Resource; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/param/SysOpLogParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/param/SysOpLogParam.java index 79430d75..f2955267 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/param/SysOpLogParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/param/SysOpLogParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.log.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import java.util.Date; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/param/SysVisLogParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/param/SysVisLogParam.java index 7d894940..2088b87a 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/param/SysVisLogParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/param/SysVisLogParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.log.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import java.util.Date; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java index 2e758519..adee1042 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysOpLogServiceImpl.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.factory.PageFactory; import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.core.util.PoiUtil; @@ -36,7 +37,7 @@ import vip.xiaonuo.sys.modular.log.entity.SysOpLog; import vip.xiaonuo.sys.modular.log.mapper.SysOpLogMapper; import vip.xiaonuo.sys.modular.log.param.SysOpLogParam; import vip.xiaonuo.sys.modular.log.service.SysOpLogService; -import org.springframework.stereotype.Service; + import java.util.List; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java index b9ff0a82..7fee4191 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/log/service/impl/SysVisLogServiceImpl.java @@ -28,6 +28,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.factory.PageFactory; import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.core.util.PoiUtil; @@ -35,7 +36,7 @@ import vip.xiaonuo.sys.modular.log.entity.SysVisLog; import vip.xiaonuo.sys.modular.log.mapper.SysVisLogMapper; import vip.xiaonuo.sys.modular.log.param.SysVisLogParam; import vip.xiaonuo.sys.modular.log.service.SysVisLogService; -import org.springframework.stereotype.Service; + import java.util.List; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/controller/SysMenuController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/controller/SysMenuController.java index 9fdbf495..618f5f9a 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/controller/SysMenuController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/controller/SysMenuController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.menu.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.context.login.LoginContextHolder; @@ -34,11 +39,6 @@ import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.menu.entity.SysMenu; import vip.xiaonuo.sys.modular.menu.param.SysMenuParam; import vip.xiaonuo.sys.modular.menu.service.SysMenuService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.sys.modular.role.service.SysRoleMenuService; import vip.xiaonuo.sys.modular.user.service.SysUserRoleService; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/entity/SysMenu.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/entity/SysMenu.java index 84fb61ee..6b3c5ce2 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/entity/SysMenu.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/entity/SysMenu.java @@ -25,10 +25,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.menu.entity; import com.baomidou.mybatisplus.annotation.*; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; -import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; +import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/node/MenuBaseTreeNode.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/node/MenuBaseTreeNode.java index 57ac6915..149b13d7 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/node/MenuBaseTreeNode.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/node/MenuBaseTreeNode.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.menu.node; -import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import lombok.Data; +import vip.xiaonuo.core.pojo.base.node.BaseTreeNode; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/param/SysMenuParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/param/SysMenuParam.java index c8a26525..a889a240 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/param/SysMenuParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/param/SysMenuParam.java @@ -24,10 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.menu.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; -import vip.xiaonuo.core.validation.flag.FlagValue; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; +import vip.xiaonuo.core.validation.flag.FlagValue; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/service/impl/SysMenuServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/service/impl/SysMenuServiceImpl.java index cac69130..984e059e 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/service/impl/SysMenuServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/menu/service/impl/SysMenuServiceImpl.java @@ -31,6 +31,8 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.core.context.login.LoginContextHolder; import vip.xiaonuo.core.enums.CommonStatusEnum; @@ -49,13 +51,10 @@ import vip.xiaonuo.sys.modular.menu.mapper.SysMenuMapper; import vip.xiaonuo.sys.modular.menu.node.MenuBaseTreeNode; import vip.xiaonuo.sys.modular.menu.param.SysMenuParam; import vip.xiaonuo.sys.modular.menu.service.SysMenuService; -import vip.xiaonuo.sys.modular.org.enums.SysOrgExceptionEnum; import vip.xiaonuo.sys.modular.role.service.SysRoleMenuService; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.service.SysUserRoleService; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysMachineController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysMachineController.java index 2f3968dc..de5e25fb 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysMachineController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysMachineController.java @@ -24,13 +24,14 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.monitor.controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.monitor.service.SysMachineService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; + import javax.annotation.Resource; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysOnlineUserController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysOnlineUserController.java index a4786c01..5c57554b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysOnlineUserController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/controller/SysOnlineUserController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.monitor.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,11 +36,7 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.monitor.param.SysOnlineUserParam; import vip.xiaonuo.sys.modular.monitor.service.SysOnlineUserService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; + import javax.annotation.Resource; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/param/SysOnlineUserParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/param/SysOnlineUserParam.java index 03e7b79b..2052bd50 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/param/SysOnlineUserParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/param/SysOnlineUserParam.java @@ -24,9 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.monitor.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; + import javax.validation.constraints.NotEmpty; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysMachineResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysMachineResult.java index fbef8f18..4e5a059d 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysMachineResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysMachineResult.java @@ -26,6 +26,7 @@ package vip.xiaonuo.sys.modular.monitor.result; import lombok.Data; import lombok.NoArgsConstructor; + import java.io.Serializable; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysOnlineUserResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysOnlineUserResult.java index 08e0cece..91098c1d 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysOnlineUserResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/result/SysOnlineUserResult.java @@ -25,6 +25,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.monitor.result; import lombok.Data; + import java.io.Serializable; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysMachineServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysMachineServiceImpl.java index cca3a1bb..a14738aa 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysMachineServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysMachineServiceImpl.java @@ -27,10 +27,11 @@ package vip.xiaonuo.sys.modular.monitor.service.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.system.*; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.sys.modular.monitor.result.SysMachineResult; import vip.xiaonuo.sys.modular.monitor.service.SysMachineService; -import org.springframework.stereotype.Service; + import java.math.BigDecimal; import java.text.DecimalFormat; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysOnlineUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysOnlineUserServiceImpl.java index 880b4d24..5c875cb4 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysOnlineUserServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/monitor/service/impl/SysOnlineUserServiceImpl.java @@ -28,6 +28,7 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.context.login.LoginContextHolder; import vip.xiaonuo.core.exception.DemoException; @@ -40,7 +41,7 @@ import vip.xiaonuo.sys.core.log.LogManager; import vip.xiaonuo.sys.modular.monitor.param.SysOnlineUserParam; import vip.xiaonuo.sys.modular.monitor.result.SysOnlineUserResult; import vip.xiaonuo.sys.modular.monitor.service.SysOnlineUserService; -import org.springframework.stereotype.Service; + import javax.annotation.Resource; import java.util.Comparator; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/controller/SysNoticeController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/controller/SysNoticeController.java index 637c3bca..3a04c949 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/controller/SysNoticeController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/controller/SysNoticeController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.notice.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,11 +36,7 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.notice.param.SysNoticeParam; import vip.xiaonuo.sys.modular.notice.service.SysNoticeService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; + import javax.annotation.Resource; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNotice.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNotice.java index fa51d660..8e568665 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNotice.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNotice.java @@ -27,9 +27,10 @@ package vip.xiaonuo.sys.modular.notice.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; + import java.util.Date; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNoticeUser.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNoticeUser.java index 206bef71..1629e185 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNoticeUser.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/entity/SysNoticeUser.java @@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; + import java.util.Date; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/mapper/SysNoticeMapper.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/mapper/SysNoticeMapper.java index 081ec156..f3383de7 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/mapper/SysNoticeMapper.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/mapper/SysNoticeMapper.java @@ -27,9 +27,9 @@ package vip.xiaonuo.sys.modular.notice.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import vip.xiaonuo.sys.modular.notice.entity.SysNotice; import vip.xiaonuo.sys.modular.notice.result.SysNoticeReceiveResult; -import org.apache.ibatis.annotations.Param; /** * 系统通知公告mapper接口 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/param/SysNoticeParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/param/SysNoticeParam.java index 31ad219e..a0f4139a 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/param/SysNoticeParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/param/SysNoticeParam.java @@ -24,9 +24,10 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.notice.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; + import javax.validation.constraints.Max; import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeDetailResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeDetailResult.java index 1c7a2929..0bfd009b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeDetailResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeDetailResult.java @@ -27,6 +27,7 @@ package vip.xiaonuo.sys.modular.notice.result; import cn.hutool.core.lang.Dict; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; + import java.util.Date; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeReceiveResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeReceiveResult.java index a0e993e6..b233eb6b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeReceiveResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/result/SysNoticeReceiveResult.java @@ -25,6 +25,7 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.notice.result; import lombok.Data; + import java.util.Date; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/SysNoticeUserService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/SysNoticeUserService.java index 0bf19863..6e9512ac 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/SysNoticeUserService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/SysNoticeUserService.java @@ -26,6 +26,7 @@ package vip.xiaonuo.sys.modular.notice.service; import com.baomidou.mybatisplus.extension.service.IService; import vip.xiaonuo.sys.modular.notice.entity.SysNoticeUser; + import java.util.List; /** diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeServiceImpl.java index f0532f59..58d15b07 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeServiceImpl.java @@ -31,6 +31,8 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.context.login.LoginContextHolder; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.factory.PageFactory; @@ -48,8 +50,7 @@ import vip.xiaonuo.sys.modular.notice.result.SysNoticeReceiveResult; import vip.xiaonuo.sys.modular.notice.service.SysNoticeService; import vip.xiaonuo.sys.modular.notice.service.SysNoticeUserService; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.util.Date; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeUserServiceImpl.java index d6c69ba1..4843485a 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeUserServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/notice/service/impl/SysNoticeUserServiceImpl.java @@ -27,11 +27,12 @@ package vip.xiaonuo.sys.modular.notice.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.sys.modular.notice.entity.SysNoticeUser; import vip.xiaonuo.sys.modular.notice.mapper.SysNoticeUserMapper; import vip.xiaonuo.sys.modular.notice.service.SysNoticeUserService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; + import java.util.Date; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/controller/SysOauthController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/controller/SysOauthController.java index 5fac92cc..fbcd5059 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/controller/SysOauthController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/controller/SysOauthController.java @@ -24,14 +24,14 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.oauth.controller; -import vip.xiaonuo.core.consts.CommonConstant; -import vip.xiaonuo.core.consts.SymbolConstant; -import vip.xiaonuo.core.context.constant.ConstantContextHolder; -import vip.xiaonuo.sys.modular.oauth.service.SysOauthService; import me.zhyd.oauth.model.AuthCallback; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import vip.xiaonuo.core.consts.CommonConstant; +import vip.xiaonuo.core.consts.SymbolConstant; +import vip.xiaonuo.core.context.constant.ConstantContextHolder; +import vip.xiaonuo.sys.modular.oauth.service.SysOauthService; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/entity/SysOauthUser.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/entity/SysOauthUser.java index d86e31a1..c3c506b7 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/entity/SysOauthUser.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/entity/SysOauthUser.java @@ -27,9 +27,9 @@ package vip.xiaonuo.sys.modular.oauth.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * Oauth登录用户表 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/service/SysOauthService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/service/SysOauthService.java index e533ed3f..bc3c84bf 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/service/SysOauthService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/service/SysOauthService.java @@ -25,8 +25,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.oauth.service; import com.baomidou.mybatisplus.extension.service.IService; -import vip.xiaonuo.sys.modular.oauth.entity.SysOauthUser; import me.zhyd.oauth.model.AuthCallback; +import vip.xiaonuo.sys.modular.oauth.entity.SysOauthUser; import javax.servlet.http.HttpServletRequest; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/service/impl/SysOauthServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/service/impl/SysOauthServiceImpl.java index 3ee229bf..937a1907 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/service/impl/SysOauthServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/oauth/service/impl/SysOauthServiceImpl.java @@ -28,6 +28,16 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import me.zhyd.oauth.config.AuthConfig; +import me.zhyd.oauth.model.AuthCallback; +import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthUser; +import me.zhyd.oauth.request.AuthGiteeRequest; +import me.zhyd.oauth.request.AuthGithubRequest; +import me.zhyd.oauth.request.AuthRequest; +import me.zhyd.oauth.utils.AuthStateUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.pojo.oauth.OauthConfigs; @@ -40,16 +50,6 @@ import vip.xiaonuo.sys.modular.oauth.mapper.SysOauthMapper; import vip.xiaonuo.sys.modular.oauth.service.SysOauthService; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import me.zhyd.oauth.config.AuthConfig; -import me.zhyd.oauth.model.AuthCallback; -import me.zhyd.oauth.model.AuthResponse; -import me.zhyd.oauth.model.AuthUser; -import me.zhyd.oauth.request.AuthGiteeRequest; -import me.zhyd.oauth.request.AuthGithubRequest; -import me.zhyd.oauth.request.AuthRequest; -import me.zhyd.oauth.utils.AuthStateUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java index bd653295..f87c1969 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.org.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.DataScope; import vip.xiaonuo.core.annotion.Permission; @@ -33,12 +38,6 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.org.param.SysOrgParam; import vip.xiaonuo.sys.modular.org.service.SysOrgService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import vip.xiaonuo.sys.modular.user.param.SysUserParam; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java index 72a81257..3e7f068d 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/entity/SysOrg.java @@ -26,9 +26,9 @@ package vip.xiaonuo.sys.modular.org.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.*; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 系统组织机构表 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgParam.java index dae3fac0..3cd68d8b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.org.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java index bd7e4b61..7cd83d41 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java @@ -33,6 +33,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.core.context.login.LoginContextHolder; import vip.xiaonuo.core.enums.CommonStatusEnum; @@ -54,8 +56,7 @@ import vip.xiaonuo.sys.modular.org.param.SysOrgParam; import vip.xiaonuo.sys.modular.org.service.SysOrgService; import vip.xiaonuo.sys.modular.role.service.SysRoleDataScopeService; import vip.xiaonuo.sys.modular.user.service.SysUserDataScopeService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.util.List; import java.util.Set; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/controller/SysPosController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/controller/SysPosController.java index 51f43071..044689c2 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/controller/SysPosController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/controller/SysPosController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.pos.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -31,11 +36,6 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.pos.param.SysPosParam; import vip.xiaonuo.sys.modular.pos.service.SysPosService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/entity/SysPos.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/entity/SysPos.java index 218f19d9..f2e93189 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/entity/SysPos.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/entity/SysPos.java @@ -26,9 +26,9 @@ package vip.xiaonuo.sys.modular.pos.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.*; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 系统职位表 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/param/SysPosParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/param/SysPosParam.java index b2d00fd3..9a5bdc6f 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/param/SysPosParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/param/SysPosParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.pos.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/service/impl/SysPosServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/service/impl/SysPosServiceImpl.java index 40d6ea4a..86827c37 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/service/impl/SysPosServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/pos/service/impl/SysPosServiceImpl.java @@ -28,6 +28,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.enums.CommonStatusEnum; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.factory.PageFactory; @@ -40,8 +42,6 @@ import vip.xiaonuo.sys.modular.pos.enums.SysPosExceptionEnum; import vip.xiaonuo.sys.modular.pos.mapper.SysPosMapper; import vip.xiaonuo.sys.modular.pos.param.SysPosParam; import vip.xiaonuo.sys.modular.pos.service.SysPosService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/controller/SysRoleController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/controller/SysRoleController.java index 4f770db1..1639f3cd 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/controller/SysRoleController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/controller/SysRoleController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.role.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.DataScope; import vip.xiaonuo.core.annotion.Permission; @@ -32,11 +37,6 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.role.param.SysRoleParam; import vip.xiaonuo.sys.modular.role.service.SysRoleService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/entity/SysRole.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/entity/SysRole.java index c35dd5d3..5e3d804f 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/entity/SysRole.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/entity/SysRole.java @@ -25,9 +25,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.role.entity; import com.baomidou.mybatisplus.annotation.*; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 系统角色表 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleParam.java index a4a90d26..202ddc9f 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.role.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.*; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java index 60098944..81466945 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleDataScopeServiceImpl.java @@ -28,11 +28,11 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.sys.modular.role.entity.SysRoleDataScope; import vip.xiaonuo.sys.modular.role.mapper.SysRoleDataScopeMapper; import vip.xiaonuo.sys.modular.role.param.SysRoleParam; import vip.xiaonuo.sys.modular.role.service.SysRoleDataScopeService; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleMenuServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleMenuServiceImpl.java index 8494b902..0ba9521c 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleMenuServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleMenuServiceImpl.java @@ -28,11 +28,11 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.sys.modular.role.entity.SysRoleMenu; import vip.xiaonuo.sys.modular.role.mapper.SysRoleMenuMapper; import vip.xiaonuo.sys.modular.role.param.SysRoleParam; import vip.xiaonuo.sys.modular.role.service.SysRoleMenuService; -import org.springframework.stereotype.Service; import java.util.List; import java.util.stream.Collectors; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java index d0c16938..d41d3ac6 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -30,6 +30,8 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.core.context.login.LoginContextHolder; @@ -49,8 +51,6 @@ import vip.xiaonuo.sys.modular.role.service.SysRoleDataScopeService; import vip.xiaonuo.sys.modular.role.service.SysRoleMenuService; import vip.xiaonuo.sys.modular.role.service.SysRoleService; import vip.xiaonuo.sys.modular.user.service.SysUserRoleService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/controller/SmsSenderController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/controller/SmsSenderController.java index 960878a1..32b99e83 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/controller/SmsSenderController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/controller/SmsSenderController.java @@ -26,6 +26,8 @@ package vip.xiaonuo.sys.modular.sms.controller; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.RandomUtil; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.Permission; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; @@ -37,8 +39,6 @@ import vip.xiaonuo.sys.modular.sms.param.SysSmsSendParam; import vip.xiaonuo.sys.modular.sms.param.SysSmsVerifyParam; import vip.xiaonuo.sys.modular.sms.service.SmsSenderService; import vip.xiaonuo.sys.modular.sms.service.SysSmsInfoService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.HashMap; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/entity/SysSms.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/entity/SysSms.java index babc5efa..6391640a 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/entity/SysSms.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/entity/SysSms.java @@ -28,10 +28,10 @@ package vip.xiaonuo.sys.modular.sms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import java.io.Serializable; import java.util.Date; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsInfoParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsInfoParam.java index fbd33759..84e7e40b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsInfoParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsInfoParam.java @@ -25,9 +25,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.sms.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import java.util.Date; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsSendParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsSendParam.java index f051ccf2..83bd3511 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsSendParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsSendParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.sms.param; +import lombok.Data; import vip.xiaonuo.sys.modular.sms.enums.SmsSendSourceEnum; import vip.xiaonuo.sys.modular.sms.enums.SmsTypeEnum; -import lombok.Data; import javax.validation.constraints.NotBlank; import java.util.Map; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsVerifyParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsVerifyParam.java index a827097f..713a6b17 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsVerifyParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/param/SysSmsVerifyParam.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.sms.param; -import vip.xiaonuo.sys.modular.sms.enums.SmsSendSourceEnum; import lombok.Data; +import vip.xiaonuo.sys.modular.sms.enums.SmsSendSourceEnum; import javax.validation.constraints.NotBlank; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/service/impl/SmsSenderServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/service/impl/SmsSenderServiceImpl.java index 2bc19661..44fa91cf 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/service/impl/SmsSenderServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/service/impl/SmsSenderServiceImpl.java @@ -28,6 +28,8 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.log.Log; import com.alibaba.fastjson.JSON; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.sms.SmsSender; import vip.xiaonuo.sys.modular.sms.enums.SmsSendStatusEnum; @@ -37,8 +39,6 @@ import vip.xiaonuo.sys.modular.sms.param.SysSmsSendParam; import vip.xiaonuo.sys.modular.sms.param.SysSmsVerifyParam; import vip.xiaonuo.sys.modular.sms.service.SmsSenderService; import vip.xiaonuo.sys.modular.sms.service.SysSmsInfoService; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Map; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/service/impl/SysSmsInfoServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/service/impl/SysSmsInfoServiceImpl.java index 30d4300b..655be465 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/service/impl/SysSmsInfoServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/sms/service/impl/SysSmsInfoServiceImpl.java @@ -29,6 +29,8 @@ import cn.hutool.log.Log; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.factory.PageFactory; @@ -43,8 +45,6 @@ import vip.xiaonuo.sys.modular.sms.param.SysSmsInfoParam; import vip.xiaonuo.sys.modular.sms.param.SysSmsSendParam; import vip.xiaonuo.sys.modular.sms.param.SysSmsVerifyParam; import vip.xiaonuo.sys.modular.sms.service.SysSmsInfoService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.Date; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/controller/SysTimersController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/controller/SysTimersController.java index 4f03b893..71abb493 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/controller/SysTimersController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/controller/SysTimersController.java @@ -24,17 +24,17 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.timer.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.enums.LogAnnotionOpTypeEnum; import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.timer.param.SysTimersParam; import vip.xiaonuo.sys.modular.timer.service.SysTimersService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/entity/SysTimers.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/entity/SysTimers.java index 4aa44668..50e11dbc 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/entity/SysTimers.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/entity/SysTimers.java @@ -27,9 +27,9 @@ package vip.xiaonuo.sys.modular.timer.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; /** * 定时任务 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/param/SysTimersParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/param/SysTimersParam.java index 7f6dd4bd..36dfa7d4 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/param/SysTimersParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/param/SysTimersParam.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.timer.param; -import vip.xiaonuo.core.pojo.base.param.BaseParam; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.param.BaseParam; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/service/impl/HutoolTimerExeServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/service/impl/HutoolTimerExeServiceImpl.java index 004eb5ee..45df3824 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/service/impl/HutoolTimerExeServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/service/impl/HutoolTimerExeServiceImpl.java @@ -29,11 +29,11 @@ import cn.hutool.cron.CronUtil; import cn.hutool.cron.task.Task; import cn.hutool.extra.spring.SpringUtil; import cn.hutool.log.Log; +import org.springframework.stereotype.Service; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.timer.TimerTaskRunner; import vip.xiaonuo.sys.modular.timer.enums.exp.SysTimersExceptionEnum; import vip.xiaonuo.sys.modular.timer.service.TimerExeService; -import org.springframework.stereotype.Service; /** * hutool方式的定时任务执行 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/service/impl/SysTimersServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/service/impl/SysTimersServiceImpl.java index 5e048e45..5d8188a2 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/service/impl/SysTimersServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/service/impl/SysTimersServiceImpl.java @@ -32,6 +32,8 @@ import cn.hutool.extra.spring.SpringUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.exception.ServiceException; import vip.xiaonuo.core.factory.PageFactory; import vip.xiaonuo.core.pojo.page.PageResult; @@ -43,8 +45,6 @@ import vip.xiaonuo.sys.modular.timer.mapper.SysTimersMapper; import vip.xiaonuo.sys.modular.timer.param.SysTimersParam; import vip.xiaonuo.sys.modular.timer.service.SysTimersService; import vip.xiaonuo.sys.modular.timer.service.TimerExeService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collection; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/tasks/RefreshConstantsTaskRunner.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/tasks/RefreshConstantsTaskRunner.java index 9a59bef7..d90659d9 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/tasks/RefreshConstantsTaskRunner.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/tasks/RefreshConstantsTaskRunner.java @@ -26,12 +26,12 @@ package vip.xiaonuo.sys.modular.timer.tasks; import cn.hutool.log.Log; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.springframework.stereotype.Component; import vip.xiaonuo.core.context.constant.ConstantContext; import vip.xiaonuo.core.enums.CommonStatusEnum; import vip.xiaonuo.core.timer.TimerTaskRunner; import vip.xiaonuo.sys.modular.consts.entity.SysConfig; import vip.xiaonuo.sys.modular.consts.service.SysConfigService; -import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/tasks/SystemOutTaskRunner.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/tasks/SystemOutTaskRunner.java index 90b6d2fe..8c1d8be0 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/tasks/SystemOutTaskRunner.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/timer/tasks/SystemOutTaskRunner.java @@ -24,8 +24,8 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.timer.tasks; -import vip.xiaonuo.core.timer.TimerTaskRunner; import org.springframework.stereotype.Component; +import vip.xiaonuo.core.timer.TimerTaskRunner; /** * 这是一个定时任务的示例程序 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java index 6777d2a3..8a864605 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java @@ -24,6 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.user.controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import vip.xiaonuo.core.annotion.BusinessLog; import vip.xiaonuo.core.annotion.DataScope; import vip.xiaonuo.core.annotion.Permission; @@ -32,11 +37,6 @@ import vip.xiaonuo.core.pojo.response.ResponseData; import vip.xiaonuo.core.pojo.response.SuccessResponseData; import vip.xiaonuo.sys.modular.user.param.SysUserParam; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java index 89691e1c..ad8b971b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/entity/SysUser.java @@ -26,9 +26,9 @@ package vip.xiaonuo.sys.modular.user.entity; import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.*; -import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import vip.xiaonuo.core.pojo.base.entity.BaseEntity; import java.util.Date; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java index 207fad15..ceb732e4 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/factory/SysUserFactory.java @@ -25,12 +25,12 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.sys.modular.user.factory; import cn.hutool.core.util.ObjectUtil; +import org.springframework.security.crypto.bcrypt.BCrypt; import vip.xiaonuo.core.context.constant.ConstantContextHolder; import vip.xiaonuo.core.enums.CommonStatusEnum; import vip.xiaonuo.sys.core.enums.AdminTypeEnum; import vip.xiaonuo.sys.core.enums.SexEnum; import vip.xiaonuo.sys.modular.user.entity.SysUser; -import org.springframework.security.crypto.bcrypt.BCrypt; /** * 填充用户附加信息工厂 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/mapper/SysUserMapper.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/mapper/SysUserMapper.java index 182de35c..2cc1634b 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/mapper/SysUserMapper.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/mapper/SysUserMapper.java @@ -27,9 +27,9 @@ package vip.xiaonuo.sys.modular.user.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.result.SysUserResult; -import org.apache.ibatis.annotations.Param; /** * 系统用户mapper接口 diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserParam.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserParam.java index ec59c223..6a787504 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserParam.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserParam.java @@ -24,11 +24,11 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.user.param; +import lombok.Data; +import lombok.EqualsAndHashCode; import vip.xiaonuo.core.pojo.base.param.BaseParam; import vip.xiaonuo.core.validation.date.DateValue; import vip.xiaonuo.sys.modular.emp.param.SysEmpParam; -import lombok.Data; -import lombok.EqualsAndHashCode; import javax.validation.Valid; import javax.validation.constraints.*; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/result/SysUserResult.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/result/SysUserResult.java index 10cbd8a8..5f473f53 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/result/SysUserResult.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/result/SysUserResult.java @@ -24,9 +24,9 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.sys.modular.user.result; -import vip.xiaonuo.sys.modular.emp.result.SysEmpInfo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import vip.xiaonuo.sys.modular.emp.result.SysEmpInfo; import java.util.Date; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java index 8c63d5dd..4d23da82 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java @@ -26,11 +26,11 @@ package vip.xiaonuo.sys.modular.user.service; import cn.hutool.core.lang.Dict; import com.baomidou.mybatisplus.extension.service.IService; +import me.zhyd.oauth.model.AuthUser; import vip.xiaonuo.core.pojo.page.PageResult; import vip.xiaonuo.sys.modular.user.entity.SysUser; import vip.xiaonuo.sys.modular.user.param.SysUserParam; import vip.xiaonuo.sys.modular.user.result.SysUserResult; -import me.zhyd.oauth.model.AuthUser; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserDataScopeServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserDataScopeServiceImpl.java index 18f035e2..465dfcc9 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserDataScopeServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserDataScopeServiceImpl.java @@ -27,11 +27,11 @@ package vip.xiaonuo.sys.modular.user.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.sys.modular.user.entity.SysUserDataScope; import vip.xiaonuo.sys.modular.user.mapper.SysUserDataScopeMapper; import vip.xiaonuo.sys.modular.user.param.SysUserParam; import vip.xiaonuo.sys.modular.user.service.SysUserDataScopeService; -import org.springframework.stereotype.Service; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserRoleServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserRoleServiceImpl.java index d27d8dc0..8298f220 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserRoleServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserRoleServiceImpl.java @@ -28,12 +28,12 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; import vip.xiaonuo.sys.modular.role.service.SysRoleService; import vip.xiaonuo.sys.modular.user.entity.SysUserRole; import vip.xiaonuo.sys.modular.user.mapper.SysUserRoleMapper; import vip.xiaonuo.sys.modular.user.param.SysUserParam; import vip.xiaonuo.sys.modular.user.service.SysUserRoleService; -import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index 37c42065..b5aa8592 100644 --- a/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-base/snowy-system/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -34,6 +34,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import me.zhyd.oauth.enums.AuthUserGender; +import me.zhyd.oauth.model.AuthUser; +import org.springframework.security.crypto.bcrypt.BCrypt; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.core.consts.CommonConstant; import vip.xiaonuo.core.consts.SymbolConstant; import vip.xiaonuo.core.context.constant.ConstantContextHolder; @@ -62,11 +67,6 @@ import vip.xiaonuo.sys.modular.user.result.SysUserResult; import vip.xiaonuo.sys.modular.user.service.SysUserDataScopeService; import vip.xiaonuo.sys.modular.user.service.SysUserRoleService; import vip.xiaonuo.sys.modular.user.service.SysUserService; -import me.zhyd.oauth.enums.AuthUserGender; -import me.zhyd.oauth.model.AuthUser; -import org.springframework.security.crypto.bcrypt.BCrypt; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/controller/DatasourceExampleController.java b/snowy-main/src/main/java/vip/xiaonuo/modular/controller/DatasourceExampleController.java index f6d719f5..75d80b28 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/controller/DatasourceExampleController.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/controller/DatasourceExampleController.java @@ -24,12 +24,12 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 */ package vip.xiaonuo.modular.controller; -import vip.xiaonuo.core.pojo.response.ResponseData; -import vip.xiaonuo.core.pojo.response.SuccessResponseData; -import vip.xiaonuo.modular.service.DatasourceExampleService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import vip.xiaonuo.core.pojo.response.ResponseData; +import vip.xiaonuo.core.pojo.response.SuccessResponseData; +import vip.xiaonuo.modular.service.DatasourceExampleService; import javax.annotation.Resource; diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/service/DatasourceExampleService.java b/snowy-main/src/main/java/vip/xiaonuo/modular/service/DatasourceExampleService.java index 5dc9fcea..0d592c81 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/service/DatasourceExampleService.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/service/DatasourceExampleService.java @@ -25,12 +25,12 @@ Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意 package vip.xiaonuo.modular.service; import cn.hutool.core.util.RandomUtil; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import vip.xiaonuo.sys.modular.app.param.SysAppParam; import vip.xiaonuo.sys.modular.app.service.SysAppService; import vip.xiaonuo.sys.modular.log.entity.SysVisLog; import vip.xiaonuo.sys.modular.log.service.SysVisLogService; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List;