diff --git a/src/main/java/com/bonus/zhly/ZhlyServiceApplication.java b/src/main/java/com/bonus/aqgqj/SzgqjServiceApplication.java similarity index 64% rename from src/main/java/com/bonus/zhly/ZhlyServiceApplication.java rename to src/main/java/com/bonus/aqgqj/SzgqjServiceApplication.java index a241f91..cba23a6 100644 --- a/src/main/java/com/bonus/zhly/ZhlyServiceApplication.java +++ b/src/main/java/com/bonus/aqgqj/SzgqjServiceApplication.java @@ -1,6 +1,6 @@ -package com.bonus.zhly; +package com.bonus.aqgqj; -import com.bonus.zhly.advice.EnableFormValidator; +import com.bonus.aqgqj.advice.EnableFormValidator; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; @@ -16,12 +16,12 @@ import org.springframework.web.socket.config.annotation.EnableWebSocket; @Slf4j @EnableFormValidator @EnableWebSocket -@MapperScan("com.bonus.zhly.*.mapper,com.bonus.zhly.dao,com.bonus.zhly.*.dao") -public class ZhlyServiceApplication { +@MapperScan("com.bonus.aqgqj.*.mapper,com.bonus.zhly.dao,com.bonus.aqgqj.*.dao") +public class SzgqjServiceApplication { public static void main(String[] args) { - SpringApplication.run(ZhlyServiceApplication.class, args); + SpringApplication.run(SzgqjServiceApplication.class, args); System.err.println("启动成功"); } diff --git a/src/main/java/com/bonus/zhly/advice/DecryptAndVerifyAspect.java b/src/main/java/com/bonus/aqgqj/advice/DecryptAndVerifyAspect.java similarity index 85% rename from src/main/java/com/bonus/zhly/advice/DecryptAndVerifyAspect.java rename to src/main/java/com/bonus/aqgqj/advice/DecryptAndVerifyAspect.java index 6f6b486..e954ae3 100644 --- a/src/main/java/com/bonus/zhly/advice/DecryptAndVerifyAspect.java +++ b/src/main/java/com/bonus/aqgqj/advice/DecryptAndVerifyAspect.java @@ -1,10 +1,10 @@ -package com.bonus.zhly.advice; +package com.bonus.aqgqj.advice; import com.alibaba.fastjson.JSON; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.exception.DecryptAndVerifyException; -import com.bonus.zhly.utils.AESCBCUtils; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.exception.DecryptAndVerifyException; +import com.bonus.aqgqj.utils.AESCBCUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; @Aspect @Component public class DecryptAndVerifyAspect { - @Pointcut("@annotation(com.bonus.zhly.annotation.DecryptAndVerify)") + @Pointcut("@annotation(com.bonus.aqgqj.annotation.DecryptAndVerify)") public void pointCut() {} @Around("pointCut()") public Object around(ProceedingJoinPoint joinPoint) throws Throwable { diff --git a/src/main/java/com/bonus/zhly/advice/EnableFormValidator.java b/src/main/java/com/bonus/aqgqj/advice/EnableFormValidator.java similarity index 92% rename from src/main/java/com/bonus/zhly/advice/EnableFormValidator.java rename to src/main/java/com/bonus/aqgqj/advice/EnableFormValidator.java index ca4804d..39931ba 100644 --- a/src/main/java/com/bonus/zhly/advice/EnableFormValidator.java +++ b/src/main/java/com/bonus/aqgqj/advice/EnableFormValidator.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.advice; +package com.bonus.aqgqj.advice; import org.springframework.context.annotation.Import; diff --git a/src/main/java/com/bonus/zhly/advice/ExceptionHandlerAdvice.java b/src/main/java/com/bonus/aqgqj/advice/ExceptionHandlerAdvice.java similarity index 96% rename from src/main/java/com/bonus/zhly/advice/ExceptionHandlerAdvice.java rename to src/main/java/com/bonus/aqgqj/advice/ExceptionHandlerAdvice.java index ecd6c93..4eaf7c5 100644 --- a/src/main/java/com/bonus/zhly/advice/ExceptionHandlerAdvice.java +++ b/src/main/java/com/bonus/aqgqj/advice/ExceptionHandlerAdvice.java @@ -1,7 +1,7 @@ -package com.bonus.zhly.advice; +package com.bonus.aqgqj.advice; -import com.bonus.zhly.system.vo.ResponseInfo; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.vo.ResponseInfo; +import com.bonus.aqgqj.utils.ServerResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/bonus/zhly/advice/LogAdvice.java b/src/main/java/com/bonus/aqgqj/advice/LogAdvice.java similarity index 91% rename from src/main/java/com/bonus/zhly/advice/LogAdvice.java rename to src/main/java/com/bonus/aqgqj/advice/LogAdvice.java index 5feccd8..1c02c18 100644 --- a/src/main/java/com/bonus/zhly/advice/LogAdvice.java +++ b/src/main/java/com/bonus/aqgqj/advice/LogAdvice.java @@ -1,14 +1,14 @@ -package com.bonus.zhly.advice; +package com.bonus.aqgqj.advice; import com.alibaba.fastjson.JSON; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.system.vo.ResultVo; -import com.bonus.zhly.model.SysLogs; -import com.bonus.zhly.system.service.SysLogService; -import com.bonus.zhly.utils.DateTimeHelper; -import com.bonus.zhly.utils.StringHelper; -import com.bonus.zhly.utils.UserUtil; -import com.bonus.zhly.utils.WebUtils; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.system.vo.ResultVo; +import com.bonus.aqgqj.model.SysLogs; +import com.bonus.aqgqj.system.service.SysLogService; +import com.bonus.aqgqj.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.StringHelper; +import com.bonus.aqgqj.utils.UserUtil; +import com.bonus.aqgqj.utils.WebUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; diff --git a/src/main/java/com/bonus/zhly/advice/PermissionService.java b/src/main/java/com/bonus/aqgqj/advice/PermissionService.java similarity index 94% rename from src/main/java/com/bonus/zhly/advice/PermissionService.java rename to src/main/java/com/bonus/aqgqj/advice/PermissionService.java index ad6a54b..f2172ba 100644 --- a/src/main/java/com/bonus/zhly/advice/PermissionService.java +++ b/src/main/java/com/bonus/aqgqj/advice/PermissionService.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.advice; +package com.bonus.aqgqj.advice; import com.alibaba.fastjson.JSON; -import com.bonus.zhly.system.vo.SysMenuVo; -import com.bonus.zhly.model.SysLogs; -import com.bonus.zhly.system.service.SysLogService; -import com.bonus.zhly.system.service.SysMenuService; -import com.bonus.zhly.utils.*; +import com.bonus.aqgqj.system.vo.SysMenuVo; +import com.bonus.aqgqj.model.SysLogs; +import com.bonus.aqgqj.system.service.SysLogService; +import com.bonus.aqgqj.system.service.SysMenuService; +import com.bonus.aqgqj.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/bonus/zhly/advice/ValidatorConfiguration.java b/src/main/java/com/bonus/aqgqj/advice/ValidatorConfiguration.java similarity index 97% rename from src/main/java/com/bonus/zhly/advice/ValidatorConfiguration.java rename to src/main/java/com/bonus/aqgqj/advice/ValidatorConfiguration.java index 78ad0fd..325c844 100644 --- a/src/main/java/com/bonus/zhly/advice/ValidatorConfiguration.java +++ b/src/main/java/com/bonus/aqgqj/advice/ValidatorConfiguration.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.advice; +package com.bonus.aqgqj.advice; import org.hibernate.validator.HibernateValidator; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/bonus/zhly/advice/ValidatorsUtils.java b/src/main/java/com/bonus/aqgqj/advice/ValidatorsUtils.java similarity index 98% rename from src/main/java/com/bonus/zhly/advice/ValidatorsUtils.java rename to src/main/java/com/bonus/aqgqj/advice/ValidatorsUtils.java index 1cfccd1..42016e0 100644 --- a/src/main/java/com/bonus/zhly/advice/ValidatorsUtils.java +++ b/src/main/java/com/bonus/aqgqj/advice/ValidatorsUtils.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.advice; +package com.bonus.aqgqj.advice; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ArrayUtils; diff --git a/src/main/java/com/bonus/zhly/annotation/DecryptAndVerify.java b/src/main/java/com/bonus/aqgqj/annotation/DecryptAndVerify.java similarity index 90% rename from src/main/java/com/bonus/zhly/annotation/DecryptAndVerify.java rename to src/main/java/com/bonus/aqgqj/annotation/DecryptAndVerify.java index bef46f6..5ccc784 100644 --- a/src/main/java/com/bonus/zhly/annotation/DecryptAndVerify.java +++ b/src/main/java/com/bonus/aqgqj/annotation/DecryptAndVerify.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.annotation; +package com.bonus.aqgqj.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/bonus/zhly/annotation/LogAnnotation.java b/src/main/java/com/bonus/aqgqj/annotation/LogAnnotation.java similarity index 93% rename from src/main/java/com/bonus/zhly/annotation/LogAnnotation.java rename to src/main/java/com/bonus/aqgqj/annotation/LogAnnotation.java index 5f2556d..ca060e1 100644 --- a/src/main/java/com/bonus/zhly/annotation/LogAnnotation.java +++ b/src/main/java/com/bonus/aqgqj/annotation/LogAnnotation.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.annotation; +package com.bonus.aqgqj.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/bonus/zhly/base/entity/DtreeVo.java b/src/main/java/com/bonus/aqgqj/base/entity/DtreeVo.java similarity index 86% rename from src/main/java/com/bonus/zhly/base/entity/DtreeVo.java rename to src/main/java/com/bonus/aqgqj/base/entity/DtreeVo.java index 0ecf350..659d03e 100644 --- a/src/main/java/com/bonus/zhly/base/entity/DtreeVo.java +++ b/src/main/java/com/bonus/aqgqj/base/entity/DtreeVo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.base.entity; +package com.bonus.aqgqj.base.entity; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/base/entity/PageEntity.java b/src/main/java/com/bonus/aqgqj/base/entity/PageEntity.java similarity index 87% rename from src/main/java/com/bonus/zhly/base/entity/PageEntity.java rename to src/main/java/com/bonus/aqgqj/base/entity/PageEntity.java index 74a09ea..0d40834 100644 --- a/src/main/java/com/bonus/zhly/base/entity/PageEntity.java +++ b/src/main/java/com/bonus/aqgqj/base/entity/PageEntity.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.base.entity; +package com.bonus.aqgqj.base.entity; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/base/entity/SelectEntity.java b/src/main/java/com/bonus/aqgqj/base/entity/SelectEntity.java similarity index 85% rename from src/main/java/com/bonus/zhly/base/entity/SelectEntity.java rename to src/main/java/com/bonus/aqgqj/base/entity/SelectEntity.java index b744bf0..737b4cd 100644 --- a/src/main/java/com/bonus/zhly/base/entity/SelectEntity.java +++ b/src/main/java/com/bonus/aqgqj/base/entity/SelectEntity.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.base.entity; +package com.bonus.aqgqj.base.entity; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/base/entity/dto/DistinctDto.java b/src/main/java/com/bonus/aqgqj/base/entity/dto/DistinctDto.java similarity index 78% rename from src/main/java/com/bonus/zhly/base/entity/dto/DistinctDto.java rename to src/main/java/com/bonus/aqgqj/base/entity/dto/DistinctDto.java index 294048a..6847fee 100644 --- a/src/main/java/com/bonus/zhly/base/entity/dto/DistinctDto.java +++ b/src/main/java/com/bonus/aqgqj/base/entity/dto/DistinctDto.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.base.entity.dto; +package com.bonus.aqgqj.base.entity.dto; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/config/AsycTaskExecutorConfig.java b/src/main/java/com/bonus/aqgqj/config/AsycTaskExecutorConfig.java similarity index 95% rename from src/main/java/com/bonus/zhly/config/AsycTaskExecutorConfig.java rename to src/main/java/com/bonus/aqgqj/config/AsycTaskExecutorConfig.java index 1e7824f..e7b1bc9 100644 --- a/src/main/java/com/bonus/zhly/config/AsycTaskExecutorConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/AsycTaskExecutorConfig.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/bonus/zhly/config/BnsSecurityConfig.java b/src/main/java/com/bonus/aqgqj/config/BnsSecurityConfig.java similarity index 95% rename from src/main/java/com/bonus/zhly/config/BnsSecurityConfig.java rename to src/main/java/com/bonus/aqgqj/config/BnsSecurityConfig.java index 6adc165..1ac17f3 100644 --- a/src/main/java/com/bonus/zhly/config/BnsSecurityConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/BnsSecurityConfig.java @@ -1,7 +1,7 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; -import com.bonus.zhly.filter.TokenFilter; -import com.bonus.zhly.system.service.impl.UserDetailsServiceImpl; +import com.bonus.aqgqj.filter.TokenFilter; +import com.bonus.aqgqj.system.service.impl.UserDetailsServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; diff --git a/src/main/java/com/bonus/zhly/config/DecodePwdAuthenticationProvider.java b/src/main/java/com/bonus/aqgqj/config/DecodePwdAuthenticationProvider.java similarity index 92% rename from src/main/java/com/bonus/zhly/config/DecodePwdAuthenticationProvider.java rename to src/main/java/com/bonus/aqgqj/config/DecodePwdAuthenticationProvider.java index f8aa138..e1b564b 100644 --- a/src/main/java/com/bonus/zhly/config/DecodePwdAuthenticationProvider.java +++ b/src/main/java/com/bonus/aqgqj/config/DecodePwdAuthenticationProvider.java @@ -1,7 +1,7 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; -import com.bonus.zhly.system.service.impl.UserDetailsServiceImpl; -import com.bonus.zhly.utils.AESCBCUtils; +import com.bonus.aqgqj.system.service.impl.UserDetailsServiceImpl; +import com.bonus.aqgqj.utils.AESCBCUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/com/bonus/zhly/config/DruidConfig.java b/src/main/java/com/bonus/aqgqj/config/DruidConfig.java similarity index 99% rename from src/main/java/com/bonus/zhly/config/DruidConfig.java rename to src/main/java/com/bonus/aqgqj/config/DruidConfig.java index f90e9ec..b6fbd70 100644 --- a/src/main/java/com/bonus/zhly/config/DruidConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.support.http.StatViewServlet; diff --git a/src/main/java/com/bonus/zhly/config/LoginPageConfig.java b/src/main/java/com/bonus/aqgqj/config/LoginPageConfig.java similarity index 91% rename from src/main/java/com/bonus/zhly/config/LoginPageConfig.java rename to src/main/java/com/bonus/aqgqj/config/LoginPageConfig.java index f9dfc9d..b3d03cc 100644 --- a/src/main/java/com/bonus/zhly/config/LoginPageConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/LoginPageConfig.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/com/bonus/zhly/config/OpenBrowserHandler.java b/src/main/java/com/bonus/aqgqj/config/OpenBrowserHandler.java similarity index 97% rename from src/main/java/com/bonus/zhly/config/OpenBrowserHandler.java rename to src/main/java/com/bonus/aqgqj/config/OpenBrowserHandler.java index 42df4d2..416aced 100644 --- a/src/main/java/com/bonus/zhly/config/OpenBrowserHandler.java +++ b/src/main/java/com/bonus/aqgqj/config/OpenBrowserHandler.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; import cn.hutool.system.SystemUtil; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/bonus/zhly/config/RedisConfig.java b/src/main/java/com/bonus/aqgqj/config/RedisConfig.java similarity index 97% rename from src/main/java/com/bonus/zhly/config/RedisConfig.java rename to src/main/java/com/bonus/aqgqj/config/RedisConfig.java index f551fd7..41e7afa 100644 --- a/src/main/java/com/bonus/zhly/config/RedisConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/bonus/zhly/config/SceduleConnfig.java b/src/main/java/com/bonus/aqgqj/config/SceduleConnfig.java similarity index 88% rename from src/main/java/com/bonus/zhly/config/SceduleConnfig.java rename to src/main/java/com/bonus/aqgqj/config/SceduleConnfig.java index e4ef2ce..e3d65f2 100644 --- a/src/main/java/com/bonus/zhly/config/SceduleConnfig.java +++ b/src/main/java/com/bonus/aqgqj/config/SceduleConnfig.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/bonus/zhly/config/SecurityHandlerConfig.java b/src/main/java/com/bonus/aqgqj/config/SecurityHandlerConfig.java similarity index 93% rename from src/main/java/com/bonus/zhly/config/SecurityHandlerConfig.java rename to src/main/java/com/bonus/aqgqj/config/SecurityHandlerConfig.java index ba1920b..086b21b 100644 --- a/src/main/java/com/bonus/zhly/config/SecurityHandlerConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/SecurityHandlerConfig.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; import java.io.IOException; import java.util.HashMap; @@ -10,18 +10,18 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.bonus.zhly.system.dao.SysConfigDao; -import com.bonus.zhly.system.dao.SysLogsDao; -import com.bonus.zhly.system.dao.UserDao; -import com.bonus.zhly.system.vo.LoginUser; -import com.bonus.zhly.system.vo.ResponseInfo; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.system.vo.Token; -import com.bonus.zhly.filter.TokenFilter; -import com.bonus.zhly.model.SysLogs; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.system.service.TokenService; -import com.bonus.zhly.utils.*; +import com.bonus.aqgqj.system.dao.SysConfigDao; +import com.bonus.aqgqj.system.dao.SysLogsDao; +import com.bonus.aqgqj.system.dao.UserDao; +import com.bonus.aqgqj.system.vo.LoginUser; +import com.bonus.aqgqj.system.vo.ResponseInfo; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.system.vo.Token; +import com.bonus.aqgqj.filter.TokenFilter; +import com.bonus.aqgqj.model.SysLogs; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.system.service.TokenService; +import com.bonus.aqgqj.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/bonus/zhly/config/SpringThreadPoolConfig.java b/src/main/java/com/bonus/aqgqj/config/SpringThreadPoolConfig.java similarity index 98% rename from src/main/java/com/bonus/zhly/config/SpringThreadPoolConfig.java rename to src/main/java/com/bonus/aqgqj/config/SpringThreadPoolConfig.java index d08704c..f69fefd 100644 --- a/src/main/java/com/bonus/zhly/config/SpringThreadPoolConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/SpringThreadPoolConfig.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/bonus/zhly/config/SwaggerConfig.java b/src/main/java/com/bonus/aqgqj/config/SwaggerConfig.java similarity index 94% rename from src/main/java/com/bonus/zhly/config/SwaggerConfig.java rename to src/main/java/com/bonus/aqgqj/config/SwaggerConfig.java index ce48f81..993f232 100644 --- a/src/main/java/com/bonus/zhly/config/SwaggerConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/SwaggerConfig.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; -import com.bonus.zhly.filter.TokenFilter; +import com.bonus.aqgqj.filter.TokenFilter; import com.google.common.collect.Lists; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/bonus/zhly/config/WebMvcConfig.java b/src/main/java/com/bonus/aqgqj/config/WebMvcConfig.java similarity index 88% rename from src/main/java/com/bonus/zhly/config/WebMvcConfig.java rename to src/main/java/com/bonus/aqgqj/config/WebMvcConfig.java index 70869ac..5f7449b 100644 --- a/src/main/java/com/bonus/zhly/config/WebMvcConfig.java +++ b/src/main/java/com/bonus/aqgqj/config/WebMvcConfig.java @@ -1,10 +1,8 @@ -package com.bonus.zhly.config; +package com.bonus.aqgqj.config; -import java.io.File; import java.util.List; -import com.bonus.zhly.utils.SystemUtils; -import org.springframework.beans.factory.annotation.Value; +import com.bonus.aqgqj.utils.SystemUtils; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; @@ -12,7 +10,7 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.bonus.zhly.table.PageTableArgumentResolver; +import com.bonus.aqgqj.table.PageTableArgumentResolver; @Configuration public class WebMvcConfig implements WebMvcConfigurer { diff --git a/src/main/java/com/bonus/zhly/exception/DecryptAndVerifyException.java b/src/main/java/com/bonus/aqgqj/exception/DecryptAndVerifyException.java similarity index 83% rename from src/main/java/com/bonus/zhly/exception/DecryptAndVerifyException.java rename to src/main/java/com/bonus/aqgqj/exception/DecryptAndVerifyException.java index b2b26e4..4f48fbc 100644 --- a/src/main/java/com/bonus/zhly/exception/DecryptAndVerifyException.java +++ b/src/main/java/com/bonus/aqgqj/exception/DecryptAndVerifyException.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.exception; +package com.bonus.aqgqj.exception; /** * @author 黑子 diff --git a/src/main/java/com/bonus/zhly/filter/TokenFilter.java b/src/main/java/com/bonus/aqgqj/filter/TokenFilter.java similarity index 96% rename from src/main/java/com/bonus/zhly/filter/TokenFilter.java rename to src/main/java/com/bonus/aqgqj/filter/TokenFilter.java index e170a9a..0190928 100644 --- a/src/main/java/com/bonus/zhly/filter/TokenFilter.java +++ b/src/main/java/com/bonus/aqgqj/filter/TokenFilter.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.filter; +package com.bonus.aqgqj.filter; import java.io.IOException; import java.util.List; @@ -10,11 +10,11 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.bonus.zhly.system.vo.ResponseInfo; -import com.bonus.zhly.system.vo.SysMenuVo; -import com.bonus.zhly.model.SysLogs; -import com.bonus.zhly.system.service.*; -import com.bonus.zhly.utils.*; +import com.bonus.aqgqj.system.vo.ResponseInfo; +import com.bonus.aqgqj.system.vo.SysMenuVo; +import com.bonus.aqgqj.model.SysLogs; +import com.bonus.aqgqj.system.service.*; +import com.bonus.aqgqj.utils.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +26,7 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.bonus.zhly.system.vo.LoginUser; +import com.bonus.aqgqj.system.vo.LoginUser; /** * Token过滤器 diff --git a/src/main/java/com/bonus/zhly/model/BaseEntity.java b/src/main/java/com/bonus/aqgqj/model/BaseEntity.java similarity index 95% rename from src/main/java/com/bonus/zhly/model/BaseEntity.java rename to src/main/java/com/bonus/aqgqj/model/BaseEntity.java index 58fb5b2..49dcc3a 100644 --- a/src/main/java/com/bonus/zhly/model/BaseEntity.java +++ b/src/main/java/com/bonus/aqgqj/model/BaseEntity.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.model; +package com.bonus.aqgqj.model; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/bonus/zhly/model/PasswordConfig.java b/src/main/java/com/bonus/aqgqj/model/PasswordConfig.java similarity index 91% rename from src/main/java/com/bonus/zhly/model/PasswordConfig.java rename to src/main/java/com/bonus/aqgqj/model/PasswordConfig.java index 2723aec..6dc2712 100644 --- a/src/main/java/com/bonus/zhly/model/PasswordConfig.java +++ b/src/main/java/com/bonus/aqgqj/model/PasswordConfig.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.model; +package com.bonus.aqgqj.model; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/model/Permission.java b/src/main/java/com/bonus/aqgqj/model/Permission.java similarity index 94% rename from src/main/java/com/bonus/zhly/model/Permission.java rename to src/main/java/com/bonus/aqgqj/model/Permission.java index d538125..e00dbc3 100644 --- a/src/main/java/com/bonus/zhly/model/Permission.java +++ b/src/main/java/com/bonus/aqgqj/model/Permission.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.model; +package com.bonus.aqgqj.model; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/model/Role.java b/src/main/java/com/bonus/aqgqj/model/Role.java similarity index 79% rename from src/main/java/com/bonus/zhly/model/Role.java rename to src/main/java/com/bonus/aqgqj/model/Role.java index b1015bc..3b51ecf 100644 --- a/src/main/java/com/bonus/zhly/model/Role.java +++ b/src/main/java/com/bonus/aqgqj/model/Role.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.model; +package com.bonus.aqgqj.model; -import com.bonus.zhly.base.entity.PageEntity; +import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; /** diff --git a/src/main/java/com/bonus/zhly/model/SysLogs.java b/src/main/java/com/bonus/aqgqj/model/SysLogs.java similarity index 92% rename from src/main/java/com/bonus/zhly/model/SysLogs.java rename to src/main/java/com/bonus/aqgqj/model/SysLogs.java index e6c7918..7baf6f9 100644 --- a/src/main/java/com/bonus/zhly/model/SysLogs.java +++ b/src/main/java/com/bonus/aqgqj/model/SysLogs.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.model; +package com.bonus.aqgqj.model; -import com.bonus.zhly.base.entity.PageEntity; +import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; @Data diff --git a/src/main/java/com/bonus/zhly/model/SysUser.java b/src/main/java/com/bonus/aqgqj/model/SysUser.java similarity index 92% rename from src/main/java/com/bonus/zhly/model/SysUser.java rename to src/main/java/com/bonus/aqgqj/model/SysUser.java index cdc084e..ab855d6 100644 --- a/src/main/java/com/bonus/zhly/model/SysUser.java +++ b/src/main/java/com/bonus/aqgqj/model/SysUser.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.model; +package com.bonus.aqgqj.model; -import com.bonus.zhly.base.entity.PageEntity; +import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; @Data diff --git a/src/main/java/com/bonus/zhly/model/TokenModel.java b/src/main/java/com/bonus/aqgqj/model/TokenModel.java similarity index 94% rename from src/main/java/com/bonus/zhly/model/TokenModel.java rename to src/main/java/com/bonus/aqgqj/model/TokenModel.java index 01b7181..0fe868c 100644 --- a/src/main/java/com/bonus/zhly/model/TokenModel.java +++ b/src/main/java/com/bonus/aqgqj/model/TokenModel.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.model; +package com.bonus.aqgqj.model; import java.util.Date; diff --git a/src/main/java/com/bonus/zhly/system/controller/DictController.java b/src/main/java/com/bonus/aqgqj/system/controller/DictController.java similarity index 93% rename from src/main/java/com/bonus/zhly/system/controller/DictController.java rename to src/main/java/com/bonus/aqgqj/system/controller/DictController.java index f302472..b21ab62 100644 --- a/src/main/java/com/bonus/zhly/system/controller/DictController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/DictController.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.system.vo.Dict; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.service.DictService; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.system.vo.Dict; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.service.DictService; +import com.bonus.aqgqj.utils.ServerResponse; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/bonus/zhly/system/controller/DistinctController.java b/src/main/java/com/bonus/aqgqj/system/controller/DistinctController.java similarity index 90% rename from src/main/java/com/bonus/zhly/system/controller/DistinctController.java rename to src/main/java/com/bonus/aqgqj/system/controller/DistinctController.java index 7369625..b1d512c 100644 --- a/src/main/java/com/bonus/zhly/system/controller/DistinctController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/DistinctController.java @@ -1,13 +1,13 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.base.entity.dto.DistinctDto; -import com.bonus.zhly.system.vo.DistinctVo; -import com.bonus.zhly.system.service.DistinctService; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.base.entity.dto.DistinctDto; +import com.bonus.aqgqj.system.vo.DistinctVo; +import com.bonus.aqgqj.system.service.DistinctService; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.utils.ServerResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/com/bonus/zhly/system/controller/PermissionController.java b/src/main/java/com/bonus/aqgqj/system/controller/PermissionController.java similarity index 94% rename from src/main/java/com/bonus/zhly/system/controller/PermissionController.java rename to src/main/java/com/bonus/aqgqj/system/controller/PermissionController.java index 5bbf4df..aba4c26 100644 --- a/src/main/java/com/bonus/zhly/system/controller/PermissionController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/PermissionController.java @@ -1,18 +1,18 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.system.dao.PermissionDao; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.LoginUser; -import com.bonus.zhly.model.Permission; -import com.bonus.zhly.system.service.PermissionService; -import com.bonus.zhly.utils.ServerResponse; -import com.bonus.zhly.utils.UserUtil; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.system.dao.PermissionDao; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.LoginUser; +import com.bonus.aqgqj.model.Permission; +import com.bonus.aqgqj.system.service.PermissionService; +import com.bonus.aqgqj.utils.ServerResponse; +import com.bonus.aqgqj.utils.UserUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/com/bonus/zhly/system/controller/RoleController.java b/src/main/java/com/bonus/aqgqj/system/controller/RoleController.java similarity index 91% rename from src/main/java/com/bonus/zhly/system/controller/RoleController.java rename to src/main/java/com/bonus/aqgqj/system/controller/RoleController.java index 6c90b07..91a945f 100644 --- a/src/main/java/com/bonus/zhly/system/controller/RoleController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/RoleController.java @@ -1,14 +1,14 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; import java.util.List; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.system.dao.RoleDao; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RoleDto; -import com.bonus.zhly.model.Role; -import com.bonus.zhly.system.service.RoleService; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.system.dao.RoleDao; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RoleDto; +import com.bonus.aqgqj.model.Role; +import com.bonus.aqgqj.system.service.RoleService; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -17,7 +17,7 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.bonus.zhly.annotation.LogAnnotation; +import com.bonus.aqgqj.annotation.LogAnnotation; /** * 角色相关接口 diff --git a/src/main/java/com/bonus/zhly/system/controller/SysConfigController.java b/src/main/java/com/bonus/aqgqj/system/controller/SysConfigController.java similarity index 90% rename from src/main/java/com/bonus/zhly/system/controller/SysConfigController.java rename to src/main/java/com/bonus/aqgqj/system/controller/SysConfigController.java index 73e29d8..6c44b5d 100644 --- a/src/main/java/com/bonus/zhly/system/controller/SysConfigController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/SysConfigController.java @@ -1,13 +1,13 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.system.service.SysConfigService; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.system.vo.SystemConfigDto; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.system.service.SysConfigService; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.system.vo.SystemConfigDto; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/bonus/zhly/system/controller/SysLogsController.java b/src/main/java/com/bonus/aqgqj/system/controller/SysLogsController.java similarity index 80% rename from src/main/java/com/bonus/zhly/system/controller/SysLogsController.java rename to src/main/java/com/bonus/aqgqj/system/controller/SysLogsController.java index e1c2989..732dd6d 100644 --- a/src/main/java/com/bonus/zhly/system/controller/SysLogsController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/SysLogsController.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.model.SysLogs; -import com.bonus.zhly.system.service.SysLogService; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.model.SysLogs; +import com.bonus.aqgqj.system.service.SysLogService; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/bonus/zhly/system/controller/SysOrgController.java b/src/main/java/com/bonus/aqgqj/system/controller/SysOrgController.java similarity index 90% rename from src/main/java/com/bonus/zhly/system/controller/SysOrgController.java rename to src/main/java/com/bonus/aqgqj/system/controller/SysOrgController.java index a505abc..0012e43 100644 --- a/src/main/java/com/bonus/zhly/system/controller/SysOrgController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/SysOrgController.java @@ -1,13 +1,13 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysOrgVo; -import com.bonus.zhly.system.vo.dto.SysOrgDto; -import com.bonus.zhly.system.service.SysOrgService; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysOrgVo; +import com.bonus.aqgqj.system.vo.dto.SysOrgDto; +import com.bonus.aqgqj.system.service.SysOrgService; +import com.bonus.aqgqj.utils.ServerResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/bonus/zhly/system/controller/TaskController.java b/src/main/java/com/bonus/aqgqj/system/controller/TaskController.java similarity index 91% rename from src/main/java/com/bonus/zhly/system/controller/TaskController.java rename to src/main/java/com/bonus/aqgqj/system/controller/TaskController.java index a446a47..c35a2c8 100644 --- a/src/main/java/com/bonus/zhly/system/controller/TaskController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/TaskController.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.service.TaskService; -import com.bonus.zhly.task.entity.TaskVo; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.service.TaskService; +import com.bonus.aqgqj.task.entity.TaskVo; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/bonus/zhly/system/controller/UserController.java b/src/main/java/com/bonus/aqgqj/system/controller/UserController.java similarity index 94% rename from src/main/java/com/bonus/zhly/system/controller/UserController.java rename to src/main/java/com/bonus/aqgqj/system/controller/UserController.java index 8bd94a9..05340ae 100644 --- a/src/main/java/com/bonus/zhly/system/controller/UserController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/UserController.java @@ -1,20 +1,20 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; import java.util.ArrayList; import java.util.List; import java.util.Objects; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.system.dao.UserDao; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.Org; -import com.bonus.zhly.system.vo.UserDto; -import com.bonus.zhly.model.PasswordConfig; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.system.service.UserService; -import com.bonus.zhly.utils.ServerResponse; -import com.bonus.zhly.utils.StringHelper; -import com.bonus.zhly.utils.UserUtil; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.system.dao.UserDao; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.Org; +import com.bonus.aqgqj.system.vo.UserDto; +import com.bonus.aqgqj.model.PasswordConfig; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.system.service.UserService; +import com.bonus.aqgqj.utils.ServerResponse; +import com.bonus.aqgqj.utils.StringHelper; +import com.bonus.aqgqj.utils.UserUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.slf4j.Logger; @@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import com.bonus.zhly.annotation.LogAnnotation; +import com.bonus.aqgqj.annotation.LogAnnotation; import io.swagger.annotations.Api; diff --git a/src/main/java/com/bonus/zhly/system/controller/WhiteMgeController.java b/src/main/java/com/bonus/aqgqj/system/controller/WhiteMgeController.java similarity index 96% rename from src/main/java/com/bonus/zhly/system/controller/WhiteMgeController.java rename to src/main/java/com/bonus/aqgqj/system/controller/WhiteMgeController.java index 8978c92..805a604 100644 --- a/src/main/java/com/bonus/zhly/system/controller/WhiteMgeController.java +++ b/src/main/java/com/bonus/aqgqj/system/controller/WhiteMgeController.java @@ -1,10 +1,10 @@ -package com.bonus.zhly.system.controller; +package com.bonus.aqgqj.system.controller; -import com.bonus.zhly.annotation.DecryptAndVerify; -import com.bonus.zhly.annotation.LogAnnotation; -import com.bonus.zhly.system.service.SysWhiteService; -import com.bonus.zhly.system.vo.*; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.annotation.DecryptAndVerify; +import com.bonus.aqgqj.annotation.LogAnnotation; +import com.bonus.aqgqj.system.service.SysWhiteService; +import com.bonus.aqgqj.system.vo.*; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/bonus/zhly/system/dao/DictDao.java b/src/main/java/com/bonus/aqgqj/system/dao/DictDao.java similarity index 93% rename from src/main/java/com/bonus/zhly/system/dao/DictDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/DictDao.java index b418471..3afa1e6 100644 --- a/src/main/java/com/bonus/zhly/system/dao/DictDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/DictDao.java @@ -1,9 +1,9 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; import java.util.List; import java.util.Map; -import com.bonus.zhly.system.vo.Dict; +import com.bonus.aqgqj.system.vo.Dict; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Options; diff --git a/src/main/java/com/bonus/zhly/system/dao/DistinctDao.java b/src/main/java/com/bonus/aqgqj/system/dao/DistinctDao.java similarity index 87% rename from src/main/java/com/bonus/zhly/system/dao/DistinctDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/DistinctDao.java index 9ba5e5b..2e40ddd 100644 --- a/src/main/java/com/bonus/zhly/system/dao/DistinctDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/DistinctDao.java @@ -1,8 +1,8 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; -import com.bonus.zhly.base.entity.dto.DistinctDto; -import com.bonus.zhly.system.vo.DistinctVo; -import com.bonus.zhly.system.vo.RepeatEntity; +import com.bonus.aqgqj.base.entity.dto.DistinctDto; +import com.bonus.aqgqj.system.vo.DistinctVo; +import com.bonus.aqgqj.system.vo.RepeatEntity; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/dao/PermissionDao.java b/src/main/java/com/bonus/aqgqj/system/dao/PermissionDao.java similarity index 94% rename from src/main/java/com/bonus/zhly/system/dao/PermissionDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/PermissionDao.java index 3be68d7..caeb33f 100644 --- a/src/main/java/com/bonus/zhly/system/dao/PermissionDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/PermissionDao.java @@ -1,15 +1,18 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; import java.util.List; import java.util.Set; -import com.bonus.zhly.model.Permission; +import com.bonus.aqgqj.model.Permission; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; +/** + * @author 黑子 + */ @Mapper public interface PermissionDao { diff --git a/src/main/java/com/bonus/zhly/system/dao/RoleDao.java b/src/main/java/com/bonus/aqgqj/system/dao/RoleDao.java similarity index 95% rename from src/main/java/com/bonus/zhly/system/dao/RoleDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/RoleDao.java index ca290c6..13a9934 100644 --- a/src/main/java/com/bonus/zhly/system/dao/RoleDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/RoleDao.java @@ -1,8 +1,8 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; import java.util.List; -import com.bonus.zhly.model.Role; +import com.bonus.aqgqj.model.Role; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/bonus/zhly/system/dao/SysConfigDao.java b/src/main/java/com/bonus/aqgqj/system/dao/SysConfigDao.java similarity index 88% rename from src/main/java/com/bonus/zhly/system/dao/SysConfigDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/SysConfigDao.java index 75a7d23..1bc2e9f 100644 --- a/src/main/java/com/bonus/zhly/system/dao/SysConfigDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/SysConfigDao.java @@ -1,8 +1,8 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.system.vo.SystemConfigDto; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.system.vo.SystemConfigDto; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/bonus/zhly/system/dao/SysLogsDao.java b/src/main/java/com/bonus/aqgqj/system/dao/SysLogsDao.java similarity index 88% rename from src/main/java/com/bonus/zhly/system/dao/SysLogsDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/SysLogsDao.java index ae2eb36..e7faa3b 100644 --- a/src/main/java/com/bonus/zhly/system/dao/SysLogsDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/SysLogsDao.java @@ -1,9 +1,9 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; import java.util.List; import java.util.Map; -import com.bonus.zhly.model.SysLogs; +import com.bonus.aqgqj.model.SysLogs; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/bonus/zhly/system/dao/SysMenuDao.java b/src/main/java/com/bonus/aqgqj/system/dao/SysMenuDao.java similarity index 89% rename from src/main/java/com/bonus/zhly/system/dao/SysMenuDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/SysMenuDao.java index 4fe67bd..82dcb7a 100644 --- a/src/main/java/com/bonus/zhly/system/dao/SysMenuDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/SysMenuDao.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; -import com.bonus.zhly.system.vo.SysMenuVo; +import com.bonus.aqgqj.system.vo.SysMenuVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/bonus/zhly/system/dao/SysOrgMapper.java b/src/main/java/com/bonus/aqgqj/system/dao/SysOrgMapper.java similarity index 87% rename from src/main/java/com/bonus/zhly/system/dao/SysOrgMapper.java rename to src/main/java/com/bonus/aqgqj/system/dao/SysOrgMapper.java index d744982..6550578 100644 --- a/src/main/java/com/bonus/zhly/system/dao/SysOrgMapper.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/SysOrgMapper.java @@ -1,9 +1,9 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; -import com.bonus.zhly.base.entity.DtreeVo; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysOrgVo; -import com.bonus.zhly.system.vo.dto.SysOrgDto; +import com.bonus.aqgqj.base.entity.DtreeVo; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysOrgVo; +import com.bonus.aqgqj.system.vo.dto.SysOrgDto; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/dao/SysWhiteDao.java b/src/main/java/com/bonus/aqgqj/system/dao/SysWhiteDao.java similarity index 88% rename from src/main/java/com/bonus/zhly/system/dao/SysWhiteDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/SysWhiteDao.java index b6bec58..5a7afe6 100644 --- a/src/main/java/com/bonus/zhly/system/dao/SysWhiteDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/SysWhiteDao.java @@ -1,9 +1,9 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; -import com.bonus.zhly.system.vo.PwdRuleVo; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysWhiteDto; -import com.bonus.zhly.system.vo.SysWhiteVo; +import com.bonus.aqgqj.system.vo.PwdRuleVo; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysWhiteDto; +import com.bonus.aqgqj.system.vo.SysWhiteVo; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/dao/TaskDao.java b/src/main/java/com/bonus/aqgqj/system/dao/TaskDao.java similarity index 91% rename from src/main/java/com/bonus/zhly/system/dao/TaskDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/TaskDao.java index 26c9e59..676e62a 100644 --- a/src/main/java/com/bonus/zhly/system/dao/TaskDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/TaskDao.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; -import com.bonus.zhly.task.entity.TaskVo; +import com.bonus.aqgqj.task.entity.TaskVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/bonus/zhly/system/dao/UserDao.java b/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java similarity index 84% rename from src/main/java/com/bonus/zhly/system/dao/UserDao.java rename to src/main/java/com/bonus/aqgqj/system/dao/UserDao.java index f8e2655..c618a10 100644 --- a/src/main/java/com/bonus/zhly/system/dao/UserDao.java +++ b/src/main/java/com/bonus/aqgqj/system/dao/UserDao.java @@ -1,13 +1,13 @@ -package com.bonus.zhly.system.dao; +package com.bonus.aqgqj.system.dao; import java.util.List; import java.util.Map; -import com.bonus.zhly.system.vo.LoginUser; -import com.bonus.zhly.system.vo.Org; -import com.bonus.zhly.system.vo.UserDto; -import com.bonus.zhly.model.PasswordConfig; -import com.bonus.zhly.model.SysUser; +import com.bonus.aqgqj.system.vo.LoginUser; +import com.bonus.aqgqj.system.vo.Org; +import com.bonus.aqgqj.system.vo.UserDto; +import com.bonus.aqgqj.model.PasswordConfig; +import com.bonus.aqgqj.model.SysUser; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/bonus/zhly/system/service/DictService.java b/src/main/java/com/bonus/aqgqj/system/service/DictService.java similarity index 77% rename from src/main/java/com/bonus/zhly/system/service/DictService.java rename to src/main/java/com/bonus/aqgqj/system/service/DictService.java index 9d3c4cd..cf13211 100644 --- a/src/main/java/com/bonus/zhly/system/service/DictService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/DictService.java @@ -1,8 +1,8 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.system.vo.Dict; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.vo.Dict; +import com.bonus.aqgqj.utils.ServerResponse; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/service/DistinctService.java b/src/main/java/com/bonus/aqgqj/system/service/DistinctService.java similarity index 80% rename from src/main/java/com/bonus/zhly/system/service/DistinctService.java rename to src/main/java/com/bonus/aqgqj/system/service/DistinctService.java index da6fe37..04f3bb8 100644 --- a/src/main/java/com/bonus/zhly/system/service/DistinctService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/DistinctService.java @@ -1,10 +1,10 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.base.entity.dto.DistinctDto; -import com.bonus.zhly.system.vo.DistinctVo; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.base.entity.dto.DistinctDto; +import com.bonus.aqgqj.system.vo.DistinctVo; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.utils.ServerResponse; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/service/PermissionService.java b/src/main/java/com/bonus/aqgqj/system/service/PermissionService.java similarity index 78% rename from src/main/java/com/bonus/zhly/system/service/PermissionService.java rename to src/main/java/com/bonus/aqgqj/system/service/PermissionService.java index b7ff3b2..bc516c8 100644 --- a/src/main/java/com/bonus/zhly/system/service/PermissionService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/PermissionService.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.model.Permission; +import com.bonus.aqgqj.model.Permission; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/service/RoleService.java b/src/main/java/com/bonus/aqgqj/system/service/RoleService.java similarity index 59% rename from src/main/java/com/bonus/zhly/system/service/RoleService.java rename to src/main/java/com/bonus/aqgqj/system/service/RoleService.java index e5d5eb8..94f3b24 100644 --- a/src/main/java/com/bonus/zhly/system/service/RoleService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/RoleService.java @@ -1,8 +1,8 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.system.vo.RoleDto; -import com.bonus.zhly.model.Role; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.vo.RoleDto; +import com.bonus.aqgqj.model.Role; +import com.bonus.aqgqj.utils.ServerResponse; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/service/SysConfigService.java b/src/main/java/com/bonus/aqgqj/system/service/SysConfigService.java similarity index 82% rename from src/main/java/com/bonus/zhly/system/service/SysConfigService.java rename to src/main/java/com/bonus/aqgqj/system/service/SysConfigService.java index 1b8de5e..9cbfa1e 100644 --- a/src/main/java/com/bonus/zhly/system/service/SysConfigService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/SysConfigService.java @@ -1,10 +1,10 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.system.vo.SystemConfigDto; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.system.vo.SystemConfigDto; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageInfo; /** diff --git a/src/main/java/com/bonus/zhly/system/service/SysLogService.java b/src/main/java/com/bonus/aqgqj/system/service/SysLogService.java similarity index 77% rename from src/main/java/com/bonus/zhly/system/service/SysLogService.java rename to src/main/java/com/bonus/aqgqj/system/service/SysLogService.java index 876a5c1..90f331b 100644 --- a/src/main/java/com/bonus/zhly/system/service/SysLogService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/SysLogService.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.model.SysLogs; +import com.bonus.aqgqj.model.SysLogs; import com.github.pagehelper.PageInfo; /** diff --git a/src/main/java/com/bonus/zhly/system/service/SysMenuService.java b/src/main/java/com/bonus/aqgqj/system/service/SysMenuService.java similarity index 83% rename from src/main/java/com/bonus/zhly/system/service/SysMenuService.java rename to src/main/java/com/bonus/aqgqj/system/service/SysMenuService.java index 09c520f..cae1d6f 100644 --- a/src/main/java/com/bonus/zhly/system/service/SysMenuService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/SysMenuService.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.system.vo.SysMenuVo; +import com.bonus.aqgqj.system.vo.SysMenuVo; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/service/SysOrgService.java b/src/main/java/com/bonus/aqgqj/system/service/SysOrgService.java similarity index 83% rename from src/main/java/com/bonus/zhly/system/service/SysOrgService.java rename to src/main/java/com/bonus/aqgqj/system/service/SysOrgService.java index b623a2f..49dc039 100644 --- a/src/main/java/com/bonus/zhly/system/service/SysOrgService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/SysOrgService.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysOrgVo; -import com.bonus.zhly.system.vo.dto.SysOrgDto; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysOrgVo; +import com.bonus.aqgqj.system.vo.dto.SysOrgDto; +import com.bonus.aqgqj.utils.ServerResponse; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/service/SysWhiteService.java b/src/main/java/com/bonus/aqgqj/system/service/SysWhiteService.java similarity index 86% rename from src/main/java/com/bonus/zhly/system/service/SysWhiteService.java rename to src/main/java/com/bonus/aqgqj/system/service/SysWhiteService.java index ea62576..2c8ecfb 100644 --- a/src/main/java/com/bonus/zhly/system/service/SysWhiteService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/SysWhiteService.java @@ -1,10 +1,10 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.system.vo.PwdRuleVo; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysWhiteDto; -import com.bonus.zhly.system.vo.SysWhiteVo; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.vo.PwdRuleVo; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysWhiteDto; +import com.bonus.aqgqj.system.vo.SysWhiteVo; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageInfo; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/bonus/zhly/system/service/TaskService.java b/src/main/java/com/bonus/aqgqj/system/service/TaskService.java similarity index 86% rename from src/main/java/com/bonus/zhly/system/service/TaskService.java rename to src/main/java/com/bonus/aqgqj/system/service/TaskService.java index fac5a17..4a6af97 100644 --- a/src/main/java/com/bonus/zhly/system/service/TaskService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/TaskService.java @@ -1,7 +1,7 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.task.entity.TaskVo; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.task.entity.TaskVo; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageInfo; /** diff --git a/src/main/java/com/bonus/zhly/system/service/TokenService.java b/src/main/java/com/bonus/aqgqj/system/service/TokenService.java similarity index 70% rename from src/main/java/com/bonus/zhly/system/service/TokenService.java rename to src/main/java/com/bonus/aqgqj/system/service/TokenService.java index cf232a3..5a204d7 100644 --- a/src/main/java/com/bonus/zhly/system/service/TokenService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/TokenService.java @@ -1,7 +1,7 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.system.vo.LoginUser; -import com.bonus.zhly.system.vo.Token; +import com.bonus.aqgqj.system.vo.LoginUser; +import com.bonus.aqgqj.system.vo.Token; /** * Token管理器
diff --git a/src/main/java/com/bonus/zhly/system/service/UserService.java b/src/main/java/com/bonus/aqgqj/system/service/UserService.java similarity index 73% rename from src/main/java/com/bonus/zhly/system/service/UserService.java rename to src/main/java/com/bonus/aqgqj/system/service/UserService.java index cde9e96..f9b1600 100644 --- a/src/main/java/com/bonus/zhly/system/service/UserService.java +++ b/src/main/java/com/bonus/aqgqj/system/service/UserService.java @@ -1,10 +1,10 @@ -package com.bonus.zhly.system.service; +package com.bonus.aqgqj.system.service; -import com.bonus.zhly.system.vo.Org; -import com.bonus.zhly.system.vo.UserDto; -import com.bonus.zhly.model.PasswordConfig; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.vo.Org; +import com.bonus.aqgqj.system.vo.UserDto; +import com.bonus.aqgqj.model.PasswordConfig; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.utils.ServerResponse; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/DictServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/DictServiceImpl.java similarity index 90% rename from src/main/java/com/bonus/zhly/system/service/impl/DictServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/DictServiceImpl.java index 3968b9a..53a117a 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/DictServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/DictServiceImpl.java @@ -1,9 +1,9 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; -import com.bonus.zhly.system.dao.DictDao; -import com.bonus.zhly.system.vo.Dict; -import com.bonus.zhly.system.service.DictService; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.dao.DictDao; +import com.bonus.aqgqj.system.vo.Dict; +import com.bonus.aqgqj.system.service.DictService; +import com.bonus.aqgqj.utils.ServerResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/DistinctServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/DistinctServiceImpl.java similarity index 92% rename from src/main/java/com/bonus/zhly/system/service/impl/DistinctServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/DistinctServiceImpl.java index 4165b33..b889de2 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/DistinctServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/DistinctServiceImpl.java @@ -1,14 +1,14 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; -import com.bonus.zhly.advice.ValidatorsUtils; -import com.bonus.zhly.base.entity.dto.DistinctDto; -import com.bonus.zhly.system.dao.DistinctDao; -import com.bonus.zhly.system.vo.DistinctVo; -import com.bonus.zhly.system.service.DistinctService; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.utils.ServerResponse; -import com.bonus.zhly.webResult.HttpStatus; +import com.bonus.aqgqj.advice.ValidatorsUtils; +import com.bonus.aqgqj.base.entity.dto.DistinctDto; +import com.bonus.aqgqj.system.dao.DistinctDao; +import com.bonus.aqgqj.system.vo.DistinctVo; +import com.bonus.aqgqj.system.service.DistinctService; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.utils.ServerResponse; +import com.bonus.aqgqj.webResult.HttpStatus; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/PermissionServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/PermissionServiceImpl.java similarity index 86% rename from src/main/java/com/bonus/zhly/system/service/impl/PermissionServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/PermissionServiceImpl.java index 3c59580..c432efa 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/PermissionServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/PermissionServiceImpl.java @@ -1,8 +1,8 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; -import com.bonus.zhly.system.dao.PermissionDao; -import com.bonus.zhly.model.Permission; -import com.bonus.zhly.system.service.PermissionService; +import com.bonus.aqgqj.system.dao.PermissionDao; +import com.bonus.aqgqj.model.Permission; +import com.bonus.aqgqj.system.service.PermissionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/RoleServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/RoleServiceImpl.java similarity index 91% rename from src/main/java/com/bonus/zhly/system/service/impl/RoleServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/RoleServiceImpl.java index 328f7ec..e2cc482 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/RoleServiceImpl.java @@ -1,10 +1,10 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; import java.util.List; import java.util.Objects; -import com.bonus.zhly.system.service.RoleService; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.system.service.RoleService; +import com.bonus.aqgqj.utils.ServerResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -13,9 +13,9 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.CollectionUtils; -import com.bonus.zhly.system.dao.RoleDao; -import com.bonus.zhly.system.vo.RoleDto; -import com.bonus.zhly.model.Role; +import com.bonus.aqgqj.system.dao.RoleDao; +import com.bonus.aqgqj.system.vo.RoleDto; +import com.bonus.aqgqj.model.Role; @Service public class RoleServiceImpl implements RoleService { diff --git a/src/main/java/com/bonus/zhly/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/SysConfigServiceImpl.java similarity index 91% rename from src/main/java/com/bonus/zhly/system/service/impl/SysConfigServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/SysConfigServiceImpl.java index 5f35451..43e23ce 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/SysConfigServiceImpl.java @@ -1,14 +1,14 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; -import com.bonus.zhly.advice.ValidatorsUtils; -import com.bonus.zhly.system.dao.SysConfigDao; -import com.bonus.zhly.system.service.SysConfigService; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.system.vo.SystemConfigDto; -import com.bonus.zhly.utils.DateTimeHelper; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.advice.ValidatorsUtils; +import com.bonus.aqgqj.system.dao.SysConfigDao; +import com.bonus.aqgqj.system.service.SysConfigService; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.system.vo.SystemConfigDto; +import com.bonus.aqgqj.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.ServerResponse; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/SysLogServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/SysLogServiceImpl.java similarity index 85% rename from src/main/java/com/bonus/zhly/system/service/impl/SysLogServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/SysLogServiceImpl.java index 59932df..958cb46 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/SysLogServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/SysLogServiceImpl.java @@ -1,13 +1,13 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; import java.util.Date; import java.util.List; -import com.bonus.zhly.advice.LogAdvice; -import com.bonus.zhly.system.dao.SysLogsDao; -import com.bonus.zhly.model.SysLogs; -import com.bonus.zhly.system.service.SysLogService; -import com.bonus.zhly.utils.StringHelper; +import com.bonus.aqgqj.advice.LogAdvice; +import com.bonus.aqgqj.system.dao.SysLogsDao; +import com.bonus.aqgqj.model.SysLogs; +import com.bonus.aqgqj.system.service.SysLogService; +import com.bonus.aqgqj.utils.StringHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/SysMenuServiceImpl.java similarity index 87% rename from src/main/java/com/bonus/zhly/system/service/impl/SysMenuServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/SysMenuServiceImpl.java index 8649ee6..88edd61 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/SysMenuServiceImpl.java @@ -1,10 +1,10 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; -import com.bonus.zhly.system.dao.SysMenuDao; -import com.bonus.zhly.system.vo.SysMenuVo; -import com.bonus.zhly.system.service.SysMenuService; -import com.bonus.zhly.utils.ListHelper; -import com.bonus.zhly.utils.StringHelper; +import com.bonus.aqgqj.system.dao.SysMenuDao; +import com.bonus.aqgqj.system.vo.SysMenuVo; +import com.bonus.aqgqj.system.service.SysMenuService; +import com.bonus.aqgqj.utils.ListHelper; +import com.bonus.aqgqj.utils.StringHelper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/SysOrgServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/SysOrgServiceImpl.java similarity index 92% rename from src/main/java/com/bonus/zhly/system/service/impl/SysOrgServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/SysOrgServiceImpl.java index 3589f10..992263e 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/SysOrgServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/SysOrgServiceImpl.java @@ -1,15 +1,15 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; -import com.bonus.zhly.advice.ValidatorsUtils; -import com.bonus.zhly.base.entity.DtreeVo; -import com.bonus.zhly.system.dao.SysOrgMapper; -import com.bonus.zhly.system.vo.EncryptedReq; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysOrgVo; -import com.bonus.zhly.system.vo.dto.SysOrgDto; -import com.bonus.zhly.system.service.SysOrgService; -import com.bonus.zhly.utils.DateTimeHelper; -import com.bonus.zhly.utils.ServerResponse; +import com.bonus.aqgqj.advice.ValidatorsUtils; +import com.bonus.aqgqj.base.entity.DtreeVo; +import com.bonus.aqgqj.system.dao.SysOrgMapper; +import com.bonus.aqgqj.system.vo.EncryptedReq; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysOrgVo; +import com.bonus.aqgqj.system.vo.dto.SysOrgDto; +import com.bonus.aqgqj.system.service.SysOrgService; +import com.bonus.aqgqj.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.ServerResponse; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/SysWhiteServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/SysWhiteServiceImpl.java similarity index 91% rename from src/main/java/com/bonus/zhly/system/service/impl/SysWhiteServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/SysWhiteServiceImpl.java index df2be22..8b24cac 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/SysWhiteServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/SysWhiteServiceImpl.java @@ -1,17 +1,17 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; -import com.bonus.zhly.advice.ValidatorsUtils; -import com.bonus.zhly.system.dao.SysWhiteDao; -import com.bonus.zhly.system.vo.PwdRuleVo; -import com.bonus.zhly.system.vo.RepeatEntity; -import com.bonus.zhly.system.vo.SysWhiteDto; +import com.bonus.aqgqj.advice.ValidatorsUtils; +import com.bonus.aqgqj.system.dao.SysWhiteDao; +import com.bonus.aqgqj.system.vo.PwdRuleVo; +import com.bonus.aqgqj.system.vo.RepeatEntity; +import com.bonus.aqgqj.system.vo.SysWhiteDto; -import com.bonus.zhly.system.service.SysWhiteService; -import com.bonus.zhly.system.vo.SysWhiteVo; -import com.bonus.zhly.utils.DateTimeHelper; -import com.bonus.zhly.utils.ListHelper; -import com.bonus.zhly.utils.ServerResponse; -import com.bonus.zhly.utils.WebUtils; +import com.bonus.aqgqj.system.service.SysWhiteService; +import com.bonus.aqgqj.system.vo.SysWhiteVo; +import com.bonus.aqgqj.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.ListHelper; +import com.bonus.aqgqj.utils.ServerResponse; +import com.bonus.aqgqj.utils.WebUtils; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/TaskServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/TaskServiceImpl.java similarity index 95% rename from src/main/java/com/bonus/zhly/system/service/impl/TaskServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/TaskServiceImpl.java index 1ff4077..fd24f95 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/TaskServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/TaskServiceImpl.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; -import com.bonus.zhly.system.dao.TaskDao; -import com.bonus.zhly.system.service.TaskService; -import com.bonus.zhly.task.entity.TaskVo; -import com.bonus.zhly.task.service.ScheduleService; -import com.bonus.zhly.utils.ServerResponse; -import com.bonus.zhly.utils.StringHelper; +import com.bonus.aqgqj.system.dao.TaskDao; +import com.bonus.aqgqj.system.service.TaskService; +import com.bonus.aqgqj.task.entity.TaskVo; +import com.bonus.aqgqj.task.service.ScheduleService; +import com.bonus.aqgqj.utils.ServerResponse; +import com.bonus.aqgqj.utils.StringHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.quartz.CronExpression; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/TokenServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java similarity index 87% rename from src/main/java/com/bonus/zhly/system/service/impl/TokenServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java index 4573488..e4430d8 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/TokenServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/TokenServiceImpl.java @@ -1,12 +1,12 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; import java.util.concurrent.TimeUnit; -import com.bonus.zhly.system.vo.LoginUser; -import com.bonus.zhly.system.vo.Token; -import com.bonus.zhly.system.service.SysLogService; -import com.bonus.zhly.system.service.TokenService; -import com.bonus.zhly.utils.JwtHelper; +import com.bonus.aqgqj.system.vo.LoginUser; +import com.bonus.aqgqj.system.vo.Token; +import com.bonus.aqgqj.system.service.SysLogService; +import com.bonus.aqgqj.system.service.TokenService; +import com.bonus.aqgqj.utils.JwtHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/UserDetailsServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/UserDetailsServiceImpl.java similarity index 91% rename from src/main/java/com/bonus/zhly/system/service/impl/UserDetailsServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/UserDetailsServiceImpl.java index 2609ad6..80374d9 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/UserDetailsServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/UserDetailsServiceImpl.java @@ -1,12 +1,12 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; import java.util.*; -import com.bonus.zhly.system.dao.SysConfigDao; -import com.bonus.zhly.system.dao.SysLogsDao; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.model.SysLogs; -import com.bonus.zhly.utils.*; +import com.bonus.aqgqj.system.dao.SysConfigDao; +import com.bonus.aqgqj.system.dao.SysLogsDao; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.model.SysLogs; +import com.bonus.aqgqj.utils.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -18,11 +18,11 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; -import com.bonus.zhly.system.dao.PermissionDao; -import com.bonus.zhly.system.vo.LoginUser; -import com.bonus.zhly.model.Permission; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.system.service.UserService; +import com.bonus.aqgqj.system.dao.PermissionDao; +import com.bonus.aqgqj.system.vo.LoginUser; +import com.bonus.aqgqj.model.Permission; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.system.service.UserService; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; diff --git a/src/main/java/com/bonus/zhly/system/service/impl/UserServiceImpl.java b/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java similarity index 90% rename from src/main/java/com/bonus/zhly/system/service/impl/UserServiceImpl.java rename to src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java index 23abd03..44e68c6 100644 --- a/src/main/java/com/bonus/zhly/system/service/impl/UserServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/system/service/impl/UserServiceImpl.java @@ -1,12 +1,12 @@ -package com.bonus.zhly.system.service.impl; +package com.bonus.aqgqj.system.service.impl; import java.util.List; import java.util.Map; -import com.bonus.zhly.system.vo.Org; -import com.bonus.zhly.model.PasswordConfig; -import com.bonus.zhly.utils.ServerResponse; -import com.bonus.zhly.utils.UserUtil; +import com.bonus.aqgqj.system.vo.Org; +import com.bonus.aqgqj.model.PasswordConfig; +import com.bonus.aqgqj.utils.ServerResponse; +import com.bonus.aqgqj.utils.UserUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -14,10 +14,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import com.bonus.zhly.system.dao.UserDao; -import com.bonus.zhly.system.vo.UserDto; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.system.service.UserService; +import com.bonus.aqgqj.system.dao.UserDao; +import com.bonus.aqgqj.system.vo.UserDto; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.system.service.UserService; import javax.annotation.Resource; diff --git a/src/main/java/com/bonus/zhly/system/vo/Dict.java b/src/main/java/com/bonus/aqgqj/system/vo/Dict.java similarity index 80% rename from src/main/java/com/bonus/zhly/system/vo/Dict.java rename to src/main/java/com/bonus/aqgqj/system/vo/Dict.java index bc6146b..707f4ac 100644 --- a/src/main/java/com/bonus/zhly/system/vo/Dict.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/Dict.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; -import com.bonus.zhly.base.entity.PageEntity; +import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; @Data diff --git a/src/main/java/com/bonus/zhly/system/vo/DistinctVo.java b/src/main/java/com/bonus/aqgqj/system/vo/DistinctVo.java similarity index 95% rename from src/main/java/com/bonus/zhly/system/vo/DistinctVo.java rename to src/main/java/com/bonus/aqgqj/system/vo/DistinctVo.java index 155f56b..59ca28f 100644 --- a/src/main/java/com/bonus/zhly/system/vo/DistinctVo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/DistinctVo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/com/bonus/zhly/system/vo/EncryptedReq.java b/src/main/java/com/bonus/aqgqj/system/vo/EncryptedReq.java similarity index 89% rename from src/main/java/com/bonus/zhly/system/vo/EncryptedReq.java rename to src/main/java/com/bonus/aqgqj/system/vo/EncryptedReq.java index 5933597..818c620 100644 --- a/src/main/java/com/bonus/zhly/system/vo/EncryptedReq.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/EncryptedReq.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/system/vo/GenerateInput.java b/src/main/java/com/bonus/aqgqj/system/vo/GenerateInput.java similarity index 98% rename from src/main/java/com/bonus/zhly/system/vo/GenerateInput.java rename to src/main/java/com/bonus/aqgqj/system/vo/GenerateInput.java index dc91726..6c15e07 100644 --- a/src/main/java/com/bonus/zhly/system/vo/GenerateInput.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/GenerateInput.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/system/vo/LayuiFile.java b/src/main/java/com/bonus/aqgqj/system/vo/LayuiFile.java similarity index 96% rename from src/main/java/com/bonus/zhly/system/vo/LayuiFile.java rename to src/main/java/com/bonus/aqgqj/system/vo/LayuiFile.java index 47652a3..c5c2117 100644 --- a/src/main/java/com/bonus/zhly/system/vo/LayuiFile.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/LayuiFile.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import java.io.Serializable; diff --git a/src/main/java/com/bonus/zhly/system/vo/LoginUser.java b/src/main/java/com/bonus/aqgqj/system/vo/LoginUser.java similarity index 94% rename from src/main/java/com/bonus/zhly/system/vo/LoginUser.java rename to src/main/java/com/bonus/aqgqj/system/vo/LoginUser.java index 7050254..03ea27c 100644 --- a/src/main/java/com/bonus/zhly/system/vo/LoginUser.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/LoginUser.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import com.bonus.zhly.model.Permission; -import com.bonus.zhly.model.SysUser; +import com.bonus.aqgqj.model.Permission; +import com.bonus.aqgqj.model.SysUser; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/com/bonus/zhly/system/vo/Org.java b/src/main/java/com/bonus/aqgqj/system/vo/Org.java similarity index 80% rename from src/main/java/com/bonus/zhly/system/vo/Org.java rename to src/main/java/com/bonus/aqgqj/system/vo/Org.java index 804d2b1..f11db6c 100644 --- a/src/main/java/com/bonus/zhly/system/vo/Org.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/Org.java @@ -1,6 +1,5 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; -import com.bonus.zhly.base.entity.PageEntity; import lombok.Data; @Data diff --git a/src/main/java/com/bonus/zhly/system/vo/PwdRuleVo.java b/src/main/java/com/bonus/aqgqj/system/vo/PwdRuleVo.java similarity index 96% rename from src/main/java/com/bonus/zhly/system/vo/PwdRuleVo.java rename to src/main/java/com/bonus/aqgqj/system/vo/PwdRuleVo.java index b3b1ef4..3545928 100644 --- a/src/main/java/com/bonus/zhly/system/vo/PwdRuleVo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/PwdRuleVo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/com/bonus/zhly/system/vo/RepeatEntity.java b/src/main/java/com/bonus/aqgqj/system/vo/RepeatEntity.java similarity index 91% rename from src/main/java/com/bonus/zhly/system/vo/RepeatEntity.java rename to src/main/java/com/bonus/aqgqj/system/vo/RepeatEntity.java index 75e005d..4100dc2 100644 --- a/src/main/java/com/bonus/zhly/system/vo/RepeatEntity.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/RepeatEntity.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/system/vo/ResponseInfo.java b/src/main/java/com/bonus/aqgqj/system/vo/ResponseInfo.java similarity index 93% rename from src/main/java/com/bonus/zhly/system/vo/ResponseInfo.java rename to src/main/java/com/bonus/aqgqj/system/vo/ResponseInfo.java index d91e5b8..b073234 100644 --- a/src/main/java/com/bonus/zhly/system/vo/ResponseInfo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/ResponseInfo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import java.io.Serializable; diff --git a/src/main/java/com/bonus/zhly/system/vo/ResultVo.java b/src/main/java/com/bonus/aqgqj/system/vo/ResultVo.java similarity index 79% rename from src/main/java/com/bonus/zhly/system/vo/ResultVo.java rename to src/main/java/com/bonus/aqgqj/system/vo/ResultVo.java index 3d15881..4d717c1 100644 --- a/src/main/java/com/bonus/zhly/system/vo/ResultVo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/ResultVo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/system/vo/RoleDto.java b/src/main/java/com/bonus/aqgqj/system/vo/RoleDto.java similarity index 82% rename from src/main/java/com/bonus/zhly/system/vo/RoleDto.java rename to src/main/java/com/bonus/aqgqj/system/vo/RoleDto.java index da30766..5cc8588 100644 --- a/src/main/java/com/bonus/zhly/system/vo/RoleDto.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/RoleDto.java @@ -1,8 +1,8 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import java.util.List; -import com.bonus.zhly.model.Role; +import com.bonus.aqgqj.model.Role; public class RoleDto extends Role { diff --git a/src/main/java/com/bonus/zhly/system/vo/SysConfigVo.java b/src/main/java/com/bonus/aqgqj/system/vo/SysConfigVo.java similarity index 96% rename from src/main/java/com/bonus/zhly/system/vo/SysConfigVo.java rename to src/main/java/com/bonus/aqgqj/system/vo/SysConfigVo.java index b868553..0f3d3c6 100644 --- a/src/main/java/com/bonus/zhly/system/vo/SysConfigVo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/SysConfigVo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/com/bonus/zhly/system/vo/SysMenuVo.java b/src/main/java/com/bonus/aqgqj/system/vo/SysMenuVo.java similarity index 87% rename from src/main/java/com/bonus/zhly/system/vo/SysMenuVo.java rename to src/main/java/com/bonus/aqgqj/system/vo/SysMenuVo.java index 5c19d93..d72cd46 100644 --- a/src/main/java/com/bonus/zhly/system/vo/SysMenuVo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/SysMenuVo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/system/vo/SysOrgVo.java b/src/main/java/com/bonus/aqgqj/system/vo/SysOrgVo.java similarity index 97% rename from src/main/java/com/bonus/zhly/system/vo/SysOrgVo.java rename to src/main/java/com/bonus/aqgqj/system/vo/SysOrgVo.java index 708cf28..99b4674 100644 --- a/src/main/java/com/bonus/zhly/system/vo/SysOrgVo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/SysOrgVo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/com/bonus/zhly/system/vo/SysWhiteDto.java b/src/main/java/com/bonus/aqgqj/system/vo/SysWhiteDto.java similarity index 78% rename from src/main/java/com/bonus/zhly/system/vo/SysWhiteDto.java rename to src/main/java/com/bonus/aqgqj/system/vo/SysWhiteDto.java index c031eb2..b66616e 100644 --- a/src/main/java/com/bonus/zhly/system/vo/SysWhiteDto.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/SysWhiteDto.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; -import com.bonus.zhly.base.entity.PageEntity; +import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; /** diff --git a/src/main/java/com/bonus/zhly/system/vo/SysWhiteVo.java b/src/main/java/com/bonus/aqgqj/system/vo/SysWhiteVo.java similarity index 97% rename from src/main/java/com/bonus/zhly/system/vo/SysWhiteVo.java rename to src/main/java/com/bonus/aqgqj/system/vo/SysWhiteVo.java index 1765efb..e01beeb 100644 --- a/src/main/java/com/bonus/zhly/system/vo/SysWhiteVo.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/SysWhiteVo.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/src/main/java/com/bonus/zhly/system/vo/SystemConfigDto.java b/src/main/java/com/bonus/aqgqj/system/vo/SystemConfigDto.java similarity index 68% rename from src/main/java/com/bonus/zhly/system/vo/SystemConfigDto.java rename to src/main/java/com/bonus/aqgqj/system/vo/SystemConfigDto.java index 02be399..f70a391 100644 --- a/src/main/java/com/bonus/zhly/system/vo/SystemConfigDto.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/SystemConfigDto.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; -import com.bonus.zhly.base.entity.PageEntity; +import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; /** diff --git a/src/main/java/com/bonus/zhly/system/vo/TaskScheduleModel.java b/src/main/java/com/bonus/aqgqj/system/vo/TaskScheduleModel.java similarity index 95% rename from src/main/java/com/bonus/zhly/system/vo/TaskScheduleModel.java rename to src/main/java/com/bonus/aqgqj/system/vo/TaskScheduleModel.java index b13b6ba..e3f8e34 100644 --- a/src/main/java/com/bonus/zhly/system/vo/TaskScheduleModel.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/TaskScheduleModel.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; /** * @author 10488 diff --git a/src/main/java/com/bonus/zhly/system/vo/Token.java b/src/main/java/com/bonus/aqgqj/system/vo/Token.java similarity index 95% rename from src/main/java/com/bonus/zhly/system/vo/Token.java rename to src/main/java/com/bonus/aqgqj/system/vo/Token.java index 68f0aad..17e856d 100644 --- a/src/main/java/com/bonus/zhly/system/vo/Token.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/Token.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import java.io.Serializable; diff --git a/src/main/java/com/bonus/zhly/system/vo/UserDto.java b/src/main/java/com/bonus/aqgqj/system/vo/UserDto.java similarity index 72% rename from src/main/java/com/bonus/zhly/system/vo/UserDto.java rename to src/main/java/com/bonus/aqgqj/system/vo/UserDto.java index 9833ffb..a9df6ef 100644 --- a/src/main/java/com/bonus/zhly/system/vo/UserDto.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/UserDto.java @@ -1,8 +1,8 @@ -package com.bonus.zhly.system.vo; +package com.bonus.aqgqj.system.vo; import java.util.List; -import com.bonus.zhly.model.SysUser; +import com.bonus.aqgqj.model.SysUser; import lombok.Data; @Data diff --git a/src/main/java/com/bonus/zhly/system/vo/dto/SysOrgDto.java b/src/main/java/com/bonus/aqgqj/system/vo/dto/SysOrgDto.java similarity index 69% rename from src/main/java/com/bonus/zhly/system/vo/dto/SysOrgDto.java rename to src/main/java/com/bonus/aqgqj/system/vo/dto/SysOrgDto.java index a710892..d9720bf 100644 --- a/src/main/java/com/bonus/zhly/system/vo/dto/SysOrgDto.java +++ b/src/main/java/com/bonus/aqgqj/system/vo/dto/SysOrgDto.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.system.vo.dto; +package com.bonus.aqgqj.system.vo.dto; -import com.bonus.zhly.base.entity.PageEntity; +import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; /** diff --git a/src/main/java/com/bonus/zhly/table/PageTableArgumentResolver.java b/src/main/java/com/bonus/aqgqj/table/PageTableArgumentResolver.java similarity index 99% rename from src/main/java/com/bonus/zhly/table/PageTableArgumentResolver.java rename to src/main/java/com/bonus/aqgqj/table/PageTableArgumentResolver.java index 2d99247..409b8aa 100644 --- a/src/main/java/com/bonus/zhly/table/PageTableArgumentResolver.java +++ b/src/main/java/com/bonus/aqgqj/table/PageTableArgumentResolver.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.table; +package com.bonus.aqgqj.table; import java.util.Arrays; import java.util.HashMap; diff --git a/src/main/java/com/bonus/zhly/table/PageTableHandler.java b/src/main/java/com/bonus/aqgqj/table/PageTableHandler.java similarity index 97% rename from src/main/java/com/bonus/zhly/table/PageTableHandler.java rename to src/main/java/com/bonus/aqgqj/table/PageTableHandler.java index b0502d4..bd2fdfa 100644 --- a/src/main/java/com/bonus/zhly/table/PageTableHandler.java +++ b/src/main/java/com/bonus/aqgqj/table/PageTableHandler.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.table; +package com.bonus.aqgqj.table; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/table/PageTableRequest.java b/src/main/java/com/bonus/aqgqj/table/PageTableRequest.java similarity index 95% rename from src/main/java/com/bonus/zhly/table/PageTableRequest.java rename to src/main/java/com/bonus/aqgqj/table/PageTableRequest.java index 0ee5088..c6c6af7 100644 --- a/src/main/java/com/bonus/zhly/table/PageTableRequest.java +++ b/src/main/java/com/bonus/aqgqj/table/PageTableRequest.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.table; +package com.bonus.aqgqj.table; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/com/bonus/zhly/table/PageTableResponse.java b/src/main/java/com/bonus/aqgqj/table/PageTableResponse.java similarity index 96% rename from src/main/java/com/bonus/zhly/table/PageTableResponse.java rename to src/main/java/com/bonus/aqgqj/table/PageTableResponse.java index 7b9da88..30da949 100644 --- a/src/main/java/com/bonus/zhly/table/PageTableResponse.java +++ b/src/main/java/com/bonus/aqgqj/table/PageTableResponse.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.table; +package com.bonus.aqgqj.table; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/task/config/ConfigScanJob.java b/src/main/java/com/bonus/aqgqj/task/config/ConfigScanJob.java similarity index 82% rename from src/main/java/com/bonus/zhly/task/config/ConfigScanJob.java rename to src/main/java/com/bonus/aqgqj/task/config/ConfigScanJob.java index 93dc237..69cff2b 100644 --- a/src/main/java/com/bonus/zhly/task/config/ConfigScanJob.java +++ b/src/main/java/com/bonus/aqgqj/task/config/ConfigScanJob.java @@ -1,12 +1,10 @@ -package com.bonus.zhly.task.config; +package com.bonus.aqgqj.task.config; -import com.bonus.zhly.task.service.ScheduleService; +import com.bonus.aqgqj.task.service.ScheduleService; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/src/main/java/com/bonus/zhly/task/config/QuartzConfig.java b/src/main/java/com/bonus/aqgqj/task/config/QuartzConfig.java similarity index 93% rename from src/main/java/com/bonus/zhly/task/config/QuartzConfig.java rename to src/main/java/com/bonus/aqgqj/task/config/QuartzConfig.java index 61414d6..5688192 100644 --- a/src/main/java/com/bonus/zhly/task/config/QuartzConfig.java +++ b/src/main/java/com/bonus/aqgqj/task/config/QuartzConfig.java @@ -1,7 +1,6 @@ -package com.bonus.zhly.task.config; +package com.bonus.aqgqj.task.config; -import com.bonus.zhly.task.config.ScheduleJobFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.quartz.SchedulerFactoryBean; diff --git a/src/main/java/com/bonus/zhly/task/config/ScheduleJobFactory.java b/src/main/java/com/bonus/aqgqj/task/config/ScheduleJobFactory.java similarity index 94% rename from src/main/java/com/bonus/zhly/task/config/ScheduleJobFactory.java rename to src/main/java/com/bonus/aqgqj/task/config/ScheduleJobFactory.java index 356ea13..dfaa805 100644 --- a/src/main/java/com/bonus/zhly/task/config/ScheduleJobFactory.java +++ b/src/main/java/com/bonus/aqgqj/task/config/ScheduleJobFactory.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.config; +package com.bonus.aqgqj.task.config; import org.quartz.spi.TriggerFiredBundle; diff --git a/src/main/java/com/bonus/zhly/task/config/ScheduleTaskNetwork.java b/src/main/java/com/bonus/aqgqj/task/config/ScheduleTaskNetwork.java similarity index 97% rename from src/main/java/com/bonus/zhly/task/config/ScheduleTaskNetwork.java rename to src/main/java/com/bonus/aqgqj/task/config/ScheduleTaskNetwork.java index 5d8fd9d..1d79ed3 100644 --- a/src/main/java/com/bonus/zhly/task/config/ScheduleTaskNetwork.java +++ b/src/main/java/com/bonus/aqgqj/task/config/ScheduleTaskNetwork.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.config; +package com.bonus.aqgqj.task.config; diff --git a/src/main/java/com/bonus/zhly/task/config/StartupListener.java b/src/main/java/com/bonus/aqgqj/task/config/StartupListener.java similarity index 89% rename from src/main/java/com/bonus/zhly/task/config/StartupListener.java rename to src/main/java/com/bonus/aqgqj/task/config/StartupListener.java index c1e0b60..3ce42ab 100644 --- a/src/main/java/com/bonus/zhly/task/config/StartupListener.java +++ b/src/main/java/com/bonus/aqgqj/task/config/StartupListener.java @@ -1,13 +1,10 @@ -package com.bonus.zhly.task.config; +package com.bonus.aqgqj.task.config; -import com.bonus.zhly.task.service.ScheduleService; -import com.bonus.zhly.utils.StringHelper; +import com.bonus.aqgqj.task.service.ScheduleService; +import com.bonus.aqgqj.utils.StringHelper; import lombok.extern.slf4j.Slf4j; import org.quartz.Scheduler; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/bonus/zhly/task/dao/ScheduleDao.java b/src/main/java/com/bonus/aqgqj/task/dao/ScheduleDao.java similarity index 76% rename from src/main/java/com/bonus/zhly/task/dao/ScheduleDao.java rename to src/main/java/com/bonus/aqgqj/task/dao/ScheduleDao.java index 3780faa..4878388 100644 --- a/src/main/java/com/bonus/zhly/task/dao/ScheduleDao.java +++ b/src/main/java/com/bonus/aqgqj/task/dao/ScheduleDao.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.task.dao; +package com.bonus.aqgqj.task.dao; -import com.bonus.zhly.task.entity.TaskVo; +import com.bonus.aqgqj.task.entity.TaskVo; import org.springframework.stereotype.Repository; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/task/entity/ScheduleStatus.java b/src/main/java/com/bonus/aqgqj/task/entity/ScheduleStatus.java similarity index 81% rename from src/main/java/com/bonus/zhly/task/entity/ScheduleStatus.java rename to src/main/java/com/bonus/aqgqj/task/entity/ScheduleStatus.java index a4f8691..0e6e066 100644 --- a/src/main/java/com/bonus/zhly/task/entity/ScheduleStatus.java +++ b/src/main/java/com/bonus/aqgqj/task/entity/ScheduleStatus.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.entity; +package com.bonus.aqgqj.task.entity; import lombok.Data; diff --git a/src/main/java/com/bonus/zhly/task/entity/TaskVo.java b/src/main/java/com/bonus/aqgqj/task/entity/TaskVo.java similarity index 88% rename from src/main/java/com/bonus/zhly/task/entity/TaskVo.java rename to src/main/java/com/bonus/aqgqj/task/entity/TaskVo.java index 3929b68..1cc1331 100644 --- a/src/main/java/com/bonus/zhly/task/entity/TaskVo.java +++ b/src/main/java/com/bonus/aqgqj/task/entity/TaskVo.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.task.entity; +package com.bonus.aqgqj.task.entity; -import com.bonus.zhly.base.entity.PageEntity; +import com.bonus.aqgqj.base.entity.PageEntity; import lombok.Data; /** diff --git a/src/main/java/com/bonus/zhly/task/job/ModbusDayEnergyJob.java b/src/main/java/com/bonus/aqgqj/task/job/ModbusDayEnergyJob.java similarity index 92% rename from src/main/java/com/bonus/zhly/task/job/ModbusDayEnergyJob.java rename to src/main/java/com/bonus/aqgqj/task/job/ModbusDayEnergyJob.java index 384dadc..c1d1c09 100644 --- a/src/main/java/com/bonus/zhly/task/job/ModbusDayEnergyJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/ModbusDayEnergyJob.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/ModbusHoursEnergyJob.java b/src/main/java/com/bonus/aqgqj/task/job/ModbusHoursEnergyJob.java similarity index 86% rename from src/main/java/com/bonus/zhly/task/job/ModbusHoursEnergyJob.java rename to src/main/java/com/bonus/aqgqj/task/job/ModbusHoursEnergyJob.java index 73a1061..aa48233 100644 --- a/src/main/java/com/bonus/zhly/task/job/ModbusHoursEnergyJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/ModbusHoursEnergyJob.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; -import com.bonus.zhly.task.dao.ScheduleDao; +import com.bonus.aqgqj.task.dao.ScheduleDao; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/src/main/java/com/bonus/zhly/task/job/ModbusWarnValueJob.java b/src/main/java/com/bonus/aqgqj/task/job/ModbusWarnValueJob.java similarity index 93% rename from src/main/java/com/bonus/zhly/task/job/ModbusWarnValueJob.java rename to src/main/java/com/bonus/aqgqj/task/job/ModbusWarnValueJob.java index 241e201..e5a4199 100644 --- a/src/main/java/com/bonus/zhly/task/job/ModbusWarnValueJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/ModbusWarnValueJob.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/RtuClientConnectJob.java b/src/main/java/com/bonus/aqgqj/task/job/RtuClientConnectJob.java similarity index 90% rename from src/main/java/com/bonus/zhly/task/job/RtuClientConnectJob.java rename to src/main/java/com/bonus/aqgqj/task/job/RtuClientConnectJob.java index da1aac1..ecc3752 100644 --- a/src/main/java/com/bonus/zhly/task/job/RtuClientConnectJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/RtuClientConnectJob.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; -import com.bonus.zhly.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.DateTimeHelper; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/src/main/java/com/bonus/zhly/task/job/SystemModelJob1.java b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob1.java similarity index 95% rename from src/main/java/com/bonus/zhly/task/job/SystemModelJob1.java rename to src/main/java/com/bonus/aqgqj/task/job/SystemModelJob1.java index f2ccb59..771b700 100644 --- a/src/main/java/com/bonus/zhly/task/job/SystemModelJob1.java +++ b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob1.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/SystemModelJob2.java b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob2.java similarity index 95% rename from src/main/java/com/bonus/zhly/task/job/SystemModelJob2.java rename to src/main/java/com/bonus/aqgqj/task/job/SystemModelJob2.java index d3480f8..b604d62 100644 --- a/src/main/java/com/bonus/zhly/task/job/SystemModelJob2.java +++ b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob2.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/SystemModelJob3.java b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob3.java similarity index 95% rename from src/main/java/com/bonus/zhly/task/job/SystemModelJob3.java rename to src/main/java/com/bonus/aqgqj/task/job/SystemModelJob3.java index 1a4ffed..196f148 100644 --- a/src/main/java/com/bonus/zhly/task/job/SystemModelJob3.java +++ b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob3.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/SystemModelJob4.java b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob4.java similarity index 95% rename from src/main/java/com/bonus/zhly/task/job/SystemModelJob4.java rename to src/main/java/com/bonus/aqgqj/task/job/SystemModelJob4.java index da55838..9d29c44 100644 --- a/src/main/java/com/bonus/zhly/task/job/SystemModelJob4.java +++ b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob4.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/SystemModelJob5.java b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob5.java similarity index 95% rename from src/main/java/com/bonus/zhly/task/job/SystemModelJob5.java rename to src/main/java/com/bonus/aqgqj/task/job/SystemModelJob5.java index b36f139..baef134 100644 --- a/src/main/java/com/bonus/zhly/task/job/SystemModelJob5.java +++ b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob5.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/SystemModelJob6.java b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob6.java similarity index 95% rename from src/main/java/com/bonus/zhly/task/job/SystemModelJob6.java rename to src/main/java/com/bonus/aqgqj/task/job/SystemModelJob6.java index 028062c..a30ae84 100644 --- a/src/main/java/com/bonus/zhly/task/job/SystemModelJob6.java +++ b/src/main/java/com/bonus/aqgqj/task/job/SystemModelJob6.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/TestJob.java b/src/main/java/com/bonus/aqgqj/task/job/TestJob.java similarity index 89% rename from src/main/java/com/bonus/zhly/task/job/TestJob.java rename to src/main/java/com/bonus/aqgqj/task/job/TestJob.java index 12b7034..a7dfbd2 100644 --- a/src/main/java/com/bonus/zhly/task/job/TestJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/TestJob.java @@ -1,7 +1,6 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; -import com.bonus.zhly.utils.DateTimeHelper; -import lombok.Data; +import com.bonus.aqgqj.utils.DateTimeHelper; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/src/main/java/com/bonus/zhly/task/job/TtpClientConnectJob.java b/src/main/java/com/bonus/aqgqj/task/job/TtpClientConnectJob.java similarity index 90% rename from src/main/java/com/bonus/zhly/task/job/TtpClientConnectJob.java rename to src/main/java/com/bonus/aqgqj/task/job/TtpClientConnectJob.java index 087cea3..f4d22bd 100644 --- a/src/main/java/com/bonus/zhly/task/job/TtpClientConnectJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/TtpClientConnectJob.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; -import com.bonus.zhly.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.DateTimeHelper; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/src/main/java/com/bonus/zhly/task/job/UpdateModbusDataJob.java b/src/main/java/com/bonus/aqgqj/task/job/UpdateModbusDataJob.java similarity index 93% rename from src/main/java/com/bonus/zhly/task/job/UpdateModbusDataJob.java rename to src/main/java/com/bonus/aqgqj/task/job/UpdateModbusDataJob.java index b9c5d26..f848e72 100644 --- a/src/main/java/com/bonus/zhly/task/job/UpdateModbusDataJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/UpdateModbusDataJob.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; diff --git a/src/main/java/com/bonus/zhly/task/job/UserDelJob.java b/src/main/java/com/bonus/aqgqj/task/job/UserDelJob.java similarity index 82% rename from src/main/java/com/bonus/zhly/task/job/UserDelJob.java rename to src/main/java/com/bonus/aqgqj/task/job/UserDelJob.java index 66f35c6..23d2dcc 100644 --- a/src/main/java/com/bonus/zhly/task/job/UserDelJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/UserDelJob.java @@ -1,13 +1,13 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; -import com.bonus.zhly.system.dao.SysConfigDao; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.system.service.UserService; -import com.bonus.zhly.task.dao.ScheduleDao; -import com.bonus.zhly.utils.DateTimeHelper; -import com.bonus.zhly.utils.ListHelper; -import com.bonus.zhly.utils.StringHelper; +import com.bonus.aqgqj.system.dao.SysConfigDao; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.system.service.UserService; +import com.bonus.aqgqj.task.dao.ScheduleDao; +import com.bonus.aqgqj.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.ListHelper; +import com.bonus.aqgqj.utils.StringHelper; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/src/main/java/com/bonus/zhly/task/job/UserSleepJob.java b/src/main/java/com/bonus/aqgqj/task/job/UserSleepJob.java similarity index 82% rename from src/main/java/com/bonus/zhly/task/job/UserSleepJob.java rename to src/main/java/com/bonus/aqgqj/task/job/UserSleepJob.java index 20336ce..c543234 100644 --- a/src/main/java/com/bonus/zhly/task/job/UserSleepJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/UserSleepJob.java @@ -1,13 +1,13 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; -import com.bonus.zhly.system.dao.SysConfigDao; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.system.service.UserService; -import com.bonus.zhly.task.dao.ScheduleDao; -import com.bonus.zhly.utils.DateTimeHelper; -import com.bonus.zhly.utils.ListHelper; -import com.bonus.zhly.utils.StringHelper; +import com.bonus.aqgqj.system.dao.SysConfigDao; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.system.service.UserService; +import com.bonus.aqgqj.task.dao.ScheduleDao; +import com.bonus.aqgqj.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.ListHelper; +import com.bonus.aqgqj.utils.StringHelper; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/src/main/java/com/bonus/zhly/task/job/UserUnLockJob.java b/src/main/java/com/bonus/aqgqj/task/job/UserUnLockJob.java similarity index 81% rename from src/main/java/com/bonus/zhly/task/job/UserUnLockJob.java rename to src/main/java/com/bonus/aqgqj/task/job/UserUnLockJob.java index acbda8c..ced5a58 100644 --- a/src/main/java/com/bonus/zhly/task/job/UserUnLockJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/UserUnLockJob.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.system.service.UserService; -import com.bonus.zhly.task.dao.ScheduleDao; -import com.bonus.zhly.utils.ListHelper; -import com.bonus.zhly.utils.RedisUtil; -import com.bonus.zhly.utils.StringHelper; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.system.service.UserService; +import com.bonus.aqgqj.task.dao.ScheduleDao; +import com.bonus.aqgqj.utils.ListHelper; +import com.bonus.aqgqj.utils.RedisUtil; +import com.bonus.aqgqj.utils.StringHelper; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/src/main/java/com/bonus/zhly/task/job/UserUnLoginJob.java b/src/main/java/com/bonus/aqgqj/task/job/UserUnLoginJob.java similarity index 82% rename from src/main/java/com/bonus/zhly/task/job/UserUnLoginJob.java rename to src/main/java/com/bonus/aqgqj/task/job/UserUnLoginJob.java index 09cb1e0..66259af 100644 --- a/src/main/java/com/bonus/zhly/task/job/UserUnLoginJob.java +++ b/src/main/java/com/bonus/aqgqj/task/job/UserUnLoginJob.java @@ -1,13 +1,13 @@ -package com.bonus.zhly.task.job; +package com.bonus.aqgqj.task.job; -import com.bonus.zhly.system.dao.SysConfigDao; -import com.bonus.zhly.system.vo.SysConfigVo; -import com.bonus.zhly.model.SysUser; -import com.bonus.zhly.system.service.UserService; -import com.bonus.zhly.task.dao.ScheduleDao; -import com.bonus.zhly.utils.DateTimeHelper; -import com.bonus.zhly.utils.ListHelper; -import com.bonus.zhly.utils.StringHelper; +import com.bonus.aqgqj.system.dao.SysConfigDao; +import com.bonus.aqgqj.system.vo.SysConfigVo; +import com.bonus.aqgqj.model.SysUser; +import com.bonus.aqgqj.system.service.UserService; +import com.bonus.aqgqj.task.dao.ScheduleDao; +import com.bonus.aqgqj.utils.DateTimeHelper; +import com.bonus.aqgqj.utils.ListHelper; +import com.bonus.aqgqj.utils.StringHelper; import lombok.extern.slf4j.Slf4j; import org.quartz.Job; import org.quartz.JobExecutionContext; diff --git a/src/main/java/com/bonus/zhly/task/service/ScheduleService.java b/src/main/java/com/bonus/aqgqj/task/service/ScheduleService.java similarity index 86% rename from src/main/java/com/bonus/zhly/task/service/ScheduleService.java rename to src/main/java/com/bonus/aqgqj/task/service/ScheduleService.java index 4593e1a..d7b5dda 100644 --- a/src/main/java/com/bonus/zhly/task/service/ScheduleService.java +++ b/src/main/java/com/bonus/aqgqj/task/service/ScheduleService.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.task.service; +package com.bonus.aqgqj.task.service; import org.quartz.Scheduler; diff --git a/src/main/java/com/bonus/zhly/task/service/ScheduleServiceImpl.java b/src/main/java/com/bonus/aqgqj/task/service/ScheduleServiceImpl.java similarity index 96% rename from src/main/java/com/bonus/zhly/task/service/ScheduleServiceImpl.java rename to src/main/java/com/bonus/aqgqj/task/service/ScheduleServiceImpl.java index 6d5f011..18fbfaf 100644 --- a/src/main/java/com/bonus/zhly/task/service/ScheduleServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/task/service/ScheduleServiceImpl.java @@ -1,12 +1,11 @@ -package com.bonus.zhly.task.service; +package com.bonus.aqgqj.task.service; -import com.bonus.zhly.task.config.ScheduleTaskNetwork; -import com.bonus.zhly.task.dao.ScheduleDao; -import com.bonus.zhly.task.entity.ScheduleStatus; -import com.bonus.zhly.task.entity.TaskVo; -import javafx.concurrent.Task; +import com.bonus.aqgqj.task.config.ScheduleTaskNetwork; +import com.bonus.aqgqj.task.dao.ScheduleDao; +import com.bonus.aqgqj.task.entity.ScheduleStatus; +import com.bonus.aqgqj.task.entity.TaskVo; import lombok.extern.slf4j.Slf4j; import org.quartz.*; import org.quartz.impl.matchers.GroupMatcher; diff --git a/src/main/java/com/bonus/zhly/utils/AESCBCUtils.java b/src/main/java/com/bonus/aqgqj/utils/AESCBCUtils.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/AESCBCUtils.java rename to src/main/java/com/bonus/aqgqj/utils/AESCBCUtils.java index 7884347..7ab5060 100644 --- a/src/main/java/com/bonus/zhly/utils/AESCBCUtils.java +++ b/src/main/java/com/bonus/aqgqj/utils/AESCBCUtils.java @@ -1,10 +1,9 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/bonus/zhly/utils/AudioUtil.java b/src/main/java/com/bonus/aqgqj/utils/AudioUtil.java similarity index 96% rename from src/main/java/com/bonus/zhly/utils/AudioUtil.java rename to src/main/java/com/bonus/aqgqj/utils/AudioUtil.java index 0eea2b0..7828d36 100644 --- a/src/main/java/com/bonus/zhly/utils/AudioUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/AudioUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import org.jaudiotagger.audio.AudioFileIO; import org.jaudiotagger.audio.mp3.MP3AudioHeader; diff --git a/src/main/java/com/bonus/zhly/utils/BASE64DecodedMultipartFile.java b/src/main/java/com/bonus/aqgqj/utils/BASE64DecodedMultipartFile.java similarity index 98% rename from src/main/java/com/bonus/zhly/utils/BASE64DecodedMultipartFile.java rename to src/main/java/com/bonus/aqgqj/utils/BASE64DecodedMultipartFile.java index 3f62e6e..ada4805 100644 --- a/src/main/java/com/bonus/zhly/utils/BASE64DecodedMultipartFile.java +++ b/src/main/java/com/bonus/aqgqj/utils/BASE64DecodedMultipartFile.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import cn.hutool.core.codec.Base64; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/bonus/zhly/utils/ColumnProUtil.java b/src/main/java/com/bonus/aqgqj/utils/ColumnProUtil.java similarity index 95% rename from src/main/java/com/bonus/zhly/utils/ColumnProUtil.java rename to src/main/java/com/bonus/aqgqj/utils/ColumnProUtil.java index 7dcdcd1..c225d90 100644 --- a/src/main/java/com/bonus/zhly/utils/ColumnProUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/ColumnProUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import java.util.HashMap; import java.util.List; @@ -10,7 +10,7 @@ import org.apache.ibatis.mapping.ResultMapping; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.util.CollectionUtils; -import com.bonus.zhly.table.PageTableRequest; +import com.bonus.aqgqj.table.PageTableRequest; public class ColumnProUtil { diff --git a/src/main/java/com/bonus/zhly/utils/CommonUtils.java b/src/main/java/com/bonus/aqgqj/utils/CommonUtils.java similarity index 98% rename from src/main/java/com/bonus/zhly/utils/CommonUtils.java rename to src/main/java/com/bonus/aqgqj/utils/CommonUtils.java index ff32e23..f368a56 100644 --- a/src/main/java/com/bonus/zhly/utils/CommonUtils.java +++ b/src/main/java/com/bonus/aqgqj/utils/CommonUtils.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/bonus/zhly/utils/CronUtil.java b/src/main/java/com/bonus/aqgqj/utils/CronUtil.java similarity index 98% rename from src/main/java/com/bonus/zhly/utils/CronUtil.java rename to src/main/java/com/bonus/aqgqj/utils/CronUtil.java index e7a2bdb..96b62e0 100644 --- a/src/main/java/com/bonus/zhly/utils/CronUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/CronUtil.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; -import com.bonus.zhly.system.vo.TaskScheduleModel; +import com.bonus.aqgqj.system.vo.TaskScheduleModel; import java.util.Calendar; diff --git a/src/main/java/com/bonus/zhly/utils/DateTimeHelper.java b/src/main/java/com/bonus/aqgqj/utils/DateTimeHelper.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/DateTimeHelper.java rename to src/main/java/com/bonus/aqgqj/utils/DateTimeHelper.java index 74295d7..f8ca85e 100644 --- a/src/main/java/com/bonus/zhly/utils/DateTimeHelper.java +++ b/src/main/java/com/bonus/aqgqj/utils/DateTimeHelper.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/bonus/zhly/utils/FileUtil.java b/src/main/java/com/bonus/aqgqj/utils/FileUtil.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/FileUtil.java rename to src/main/java/com/bonus/aqgqj/utils/FileUtil.java index 9766fc5..227aa0f 100644 --- a/src/main/java/com/bonus/zhly/utils/FileUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/FileUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import java.io.BufferedReader; import java.io.File; diff --git a/src/main/java/com/bonus/zhly/utils/HttpClientUtils.java b/src/main/java/com/bonus/aqgqj/utils/HttpClientUtils.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/HttpClientUtils.java rename to src/main/java/com/bonus/aqgqj/utils/HttpClientUtils.java index 62381dc..b3cf91e 100644 --- a/src/main/java/com/bonus/zhly/utils/HttpClientUtils.java +++ b/src/main/java/com/bonus/aqgqj/utils/HttpClientUtils.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import com.alibaba.fastjson.JSONObject; import okhttp3.*; diff --git a/src/main/java/com/bonus/zhly/utils/IDUtils.java b/src/main/java/com/bonus/aqgqj/utils/IDUtils.java similarity index 93% rename from src/main/java/com/bonus/zhly/utils/IDUtils.java rename to src/main/java/com/bonus/aqgqj/utils/IDUtils.java index 5268862..5239c42 100644 --- a/src/main/java/com/bonus/zhly/utils/IDUtils.java +++ b/src/main/java/com/bonus/aqgqj/utils/IDUtils.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; /** * @author cw chen diff --git a/src/main/java/com/bonus/zhly/utils/ImageUtil.java b/src/main/java/com/bonus/aqgqj/utils/ImageUtil.java similarity index 98% rename from src/main/java/com/bonus/zhly/utils/ImageUtil.java rename to src/main/java/com/bonus/aqgqj/utils/ImageUtil.java index 0270a11..15f9dec 100644 --- a/src/main/java/com/bonus/zhly/utils/ImageUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/ImageUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; diff --git a/src/main/java/com/bonus/zhly/utils/JedisPoolUtil.java b/src/main/java/com/bonus/aqgqj/utils/JedisPoolUtil.java similarity index 97% rename from src/main/java/com/bonus/zhly/utils/JedisPoolUtil.java rename to src/main/java/com/bonus/aqgqj/utils/JedisPoolUtil.java index 48cc8a8..381beeb 100644 --- a/src/main/java/com/bonus/zhly/utils/JedisPoolUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/JedisPoolUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import org.springframework.beans.factory.annotation.Value; import redis.clients.jedis.JedisPool; diff --git a/src/main/java/com/bonus/zhly/utils/JwtHelper.java b/src/main/java/com/bonus/aqgqj/utils/JwtHelper.java similarity index 97% rename from src/main/java/com/bonus/zhly/utils/JwtHelper.java rename to src/main/java/com/bonus/aqgqj/utils/JwtHelper.java index 966a4f3..d4d8f97 100644 --- a/src/main/java/com/bonus/zhly/utils/JwtHelper.java +++ b/src/main/java/com/bonus/aqgqj/utils/JwtHelper.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; -import com.bonus.zhly.system.vo.LoginUser; +import com.bonus.aqgqj.system.vo.LoginUser; import io.jsonwebtoken.*; import org.springframework.util.StringUtils; diff --git a/src/main/java/com/bonus/zhly/utils/ListHelper.java b/src/main/java/com/bonus/aqgqj/utils/ListHelper.java similarity index 95% rename from src/main/java/com/bonus/zhly/utils/ListHelper.java rename to src/main/java/com/bonus/aqgqj/utils/ListHelper.java index 046a3b4..e01d2b2 100644 --- a/src/main/java/com/bonus/zhly/utils/ListHelper.java +++ b/src/main/java/com/bonus/aqgqj/utils/ListHelper.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/utils/MoneyUtil.java b/src/main/java/com/bonus/aqgqj/utils/MoneyUtil.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/MoneyUtil.java rename to src/main/java/com/bonus/aqgqj/utils/MoneyUtil.java index 10d344c..d5183fb 100644 --- a/src/main/java/com/bonus/zhly/utils/MoneyUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/MoneyUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; public class MoneyUtil { diff --git a/src/main/java/com/bonus/zhly/utils/QRCodeUtil.java b/src/main/java/com/bonus/aqgqj/utils/QRCodeUtil.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/QRCodeUtil.java rename to src/main/java/com/bonus/aqgqj/utils/QRCodeUtil.java index 993492f..c7579c8 100644 --- a/src/main/java/com/bonus/zhly/utils/QRCodeUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/QRCodeUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import com.google.zxing.*; import com.google.zxing.client.j2se.BufferedImageLuminanceSource; diff --git a/src/main/java/com/bonus/zhly/utils/RedisPerfixUtil.java b/src/main/java/com/bonus/aqgqj/utils/RedisPerfixUtil.java similarity index 93% rename from src/main/java/com/bonus/zhly/utils/RedisPerfixUtil.java rename to src/main/java/com/bonus/aqgqj/utils/RedisPerfixUtil.java index 72c268b..feb6f95 100644 --- a/src/main/java/com/bonus/zhly/utils/RedisPerfixUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/RedisPerfixUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; /** * rediutil前缀工具类 diff --git a/src/main/java/com/bonus/zhly/utils/RedisUtil.java b/src/main/java/com/bonus/aqgqj/utils/RedisUtil.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/RedisUtil.java rename to src/main/java/com/bonus/aqgqj/utils/RedisUtil.java index 30bf0fe..3c3180e 100644 --- a/src/main/java/com/bonus/zhly/utils/RedisUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/RedisUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/bonus/zhly/utils/ResponseCode.java b/src/main/java/com/bonus/aqgqj/utils/ResponseCode.java similarity index 93% rename from src/main/java/com/bonus/zhly/utils/ResponseCode.java rename to src/main/java/com/bonus/aqgqj/utils/ResponseCode.java index a663ed0..9a885d0 100644 --- a/src/main/java/com/bonus/zhly/utils/ResponseCode.java +++ b/src/main/java/com/bonus/aqgqj/utils/ResponseCode.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; /** * SUCCESS成功 diff --git a/src/main/java/com/bonus/zhly/utils/ResponseUtil.java b/src/main/java/com/bonus/aqgqj/utils/ResponseUtil.java similarity index 94% rename from src/main/java/com/bonus/zhly/utils/ResponseUtil.java rename to src/main/java/com/bonus/aqgqj/utils/ResponseUtil.java index 5daa6d6..b410a8e 100644 --- a/src/main/java/com/bonus/zhly/utils/ResponseUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/ResponseUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import java.io.IOException; diff --git a/src/main/java/com/bonus/zhly/utils/ServerResponse.java b/src/main/java/com/bonus/aqgqj/utils/ServerResponse.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/ServerResponse.java rename to src/main/java/com/bonus/aqgqj/utils/ServerResponse.java index 6ca3fc1..6bc3fc6 100644 --- a/src/main/java/com/bonus/zhly/utils/ServerResponse.java +++ b/src/main/java/com/bonus/aqgqj/utils/ServerResponse.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/src/main/java/com/bonus/zhly/utils/SpringUtil.java b/src/main/java/com/bonus/aqgqj/utils/SpringUtil.java similarity index 96% rename from src/main/java/com/bonus/zhly/utils/SpringUtil.java rename to src/main/java/com/bonus/aqgqj/utils/SpringUtil.java index 0b1a606..f0e5a65 100644 --- a/src/main/java/com/bonus/zhly/utils/SpringUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/SpringUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/com/bonus/zhly/utils/StrUtil.java b/src/main/java/com/bonus/aqgqj/utils/StrUtil.java similarity index 96% rename from src/main/java/com/bonus/zhly/utils/StrUtil.java rename to src/main/java/com/bonus/aqgqj/utils/StrUtil.java index bb50e64..adecfa0 100644 --- a/src/main/java/com/bonus/zhly/utils/StrUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/StrUtil.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import java.util.List; diff --git a/src/main/java/com/bonus/zhly/utils/StringHelper.java b/src/main/java/com/bonus/aqgqj/utils/StringHelper.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/StringHelper.java rename to src/main/java/com/bonus/aqgqj/utils/StringHelper.java index d9143a6..6e167e0 100644 --- a/src/main/java/com/bonus/zhly/utils/StringHelper.java +++ b/src/main/java/com/bonus/aqgqj/utils/StringHelper.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/bonus/zhly/utils/SystemUtils.java b/src/main/java/com/bonus/aqgqj/utils/SystemUtils.java similarity index 98% rename from src/main/java/com/bonus/zhly/utils/SystemUtils.java rename to src/main/java/com/bonus/aqgqj/utils/SystemUtils.java index 22366da..1f16fd3 100644 --- a/src/main/java/com/bonus/zhly/utils/SystemUtils.java +++ b/src/main/java/com/bonus/aqgqj/utils/SystemUtils.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/bonus/zhly/utils/TemplateUtil.java b/src/main/java/com/bonus/aqgqj/utils/TemplateUtil.java similarity index 99% rename from src/main/java/com/bonus/zhly/utils/TemplateUtil.java rename to src/main/java/com/bonus/aqgqj/utils/TemplateUtil.java index 3781acf..5c2ec4e 100644 --- a/src/main/java/com/bonus/zhly/utils/TemplateUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/TemplateUtil.java @@ -1,11 +1,11 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import java.io.File; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.bonus.zhly.system.vo.GenerateInput; +import com.bonus.aqgqj.system.vo.GenerateInput; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/bonus/zhly/utils/TimeConflictUtil.java b/src/main/java/com/bonus/aqgqj/utils/TimeConflictUtil.java similarity index 100% rename from src/main/java/com/bonus/zhly/utils/TimeConflictUtil.java rename to src/main/java/com/bonus/aqgqj/utils/TimeConflictUtil.java diff --git a/src/main/java/com/bonus/zhly/utils/UUIDUtils.java b/src/main/java/com/bonus/aqgqj/utils/UUIDUtils.java similarity index 98% rename from src/main/java/com/bonus/zhly/utils/UUIDUtils.java rename to src/main/java/com/bonus/aqgqj/utils/UUIDUtils.java index 8122ca5..b464d79 100644 --- a/src/main/java/com/bonus/zhly/utils/UUIDUtils.java +++ b/src/main/java/com/bonus/aqgqj/utils/UUIDUtils.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import java.io.Serializable; import java.util.Random; diff --git a/src/main/java/com/bonus/zhly/utils/UserUtil.java b/src/main/java/com/bonus/aqgqj/utils/UserUtil.java similarity index 90% rename from src/main/java/com/bonus/zhly/utils/UserUtil.java rename to src/main/java/com/bonus/aqgqj/utils/UserUtil.java index 9709adc..b3521a6 100644 --- a/src/main/java/com/bonus/zhly/utils/UserUtil.java +++ b/src/main/java/com/bonus/aqgqj/utils/UserUtil.java @@ -1,6 +1,6 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; -import com.bonus.zhly.system.vo.LoginUser; +import com.bonus.aqgqj.system.vo.LoginUser; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/bonus/zhly/utils/WebUtils.java b/src/main/java/com/bonus/aqgqj/utils/WebUtils.java similarity index 98% rename from src/main/java/com/bonus/zhly/utils/WebUtils.java rename to src/main/java/com/bonus/aqgqj/utils/WebUtils.java index 5c50e03..4695d43 100644 --- a/src/main/java/com/bonus/zhly/utils/WebUtils.java +++ b/src/main/java/com/bonus/aqgqj/utils/WebUtils.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.utils; +package com.bonus.aqgqj.utils; import org.springframework.util.StringUtils; import org.springframework.web.context.request.RequestContextHolder; diff --git a/src/main/java/com/bonus/zhly/webResult/AjaxResult.java b/src/main/java/com/bonus/aqgqj/webResult/AjaxResult.java similarity index 99% rename from src/main/java/com/bonus/zhly/webResult/AjaxResult.java rename to src/main/java/com/bonus/aqgqj/webResult/AjaxResult.java index eeb075a..4dc30a4 100644 --- a/src/main/java/com/bonus/zhly/webResult/AjaxResult.java +++ b/src/main/java/com/bonus/aqgqj/webResult/AjaxResult.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.webResult; +package com.bonus.aqgqj.webResult; import java.util.HashMap; import java.util.Objects; diff --git a/src/main/java/com/bonus/zhly/webResult/CharsetKit.java b/src/main/java/com/bonus/aqgqj/webResult/CharsetKit.java similarity index 98% rename from src/main/java/com/bonus/zhly/webResult/CharsetKit.java rename to src/main/java/com/bonus/aqgqj/webResult/CharsetKit.java index bb1cb35..65ee0dd 100644 --- a/src/main/java/com/bonus/zhly/webResult/CharsetKit.java +++ b/src/main/java/com/bonus/aqgqj/webResult/CharsetKit.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.webResult; +package com.bonus.aqgqj.webResult; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/com/bonus/zhly/webResult/Constants.java b/src/main/java/com/bonus/aqgqj/webResult/Constants.java similarity index 98% rename from src/main/java/com/bonus/zhly/webResult/Constants.java rename to src/main/java/com/bonus/aqgqj/webResult/Constants.java index 84c839d..3d583d5 100644 --- a/src/main/java/com/bonus/zhly/webResult/Constants.java +++ b/src/main/java/com/bonus/aqgqj/webResult/Constants.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.webResult; +package com.bonus.aqgqj.webResult; /** * 通用常量信息 diff --git a/src/main/java/com/bonus/zhly/webResult/Convert.java b/src/main/java/com/bonus/aqgqj/webResult/Convert.java similarity index 99% rename from src/main/java/com/bonus/zhly/webResult/Convert.java rename to src/main/java/com/bonus/aqgqj/webResult/Convert.java index c308745..2898953 100644 --- a/src/main/java/com/bonus/zhly/webResult/Convert.java +++ b/src/main/java/com/bonus/aqgqj/webResult/Convert.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.webResult; +package com.bonus.aqgqj.webResult; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/src/main/java/com/bonus/zhly/webResult/HttpStatus.java b/src/main/java/com/bonus/aqgqj/webResult/HttpStatus.java similarity index 97% rename from src/main/java/com/bonus/zhly/webResult/HttpStatus.java rename to src/main/java/com/bonus/aqgqj/webResult/HttpStatus.java index d1a9a74..497facd 100644 --- a/src/main/java/com/bonus/zhly/webResult/HttpStatus.java +++ b/src/main/java/com/bonus/aqgqj/webResult/HttpStatus.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.webResult; +package com.bonus.aqgqj.webResult; /** * 返回状态码 diff --git a/src/main/java/com/bonus/zhly/webResult/StrFormatter.java b/src/main/java/com/bonus/aqgqj/webResult/StrFormatter.java similarity index 98% rename from src/main/java/com/bonus/zhly/webResult/StrFormatter.java rename to src/main/java/com/bonus/aqgqj/webResult/StrFormatter.java index 7c8514b..33827b7 100644 --- a/src/main/java/com/bonus/zhly/webResult/StrFormatter.java +++ b/src/main/java/com/bonus/aqgqj/webResult/StrFormatter.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.webResult; +package com.bonus.aqgqj.webResult; /** * 字符串格式化 diff --git a/src/main/java/com/bonus/zhly/webResult/StringUtils.java b/src/main/java/com/bonus/aqgqj/webResult/StringUtils.java similarity index 99% rename from src/main/java/com/bonus/zhly/webResult/StringUtils.java rename to src/main/java/com/bonus/aqgqj/webResult/StringUtils.java index 83784e0..494aea7 100644 --- a/src/main/java/com/bonus/zhly/webResult/StringUtils.java +++ b/src/main/java/com/bonus/aqgqj/webResult/StringUtils.java @@ -1,4 +1,4 @@ -package com.bonus.zhly.webResult; +package com.bonus.aqgqj.webResult; import org.springframework.util.AntPathMatcher; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f85515a..60cdc5d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -27,7 +27,7 @@ server.session.timeout=10 server.tomcat.uri-encoding=UTF-8 #mapper\u914D\u7F6E mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml -mybatis.type-aliases-package=com.bonus.zhly.*.vo +mybatis.type-aliases-package=com.bonus.aqgqj.*.vo #redis config #spring.redis.host=localhost @@ -74,8 +74,8 @@ zhly.aq.file.html=login.html,index.html,pages/user/updateMyself.html,pages/user/ zhly.hk.file.windows.path=D:/HKFILE/lib/HCNetSDK.dll zhly.hk.file.linux.path=home/hksdk/libhcnetsdk.so -file.windwos.upload_path=E:/zhly/files/ -file.linux.upload_path=home/zhly/files/ +file.windwos.upload_path=E:/aqgqj/files/ +file.linux.upload_path=home/aqgqj/files/ #???? quartz.scan=false diff --git a/src/main/resources/logback-boot.xml b/src/main/resources/logback-boot.xml index 4ec7df0..4574bdf 100644 --- a/src/main/resources/logback-boot.xml +++ b/src/main/resources/logback-boot.xml @@ -70,7 +70,7 @@ - + diff --git a/src/main/resources/mappers/system/DictMapper.xml b/src/main/resources/mappers/system/DictMapper.xml index f13cb06..bcf2c5d 100644 --- a/src/main/resources/mappers/system/DictMapper.xml +++ b/src/main/resources/mappers/system/DictMapper.xml @@ -1,7 +1,7 @@ - + t.del_flag = 0 @@ -24,7 +24,7 @@ - select t.id, t.dict_code as dictCode, @@ -37,7 +37,7 @@ order by t.dict_sort - select dict2.id, dict2.dict_code as dictCode, dict2.dict_name as dictName, @@ -49,7 +49,7 @@ order by dict2.dict_sort asc - select t.id, t.dict_code as dictCode, @@ -62,7 +62,7 @@ order by t.dict_sort - select t.id, t.dict_code as dictCode, t.dict_name as dictName, @@ -72,7 +72,7 @@ from sys_distinct t where t.p_id = #{parentId} and t.dict_code = #{dictCode} - select t.id, t.dict_code as dictCode, t.dict_name as dictName, @@ -82,7 +82,7 @@ from sys_distinct t where t.p_id = #{parentId} and t.dict_name = #{dictName} - select t.id, t.dict_code as dictCode, t.dict_name as dictName, @@ -92,7 +92,7 @@ from sys_distinct t where t.p_id = #{parentId} and t.dict_value = #{dictValue} - select t.id, t.dict_code as dictCode, t.dict_name as dictName, diff --git a/src/main/resources/mappers/system/DistinctMapper.xml b/src/main/resources/mappers/system/DistinctMapper.xml index 21ed269..b061bf3 100644 --- a/src/main/resources/mappers/system/DistinctMapper.xml +++ b/src/main/resources/mappers/system/DistinctMapper.xml @@ -1,7 +1,7 @@ - + @@ -24,7 +24,7 @@ WHERE id = #{id} - SELECT sd.id, sd.dict_code AS dictCode, sd.dict_name AS dictName, @@ -49,7 +49,7 @@ - SELECT sd.id, sd.dict_code AS dictCode, sd.dict_name AS dictName, diff --git a/src/main/resources/mappers/system/PermissionMapper.xml b/src/main/resources/mappers/system/PermissionMapper.xml index 001d754..73d6baa 100644 --- a/src/main/resources/mappers/system/PermissionMapper.xml +++ b/src/main/resources/mappers/system/PermissionMapper.xml @@ -1,10 +1,10 @@ - + - select m.menu_id as id, m.menu_name as name, @@ -19,7 +19,7 @@ where rm.role_id = #{roleId} and m.del_flag = 0 order by m.menu_sort - select t.menu_id as id, t.menu_name as name, t.menu_type as type, @@ -32,7 +32,7 @@ where t.del_flag = 0 order by t.menu_sort - select t.menu_id as id, t.menu_name as name, t.menu_type as type, @@ -44,7 +44,7 @@ from sys_menu t where t.menu_type = 1 and t.del_flag = 0 order by t.menu_sort - select t.menu_id as id, t.menu_name as name, t.menu_type as type, diff --git a/src/main/resources/mappers/system/RoleMapper.xml b/src/main/resources/mappers/system/RoleMapper.xml index b833410..da63ebf 100644 --- a/src/main/resources/mappers/system/RoleMapper.xml +++ b/src/main/resources/mappers/system/RoleMapper.xml @@ -1,7 +1,7 @@ - + @@ -18,7 +18,7 @@ - select t.role_id as id, t.role_name as name, t.role_code as roleCode, @@ -27,7 +27,7 @@ from sys_role t - select t.role_id as id, t.role_name as name, t.role_code as roleCode, @@ -35,7 +35,7 @@ from sys_role t where t.role_name = #{name} and t.del_flag = 0 - select t.role_id as id, t.role_name as name, t.role_code as roleCode, diff --git a/src/main/resources/mappers/system/ScheduleMapper.xml b/src/main/resources/mappers/system/ScheduleMapper.xml index 0f0e3f7..24fcb2e 100644 --- a/src/main/resources/mappers/system/ScheduleMapper.xml +++ b/src/main/resources/mappers/system/ScheduleMapper.xml @@ -1,8 +1,8 @@ - - select id,task_name taskName,task_code taskCode,task_type taskType,task_id taskId,task_time taskTime, task_status taskStatus,update_time updateTime,del_flag,create_time createTime ,job_class jobClass ,remarks from sys_schedule diff --git a/src/main/resources/mappers/system/SysConfigMapper.xml b/src/main/resources/mappers/system/SysConfigMapper.xml index 40d570a..1b1a7d0 100644 --- a/src/main/resources/mappers/system/SysConfigMapper.xml +++ b/src/main/resources/mappers/system/SysConfigMapper.xml @@ -1,7 +1,7 @@ - + @@ -20,14 +20,14 @@ UPDATE sys_config SET del_flag = 1 WHERE id = #{id} - select id,system_code systemCode,system_name systemName,system_value systemValue from sys_config where del_flag=0 and system_code=#{sysCode} - SELECT id, system_code AS systemCode, system_name AS systemName, @@ -49,7 +49,7 @@ SELECT COUNT(*) FROM sys_config WHERE del_flag= 0 AND system_code = #{value} - SELECT id, system_code AS systemCode, system_name AS systemName, diff --git a/src/main/resources/mappers/system/SysLogsMapper.xml b/src/main/resources/mappers/system/SysLogsMapper.xml index 07054d9..8090f01 100644 --- a/src/main/resources/mappers/system/SysLogsMapper.xml +++ b/src/main/resources/mappers/system/SysLogsMapper.xml @@ -1,15 +1,15 @@ - + - + - + @@ -33,7 +33,7 @@ - + insert into sys_logs(id,ip,user_id,operate_user,operate_model,operate_detail,operate_type, logs_type,err_type,operate_time,params,result,failure_reason,uri,method,times,types,grade ) values (#{id},#{ip},#{userId},#{operatorUser},#{operatorModel},#{operatorDetail},#{operatorType}, @@ -56,7 +56,7 @@ limit #{offset}, #{limit} - select s.id, r.role_name as roleName, s.operate_user as operatorUser, diff --git a/src/main/resources/mappers/system/SysMenuMapper.xml b/src/main/resources/mappers/system/SysMenuMapper.xml index a81fc2e..94f261f 100644 --- a/src/main/resources/mappers/system/SysMenuMapper.xml +++ b/src/main/resources/mappers/system/SysMenuMapper.xml @@ -1,8 +1,8 @@ - - select sm.menu_url menuUrl,sm.auth, sm.menu_name menuName,sm2.menu_name pName from sys_role_menu srm @@ -11,7 +11,7 @@ where sm.del_flag=0 and sm.menu_url is not null and sm.menu_url!='' and srm.role_id=#{roleId} and sm.menu_type=#{type} - select sm.menu_url menuUrl,sm.auth, sm.menu_name menuName,sm2.menu_name pName from sys_role_menu srm @@ -20,7 +20,7 @@ where sm.del_flag=0 and sm.menu_url is not null and sm.menu_url!='' and sm.menu_url=#{url} and sm2.del_flag=0 - select sm.menu_url menuUrl,sm.auth,sm.menu_name menuName, sm2.menu_name pName,sm3.menu_name pMenuName from sys_menu sm diff --git a/src/main/resources/mappers/system/SysOrgMapper.xml b/src/main/resources/mappers/system/SysOrgMapper.xml index 84c56ef..b824be3 100644 --- a/src/main/resources/mappers/system/SysOrgMapper.xml +++ b/src/main/resources/mappers/system/SysOrgMapper.xml @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - SELECT so.org_id AS id, so.org_name AS orgName, so.org_code AS orgCode, @@ -44,7 +44,7 @@ ORDER BY so.org_sort,so.create_time DESC - SELECT 0 AS id,'组织机构' AS title,-1 AS parentId UNION ALL SELECT so.org_id AS id, @@ -58,7 +58,7 @@ SELECT COUNT(*) FROM sys_org WHERE del_flag = 0 AND ${param} = #{value} AND p_id = #{value2} - SELECT so.org_id AS id, so.org_name AS orgName, so.org_code AS orgCode, diff --git a/src/main/resources/mappers/system/SysWhiteMapper.xml b/src/main/resources/mappers/system/SysWhiteMapper.xml index 776d373..4183b36 100644 --- a/src/main/resources/mappers/system/SysWhiteMapper.xml +++ b/src/main/resources/mappers/system/SysWhiteMapper.xml @@ -1,7 +1,7 @@ - + INSERT INTO sys_white(ip,access_type,start_time,end_time,create_time) @@ -23,7 +23,7 @@ WHERE id = #{id} - select ip,access_type accessType,start_time startTime,end_time endTime from sys_white WHERE del_flag=0 @@ -32,7 +32,7 @@ - SELECT id, ip, CASE access_type WHEN '1' THEN '永久' WHEN '2' THEN '固定时间段' WHEN '3' THEN '指定时间' END AS accessType, @@ -49,7 +49,7 @@ ORDER BY create_time DESC - SELECT id, ip, access_type AS accessType, @@ -65,7 +65,7 @@ WHERE ip = #{value} AND del_flag = '0' - SELECT id, pwd_strength AS pwdStrength, min_length AS minLength, diff --git a/src/main/resources/mappers/system/TaskMapper.xml b/src/main/resources/mappers/system/TaskMapper.xml index fd5c435..2bfa3f3 100644 --- a/src/main/resources/mappers/system/TaskMapper.xml +++ b/src/main/resources/mappers/system/TaskMapper.xml @@ -1,9 +1,9 @@ - + - select id,task_name taskName,task_code taskCode,task_type taskType,task_id taskId,task_time taskTime, task_status taskStatus,update_time updateTime,del_flag,create_time createTime ,job_class jobClass ,remarks from sys_schedule @@ -16,10 +16,10 @@ - + update sys_schedule set task_status=#{taskStatus} where id=#{id} - + update sys_schedule set del_flag=1 where id=#{id} @@ -34,20 +34,20 @@ and job_class=#{jobClass} - + insert into sys_schedule(task_name,task_code,task_type,task_id,task_time,task_status,del_flag,job_class,remarks,create_time) values ( #{taskName},#{taskCode},'3',null,#{taskTime},#{taskStatus},0,#{jobClass},#{remarks},now() ) - + update sys_schedule set task_name=#{taskName},task_code=#{taskCode},task_time=#{taskTime},task_status=#{taskStatus},job_class=#{jobClass}, remarks=#{remarks} where id=#{id} - select id,task_name taskName,task_code taskCode,task_type taskType,task_id taskId,task_time taskTime, task_status taskStatus,update_time updateTime,del_flag,create_time createTime ,job_class jobClass ,remarks from sys_schedule diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml index 2dcda39..d90cd49 100644 --- a/src/main/resources/mappers/system/UserMapper.xml +++ b/src/main/resources/mappers/system/UserMapper.xml @@ -1,6 +1,6 @@ - + update sys_user set login_time=now() @@ -28,7 +28,7 @@ - select user_name userName,login_name loginName,ls_time lsTime , type,sleep_time sleepTime,id,login_time loginTimes from sys_user @@ -41,7 +41,7 @@ - + insert into sys_user(user_name,login_name,password,sex,phone,email,org_id,unit,dept,login_type, role_id,state,del_flag,create_time,new_user,type @@ -56,7 +56,7 @@ ) - select id,user_name as username,login_name as loginName, password,state,role_id as roleId,login_type loginType,new_user newUser from sys_user t @@ -83,7 +83,7 @@ - select t.id, t.user_name as username, t.login_name as loginName, t.sex as sex, t.phone as phone, t.email as email,so.abb_name,so.org_name orgName, t.state as state,t.del_flag as delFlag,sr.role_name roleName @@ -111,14 +111,14 @@ order by t.del_flag ASC , t.state,t.create_time DESC - select pwd_strength as pwdStrength, min_length as minLength, max_length as maxLength from sys_password_config where id = 1 - select id, user_name as username, login_name as loginName, @@ -136,7 +136,7 @@ where id = #{id} - select org_id as id, org_name as title, p_id as parentId, @@ -145,7 +145,7 @@ where del_flag = 0 order by org_sort asc - select id,phone from sys_user where phone = #{phone}