소스 검색

更改所有包名路径

xusl 9 달 전
부모
커밋
303199e152
100개의 변경된 파일404개의 추가작업 그리고 481개의 파일을 삭제
  1. 2 2
      console/src/main/java/com/jiayue/center/CenterForecastApplication.java
  2. 1 1
      console/src/main/java/com/jiayue/center/annotation/AgainVerify.java
  3. 1 1
      console/src/main/java/com/jiayue/center/annotation/InterfaceLimit.java
  4. 4 4
      console/src/main/java/com/jiayue/center/annotation/OperateLog.java
  5. 1 1
      console/src/main/java/com/jiayue/center/annotation/PreventReplay.java
  6. 7 8
      console/src/main/java/com/jiayue/center/aspectj/AgainVerifyAspect.java
  7. 4 4
      console/src/main/java/com/jiayue/center/aspectj/InterfaceLimitAspect.java
  8. 14 15
      console/src/main/java/com/jiayue/center/aspectj/OperateLogAspect.java
  9. 3 4
      console/src/main/java/com/jiayue/center/aspectj/PreventReplayAspect.java
  10. 1 1
      console/src/main/java/com/jiayue/center/backenum/ApproveOperaterEnum.java
  11. 1 1
      console/src/main/java/com/jiayue/center/backenum/ApproveResultEnum.java
  12. 1 1
      console/src/main/java/com/jiayue/center/backenum/ApproveStatusEnum.java
  13. 1 2
      console/src/main/java/com/jiayue/center/backenum/AuditAblesEventEnum.java
  14. 1 1
      console/src/main/java/com/jiayue/center/backenum/AuditType.java
  15. 1 1
      console/src/main/java/com/jiayue/center/backenum/BusinessStatus.java
  16. 1 1
      console/src/main/java/com/jiayue/center/backenum/BusinessType.java
  17. 1 1
      console/src/main/java/com/jiayue/center/backenum/HttpMethod.java
  18. 1 1
      console/src/main/java/com/jiayue/center/backenum/OperatorType.java
  19. 1 1
      console/src/main/java/com/jiayue/center/backenum/PasswordRuleEnum.java
  20. 1 1
      console/src/main/java/com/jiayue/center/backenum/ResponseEnum.java
  21. 1 1
      console/src/main/java/com/jiayue/center/config/CaptchaConfig.java
  22. 1 1
      console/src/main/java/com/jiayue/center/config/EncryptorConfig.java
  23. 3 3
      console/src/main/java/com/jiayue/center/config/EnvironmentPreparedListener.java
  24. 3 3
      console/src/main/java/com/jiayue/center/config/GlobalExceptionAdvice.java
  25. 4 4
      console/src/main/java/com/jiayue/center/config/MyAuthenticationProvider.java
  26. 1 1
      console/src/main/java/com/jiayue/center/config/MybatisPlusConfig.java
  27. 3 3
      console/src/main/java/com/jiayue/center/config/ResponseAdvice.java
  28. 1 1
      console/src/main/java/com/jiayue/center/config/SendMailUtil.java
  29. 3 3
      console/src/main/java/com/jiayue/center/config/StartDoSomethingConfig.java
  30. 6 9
      console/src/main/java/com/jiayue/center/config/WebConfig.java
  31. 7 7
      console/src/main/java/com/jiayue/center/config/WebSecurityConfig.java
  32. 1 1
      console/src/main/java/com/jiayue/center/constant/ApproveConstants.java
  33. 2 3
      console/src/main/java/com/jiayue/center/constant/CacheConstants.java
  34. 1 4
      console/src/main/java/com/jiayue/center/constant/Constants.java
  35. 1 1
      console/src/main/java/com/jiayue/center/constant/CustomException.java
  36. 2 5
      console/src/main/java/com/jiayue/center/constant/LoginConstants.java
  37. 1 1
      console/src/main/java/com/jiayue/center/constant/PermissionCharacter.java
  38. 1 1
      console/src/main/java/com/jiayue/center/constant/PermissionContextHolder.java
  39. 1 1
      console/src/main/java/com/jiayue/center/constant/SecretKeyConstants.java
  40. 1 1
      console/src/main/java/com/jiayue/center/constant/UserConstants.java
  41. 9 9
      console/src/main/java/com/jiayue/center/controller/ElectricFieldController.java
  42. 9 9
      console/src/main/java/com/jiayue/center/controller/ForecastPowerShortTermController.java
  43. 10 12
      console/src/main/java/com/jiayue/center/controller/IpBlacklistController.java
  44. 10 10
      console/src/main/java/com/jiayue/center/controller/NwpController.java
  45. 8 8
      console/src/main/java/com/jiayue/center/controller/ServerController.java
  46. 9 9
      console/src/main/java/com/jiayue/center/controller/SysAlarmController.java
  47. 14 16
      console/src/main/java/com/jiayue/center/controller/SysApproveController.java
  48. 10 10
      console/src/main/java/com/jiayue/center/controller/SysLogininforController.java
  49. 14 14
      console/src/main/java/com/jiayue/center/controller/SysMenuController.java
  50. 13 13
      console/src/main/java/com/jiayue/center/controller/SysOperlogController.java
  51. 11 12
      console/src/main/java/com/jiayue/center/controller/SysParameterController.java
  52. 12 13
      console/src/main/java/com/jiayue/center/controller/SysPolicyController.java
  53. 12 13
      console/src/main/java/com/jiayue/center/controller/SysRoleController.java
  54. 17 23
      console/src/main/java/com/jiayue/center/controller/SysUserController.java
  55. 9 9
      console/src/main/java/com/jiayue/center/controller/UserLoginController.java
  56. 2 3
      console/src/main/java/com/jiayue/center/dto/ActiveUserDto.java
  57. 1 1
      console/src/main/java/com/jiayue/center/dto/UserVisitInfoDto.java
  58. 1 1
      console/src/main/java/com/jiayue/center/entity/BaseEntity.java
  59. 1 1
      console/src/main/java/com/jiayue/center/entity/ElectricField.java
  60. 1 1
      console/src/main/java/com/jiayue/center/entity/ForecastPowerShortTerm.java
  61. 1 1
      console/src/main/java/com/jiayue/center/entity/Nwp.java
  62. 4 9
      console/src/main/java/com/jiayue/center/entity/Server.java
  63. 1 1
      console/src/main/java/com/jiayue/center/entity/SysAlarm.java
  64. 1 2
      console/src/main/java/com/jiayue/center/entity/SysApprove.java
  65. 1 1
      console/src/main/java/com/jiayue/center/entity/SysBlacklist.java
  66. 1 1
      console/src/main/java/com/jiayue/center/entity/SysLogininfor.java
  67. 1 1
      console/src/main/java/com/jiayue/center/entity/SysMenu.java
  68. 1 1
      console/src/main/java/com/jiayue/center/entity/SysOperLog.java
  69. 1 1
      console/src/main/java/com/jiayue/center/entity/SysParameter.java
  70. 1 1
      console/src/main/java/com/jiayue/center/entity/SysPolicy.java
  71. 1 1
      console/src/main/java/com/jiayue/center/entity/SysRole.java
  72. 1 1
      console/src/main/java/com/jiayue/center/entity/SysRoleMenu.java
  73. 1 1
      console/src/main/java/com/jiayue/center/entity/SysUser.java
  74. 1 1
      console/src/main/java/com/jiayue/center/entity/SysUserRole.java
  75. 1 1
      console/src/main/java/com/jiayue/center/entity/TreeSelect.java
  76. 2 2
      console/src/main/java/com/jiayue/center/entity/server/Cpu.java
  77. 3 3
      console/src/main/java/com/jiayue/center/entity/server/Jvm.java
  78. 2 2
      console/src/main/java/com/jiayue/center/entity/server/Mem.java
  79. 1 1
      console/src/main/java/com/jiayue/center/entity/server/Sys.java
  80. 1 1
      console/src/main/java/com/jiayue/center/entity/server/SysFile.java
  81. 2 2
      console/src/main/java/com/jiayue/center/entity/vo/MetaVo.java
  82. 1 1
      console/src/main/java/com/jiayue/center/entity/vo/RouterVo.java
  83. 6 6
      console/src/main/java/com/jiayue/center/factory/LoginFactory.java
  84. 5 5
      console/src/main/java/com/jiayue/center/factory/OperateLogFactory.java
  85. 10 10
      console/src/main/java/com/jiayue/center/filter/InterfaceLimitFilter.java
  86. 15 19
      console/src/main/java/com/jiayue/center/filter/JwtAuthenticationTokenFilter.java
  87. 1 1
      console/src/main/java/com/jiayue/center/filter/PropertyPreExcludeFilter.java
  88. 2 2
      console/src/main/java/com/jiayue/center/filter/SqlFilter.java
  89. 6 8
      console/src/main/java/com/jiayue/center/filter/VerifyCodeFilter.java
  90. 6 11
      console/src/main/java/com/jiayue/center/filter/VerifySmFilter.java
  91. 3 4
      console/src/main/java/com/jiayue/center/filter/XssEscapeFilter.java
  92. 3 3
      console/src/main/java/com/jiayue/center/filter/XssKeywordsFilter.java
  93. 11 16
      console/src/main/java/com/jiayue/center/handler/CustomAuthenticationFailureHandler.java
  94. 14 20
      console/src/main/java/com/jiayue/center/handler/CustomAuthenticationSuccessHandler.java
  95. 5 15
      console/src/main/java/com/jiayue/center/handler/CustomLogoutSuccessHandler.java
  96. 1 1
      console/src/main/java/com/jiayue/center/handler/EntryPointUnauthorizedHandler.java
  97. 2 4
      console/src/main/java/com/jiayue/center/handler/MyMetaObjectHandler.java
  98. 10 16
      console/src/main/java/com/jiayue/center/handler/RestAccessDeniedHandler.java
  99. 3 5
      console/src/main/java/com/jiayue/center/interceptor/TokenStatusInterceptor.java
  100. 6 6
      console/src/main/java/com/jiayue/center/job/AutoScanAccount.java

+ 2 - 2
console/src/main/java/com/jiayue/ssi/CenterForecastApplication.java → console/src/main/java/com/jiayue/center/CenterForecastApplication.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi;
+package com.jiayue.center;
 
 //import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
 import org.mybatis.spring.annotation.MapperScan;
@@ -13,7 +13,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @version 3.0
  */
 @SpringBootApplication
-@MapperScan("com.jiayue.ssi.mapper")
+@MapperScan("com.jiayue.center.mapper")
 //@EnableEncryptableProperties
 public class CenterForecastApplication {
     public static void main(String[] args) {

+ 1 - 1
console/src/main/java/com/jiayue/ssi/annotation/AgainVerify.java → console/src/main/java/com/jiayue/center/annotation/AgainVerify.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.annotation;
+package com.jiayue.center.annotation;
 
 import java.lang.annotation.*;
 

+ 1 - 1
console/src/main/java/com/jiayue/ssi/annotation/InterfaceLimit.java → console/src/main/java/com/jiayue/center/annotation/InterfaceLimit.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.annotation;
+package com.jiayue.center.annotation;
 /**
 * 接口访问频率注解,默认一分钟只能访问5次
 *

+ 4 - 4
console/src/main/java/com/jiayue/ssi/annotation/OperateLog.java → console/src/main/java/com/jiayue/center/annotation/OperateLog.java

@@ -1,8 +1,8 @@
-package com.jiayue.ssi.annotation;
+package com.jiayue.center.annotation;
 
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.backenum.OperatorType;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.backenum.OperatorType;
 
 import java.lang.annotation.*;
 

+ 1 - 1
console/src/main/java/com/jiayue/ssi/annotation/PreventReplay.java → console/src/main/java/com/jiayue/center/annotation/PreventReplay.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.annotation;
+package com.jiayue.center.annotation;
 
 import java.lang.annotation.*;
 

+ 7 - 8
console/src/main/java/com/jiayue/ssi/aspectj/AgainVerifyAspect.java → console/src/main/java/com/jiayue/center/aspectj/AgainVerifyAspect.java

@@ -1,19 +1,18 @@
-package com.jiayue.ssi.aspectj;
+package com.jiayue.center.aspectj;
 
 import cn.hutool.crypto.SmUtil;
-import com.jiayue.ssi.annotation.AgainVerify;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.util.ResponseVO;
-import com.jiayue.ssi.util.SM2CryptUtils;
-import com.jiayue.ssi.util.SecurityContextUtil;
+import com.jiayue.center.annotation.AgainVerify;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.entity.SysUser;
+import com.jiayue.center.util.ResponseVO;
+import com.jiayue.center.util.SM2CryptUtils;
+import com.jiayue.center.util.SecurityContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.core.annotation.Order;
-import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;

+ 4 - 4
console/src/main/java/com/jiayue/ssi/aspectj/InterfaceLimitAspect.java → console/src/main/java/com/jiayue/center/aspectj/InterfaceLimitAspect.java

@@ -1,8 +1,8 @@
-package com.jiayue.ssi.aspectj;
+package com.jiayue.center.aspectj;
 
 import javax.servlet.http.HttpServletRequest;
-import com.jiayue.ssi.annotation.InterfaceLimit;
-import com.jiayue.ssi.util.InterfaceLimitUtil;
+import com.jiayue.center.annotation.InterfaceLimit;
+import com.jiayue.center.util.InterfaceLimitUtil;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
-import com.jiayue.ssi.util.ResponseVO;
+import com.jiayue.center.util.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
 
 /**

+ 14 - 15
console/src/main/java/com/jiayue/ssi/aspectj/OperateLogAspect.java → console/src/main/java/com/jiayue/center/aspectj/OperateLogAspect.java

@@ -1,22 +1,21 @@
-package com.jiayue.ssi.aspectj;
+package com.jiayue.center.aspectj;
 
 import cn.hutool.core.util.DesensitizedUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.backenum.AuditAblesEventEnum;
-import com.jiayue.ssi.backenum.BusinessStatus;
-import com.jiayue.ssi.backenum.HttpMethod;
-import com.jiayue.ssi.entity.SysOperLog;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.factory.OperateLogFactory;
-import com.jiayue.ssi.filter.PropertyPreExcludeFilter;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.util.IPUtils;
-import com.jiayue.ssi.util.RyStringUtils;
-import com.jiayue.ssi.util.SecurityContextUtil;
-import com.jiayue.ssi.util.ServletUtils;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.backenum.AuditAblesEventEnum;
+import com.jiayue.center.backenum.BusinessStatus;
+import com.jiayue.center.backenum.HttpMethod;
+import com.jiayue.center.entity.SysOperLog;
+import com.jiayue.center.entity.SysPolicy;
+import com.jiayue.center.entity.SysUser;
+import com.jiayue.center.factory.OperateLogFactory;
+import com.jiayue.center.filter.PropertyPreExcludeFilter;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.util.IPUtils;
+import com.jiayue.center.util.SecurityContextUtil;
+import com.jiayue.center.util.ServletUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;

+ 3 - 4
console/src/main/java/com/jiayue/ssi/aspectj/PreventReplayAspect.java → console/src/main/java/com/jiayue/center/aspectj/PreventReplayAspect.java

@@ -1,6 +1,6 @@
-package com.jiayue.ssi.aspectj;
+package com.jiayue.center.aspectj;
 
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -8,7 +8,6 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
-import javax.servlet.http.HttpServletRequest;
 
 
 /**
@@ -25,7 +24,7 @@ public class PreventReplayAspect {
     /**
      * 定义切点
      */
-    @Pointcut("@annotation(com.jiayue.ssi.annotation.PreventReplay)")
+    @Pointcut("@annotation(com.jiayue.center.annotation.PreventReplay)")
     public void replayAspect(){
 
     }

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/ApproveOperaterEnum.java → console/src/main/java/com/jiayue/center/backenum/ApproveOperaterEnum.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/ApproveResultEnum.java → console/src/main/java/com/jiayue/center/backenum/ApproveResultEnum.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/ApproveStatusEnum.java → console/src/main/java/com/jiayue/center/backenum/ApproveStatusEnum.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 2
console/src/main/java/com/jiayue/ssi/backenum/AuditAblesEventEnum.java → console/src/main/java/com/jiayue/center/backenum/AuditAblesEventEnum.java

@@ -1,6 +1,5 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
-import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 /**

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/AuditType.java → console/src/main/java/com/jiayue/center/backenum/AuditType.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 /**
  * 审计类型

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/BusinessStatus.java → console/src/main/java/com/jiayue/center/backenum/BusinessStatus.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 /**
  * 操作状态

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/BusinessType.java → console/src/main/java/com/jiayue/center/backenum/BusinessType.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 /**
  * 业务操作类型

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/HttpMethod.java → console/src/main/java/com/jiayue/center/backenum/HttpMethod.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 import org.springframework.lang.Nullable;
 

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/OperatorType.java → console/src/main/java/com/jiayue/center/backenum/OperatorType.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 /**
  * 操作人类别

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/PasswordRuleEnum.java → console/src/main/java/com/jiayue/center/backenum/PasswordRuleEnum.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/backenum/ResponseEnum.java → console/src/main/java/com/jiayue/center/backenum/ResponseEnum.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.backenum;
+package com.jiayue.center.backenum;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/config/CaptchaConfig.java → console/src/main/java/com/jiayue/center/config/CaptchaConfig.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/config/EncryptorConfig.java → console/src/main/java/com/jiayue/center/config/EncryptorConfig.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
 //import org.jasypt.encryption.StringEncryptor;
 //import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;

+ 3 - 3
console/src/main/java/com/jiayue/ssi/config/EnvironmentPreparedListener.java → console/src/main/java/com/jiayue/center/config/EnvironmentPreparedListener.java

@@ -1,11 +1,11 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.util.SM2CryptUtils;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.util.SM2CryptUtils;
 import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
 import org.springframework.boot.env.OriginTrackedMapPropertySource;
 import org.springframework.context.ApplicationListener;

+ 3 - 3
console/src/main/java/com/jiayue/ssi/config/GlobalExceptionAdvice.java → console/src/main/java/com/jiayue/center/config/GlobalExceptionAdvice.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.util.IPUtils;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.util.IPUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.ControllerAdvice;

+ 4 - 4
console/src/main/java/com/jiayue/ssi/config/MyAuthenticationProvider.java → console/src/main/java/com/jiayue/center/config/MyAuthenticationProvider.java

@@ -1,9 +1,9 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
 import cn.hutool.crypto.SmUtil;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.util.SM2CryptUtils;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.entity.SysUser;
+import com.jiayue.center.util.SM2CryptUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/config/MybatisPlusConfig.java → console/src/main/java/com/jiayue/center/config/MybatisPlusConfig.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;

+ 3 - 3
console/src/main/java/com/jiayue/ssi/config/ResponseAdvice.java → console/src/main/java/com/jiayue/center/config/ResponseAdvice.java

@@ -1,9 +1,9 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.util.SM2CryptUtils;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.util.SM2CryptUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
 import org.springframework.http.MediaType;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/config/SendMailUtil.java → console/src/main/java/com/jiayue/center/config/SendMailUtil.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

+ 3 - 3
console/src/main/java/com/jiayue/ssi/config/StartDoSomethingConfig.java → console/src/main/java/com/jiayue/center/config/StartDoSomethingConfig.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.service.SysUserService;
+import com.jiayue.center.entity.SysUser;
+import com.jiayue.center.service.SysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

+ 6 - 9
console/src/main/java/com/jiayue/ssi/config/WebConfig.java → console/src/main/java/com/jiayue/center/config/WebConfig.java

@@ -1,22 +1,19 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.entity.SysBlacklist;
-import com.jiayue.ssi.interceptor.TokenStatusInterceptor;
-import com.jiayue.ssi.service.SysBlacklistService;
-import com.jiayue.ssi.service.SysParameterService;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.entity.SysBlacklist;
+import com.jiayue.center.interceptor.TokenStatusInterceptor;
+import com.jiayue.center.service.SysBlacklistService;
+import com.jiayue.center.service.SysParameterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.security.web.firewall.HttpFirewall;
-import org.springframework.security.web.firewall.StrictHttpFirewall;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-import java.util.Arrays;
 import java.util.List;
 
 /**

+ 7 - 7
console/src/main/java/com/jiayue/ssi/config/WebSecurityConfig.java → console/src/main/java/com/jiayue/center/config/WebSecurityConfig.java

@@ -1,11 +1,11 @@
-package com.jiayue.ssi.config;
+package com.jiayue.center.config;
 
-import com.jiayue.ssi.filter.*;
-import com.jiayue.ssi.handler.*;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.service.impl.UserServiceImpl;
-import com.jiayue.ssi.util.JwtTokenUtil;
+import com.jiayue.center.filter.*;
+import com.jiayue.center.handler.*;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.service.SysUserService;
+import com.jiayue.center.service.impl.UserServiceImpl;
+import com.jiayue.center.util.JwtTokenUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/constant/ApproveConstants.java → console/src/main/java/com/jiayue/center/constant/ApproveConstants.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;/**
+package com.jiayue.center.constant;/**
 * 审批常量类
 *
 * @author xsl

+ 2 - 3
console/src/main/java/com/jiayue/ssi/constant/CacheConstants.java → console/src/main/java/com/jiayue/center/constant/CacheConstants.java

@@ -1,7 +1,6 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.center.constant;
 
-import com.jiayue.ssi.dto.ActiveUserDto;
-import com.jiayue.ssi.entity.SysBlacklist;
+import com.jiayue.center.entity.SysBlacklist;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;

+ 1 - 4
console/src/main/java/com/jiayue/ssi/constant/Constants.java → console/src/main/java/com/jiayue/center/constant/Constants.java

@@ -1,10 +1,7 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.center.constant;
 
 import io.jsonwebtoken.Claims;
 
-import java.util.HashSet;
-import java.util.Set;
-
 /**
  * 通用常量信息
  *

+ 1 - 1
console/src/main/java/com/jiayue/ssi/constant/CustomException.java → console/src/main/java/com/jiayue/center/constant/CustomException.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.center.constant;
 /**
 * 自定义异常
 *

+ 2 - 5
console/src/main/java/com/jiayue/ssi/constant/LoginConstants.java → console/src/main/java/com/jiayue/center/constant/LoginConstants.java

@@ -1,10 +1,7 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.center.constant;
 
-import com.jiayue.ssi.dto.UserVisitInfoDto;
+import com.jiayue.center.dto.UserVisitInfoDto;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 

+ 1 - 1
console/src/main/java/com/jiayue/ssi/constant/PermissionCharacter.java → console/src/main/java/com/jiayue/center/constant/PermissionCharacter.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.center.constant;
 /**
 * 权限字符
 *

+ 1 - 1
console/src/main/java/com/jiayue/ssi/constant/PermissionContextHolder.java → console/src/main/java/com/jiayue/center/constant/PermissionContextHolder.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.center.constant;
 
 import cn.hutool.core.convert.Convert;
 import org.springframework.web.context.request.RequestAttributes;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/constant/SecretKeyConstants.java → console/src/main/java/com/jiayue/center/constant/SecretKeyConstants.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;/**
+package com.jiayue.center.constant;/**
 * 密钥类
 *
 * @author xsl

+ 1 - 1
console/src/main/java/com/jiayue/ssi/constant/UserConstants.java → console/src/main/java/com/jiayue/center/constant/UserConstants.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.constant;
+package com.jiayue.center.constant;
 
 /**
  * 用户常量信息

+ 9 - 9
console/src/main/java/com/jiayue/ssi/controller/ElectricFieldController.java → console/src/main/java/com/jiayue/center/controller/ElectricFieldController.java

@@ -1,14 +1,14 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.ElectricField;
-import com.jiayue.ssi.service.ElectricFieldService;
-import com.jiayue.ssi.util.ResponseVO;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.ElectricField;
+import com.jiayue.center.service.ElectricFieldService;
+import com.jiayue.center.util.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 9 - 9
console/src/main/java/com/jiayue/ssi/controller/ForecastPowerShortTermController.java → console/src/main/java/com/jiayue/center/controller/ForecastPowerShortTermController.java

@@ -1,16 +1,16 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.*;
-import com.jiayue.ssi.service.*;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.*;
+import com.jiayue.center.service.*;
+import com.jiayue.center.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 10 - 12
console/src/main/java/com/jiayue/ssi/controller/IpBlacklistController.java → console/src/main/java/com/jiayue/center/controller/IpBlacklistController.java

@@ -1,19 +1,17 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysBlacklist;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.entity.SysUserRole;
-import com.jiayue.ssi.service.SysBlacklistService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.SysBlacklist;
+import com.jiayue.center.service.SysBlacklistService;
+import com.jiayue.center.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 10 - 10
console/src/main/java/com/jiayue/ssi/controller/NwpController.java → console/src/main/java/com/jiayue/center/controller/NwpController.java

@@ -1,17 +1,17 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.Nwp;
-import com.jiayue.ssi.service.NwpService;
-import com.jiayue.ssi.service.SysParameterService;
-import com.jiayue.ssi.util.ResponseVO;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.Nwp;
+import com.jiayue.center.service.NwpService;
+import com.jiayue.center.service.SysParameterService;
+import com.jiayue.center.util.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 8 - 8
console/src/main/java/com/jiayue/ssi/controller/ServerController.java → console/src/main/java/com/jiayue/center/controller/ServerController.java

@@ -1,12 +1,12 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.Server;
-import com.jiayue.ssi.util.ResponseVO;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.Server;
+import com.jiayue.center.util.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;

+ 9 - 9
console/src/main/java/com/jiayue/ssi/controller/SysAlarmController.java → console/src/main/java/com/jiayue/center/controller/SysAlarmController.java

@@ -1,15 +1,15 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysAlarm;
-import com.jiayue.ssi.service.SysAlarmService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.SysAlarm;
+import com.jiayue.center.service.SysAlarmService;
+import com.jiayue.center.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 14 - 16
console/src/main/java/com/jiayue/ssi/controller/SysApproveController.java → console/src/main/java/com/jiayue/center/controller/SysApproveController.java

@@ -1,24 +1,23 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.util.DesensitizedUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.ApproveOperaterEnum;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.ApproveConstants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.SysApprove;
-import com.jiayue.ssi.entity.SysParameter;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.service.SysApproveService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.ApproveOperaterEnum;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.ApproveConstants;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.entity.SysApprove;
+import com.jiayue.center.entity.SysUser;
+import com.jiayue.center.service.SysApproveService;
+import com.jiayue.center.service.SysUserService;
+import com.jiayue.center.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateFormatUtils;
@@ -26,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.DateFormat;
 import java.util.List;
 
 /**

+ 10 - 10
console/src/main/java/com/jiayue/ssi/controller/SysLogininforController.java → console/src/main/java/com/jiayue/center/controller/SysLogininforController.java

@@ -1,18 +1,18 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysLogininfor;
-import com.jiayue.ssi.service.SysLogininforService;
-import com.jiayue.ssi.util.DateUtils;
-import com.jiayue.ssi.util.ResponseVO;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.SysLogininfor;
+import com.jiayue.center.service.SysLogininforService;
+import com.jiayue.center.util.DateUtils;
+import com.jiayue.center.util.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 14 - 14
console/src/main/java/com/jiayue/ssi/controller/SysMenuController.java → console/src/main/java/com/jiayue/center/controller/SysMenuController.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import java.util.HashMap;
 import java.util.List;
@@ -6,23 +6,23 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import cn.hutool.core.util.NumberUtil;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.UserConstants;
-import com.jiayue.ssi.entity.SysMenu;
-import com.jiayue.ssi.entity.SysRole;
-import com.jiayue.ssi.service.SysMenuService;
-import com.jiayue.ssi.service.SysRoleService;
-import com.jiayue.ssi.util.RyStringUtils;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.constant.UserConstants;
+import com.jiayue.center.entity.SysMenu;
+import com.jiayue.center.entity.SysRole;
+import com.jiayue.center.service.SysMenuService;
+import com.jiayue.center.service.SysRoleService;
+import com.jiayue.center.util.RyStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import com.jiayue.ssi.util.ResponseVO;
-import com.jiayue.ssi.util.SecurityContextUtil;
+import com.jiayue.center.util.ResponseVO;
+import com.jiayue.center.util.SecurityContextUtil;
 import lombok.extern.slf4j.Slf4j;
 
 /**

+ 13 - 13
console/src/main/java/com/jiayue/ssi/controller/SysOperlogController.java → console/src/main/java/com/jiayue/center/controller/SysOperlogController.java

@@ -1,21 +1,21 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.PermissionCharacter;
-import com.jiayue.ssi.entity.SysOperLog;
-import com.jiayue.ssi.entity.SysRole;
-import com.jiayue.ssi.service.SysOperLogService;
-import com.jiayue.ssi.service.SysRoleService;
-import com.jiayue.ssi.util.DateUtils;
-import com.jiayue.ssi.util.ResponseVO;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.constant.PermissionCharacter;
+import com.jiayue.center.entity.SysOperLog;
+import com.jiayue.center.entity.SysRole;
+import com.jiayue.center.service.SysOperLogService;
+import com.jiayue.center.service.SysRoleService;
+import com.jiayue.center.util.DateUtils;
+import com.jiayue.center.util.ResponseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

+ 11 - 12
console/src/main/java/com/jiayue/ssi/controller/SysParameterController.java → console/src/main/java/com/jiayue/center/controller/SysParameterController.java

@@ -1,19 +1,18 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.InterfaceLimit;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysParameter;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.service.SysParameterService;
-import com.jiayue.ssi.util.ResponseVO;
+import com.jiayue.center.annotation.InterfaceLimit;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.SysParameter;
+import com.jiayue.center.service.SysParameterService;
+import com.jiayue.center.util.ResponseVO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

+ 12 - 13
console/src/main/java/com/jiayue/ssi/controller/SysPolicyController.java → console/src/main/java/com/jiayue/center/controller/SysPolicyController.java

@@ -1,19 +1,18 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessStatus;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.ElectricField;
-import com.jiayue.ssi.entity.SysOperLog;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.factory.OperateLogFactory;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessStatus;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.SysOperLog;
+import com.jiayue.center.entity.SysPolicy;
+import com.jiayue.center.factory.OperateLogFactory;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.util.*;
 import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

+ 12 - 13
console/src/main/java/com/jiayue/ssi/controller/SysRoleController.java → console/src/main/java/com/jiayue/center/controller/SysRoleController.java

@@ -1,20 +1,20 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.util.NumberUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.PermissionCharacter;
-import com.jiayue.ssi.constant.UserConstants;
-import com.jiayue.ssi.entity.SysRole;
-import com.jiayue.ssi.service.SysRoleService;
-import com.jiayue.ssi.util.ResponseVO;
-import com.jiayue.ssi.util.SecurityContextUtil;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.constant.PermissionCharacter;
+import com.jiayue.center.constant.UserConstants;
+import com.jiayue.center.entity.SysRole;
+import com.jiayue.center.service.SysRoleService;
+import com.jiayue.center.util.ResponseVO;
+import com.jiayue.center.util.SecurityContextUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Locale;
 
 
 /**

+ 17 - 23
console/src/main/java/com/jiayue/ssi/controller/SysUserController.java → console/src/main/java/com/jiayue/center/controller/SysUserController.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Validator;
@@ -8,32 +8,26 @@ import cn.hutool.crypto.SmUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.jiayue.ssi.annotation.AgainVerify;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.annotation.PreventReplay;
-import com.jiayue.ssi.backenum.ApproveOperaterEnum;
-import com.jiayue.ssi.backenum.ApproveStatusEnum;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.config.SendMailUtil;
-import com.jiayue.ssi.constant.ApproveConstants;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.dto.ActiveUserDto;
-import com.jiayue.ssi.entity.*;
-import com.jiayue.ssi.service.*;
-import com.jiayue.ssi.service.impl.SysPermissionService;
-import com.jiayue.ssi.util.*;
-import io.jsonwebtoken.Claims;
+import com.jiayue.center.annotation.AgainVerify;
+import com.jiayue.center.annotation.OperateLog;
+import com.jiayue.center.annotation.PreventReplay;
+import com.jiayue.center.backenum.ApproveOperaterEnum;
+import com.jiayue.center.backenum.ApproveStatusEnum;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.config.SendMailUtil;
+import com.jiayue.center.constant.ApproveConstants;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.entity.*;
+import com.jiayue.center.service.*;
+import com.jiayue.center.service.impl.SysPermissionService;
+import com.jiayue.center.util.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;

+ 9 - 9
console/src/main/java/com/jiayue/ssi/controller/UserLoginController.java → console/src/main/java/com/jiayue/center/controller/UserLoginController.java

@@ -1,14 +1,14 @@
-package com.jiayue.ssi.controller;
+package com.jiayue.center.controller;
 
 
-import com.jiayue.ssi.config.SendMailUtil;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.CustomException;
-import com.jiayue.ssi.entity.SysMenu;
-import com.jiayue.ssi.service.SysMenuService;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.config.SendMailUtil;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.constant.CustomException;
+import com.jiayue.center.entity.SysMenu;
+import com.jiayue.center.service.SysMenuService;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.service.SysUserService;
+import com.jiayue.center.util.*;
 import com.wf.captcha.SpecCaptcha;
 import com.wf.captcha.base.Captcha;
 import lombok.extern.slf4j.Slf4j;

+ 2 - 3
console/src/main/java/com/jiayue/ssi/dto/ActiveUserDto.java → console/src/main/java/com/jiayue/center/dto/ActiveUserDto.java

@@ -1,8 +1,7 @@
-package com.jiayue.ssi.dto;
+package com.jiayue.center.dto;
 
-import com.jiayue.ssi.entity.SysUser;
+import com.jiayue.center.entity.SysUser;
 import lombok.Data;
-import org.springframework.security.core.Authentication;
 
 import javax.servlet.http.HttpServletRequest;
 

+ 1 - 1
console/src/main/java/com/jiayue/ssi/dto/UserVisitInfoDto.java → console/src/main/java/com/jiayue/center/dto/UserVisitInfoDto.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.dto;
+package com.jiayue.center.dto;
 
 import lombok.Data;
 

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/BaseEntity.java → console/src/main/java/com/jiayue/center/entity/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import java.io.Serializable;
 import java.util.Date;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/ElectricField.java → console/src/main/java/com/jiayue/center/entity/ElectricField.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/ForecastPowerShortTerm.java → console/src/main/java/com/jiayue/center/entity/ForecastPowerShortTerm.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/Nwp.java → console/src/main/java/com/jiayue/center/entity/Nwp.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 4 - 9
console/src/main/java/com/jiayue/ssi/entity/Server.java → console/src/main/java/com/jiayue/center/entity/Server.java

@@ -1,18 +1,13 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
-import com.jiayue.ssi.entity.server.*;
+import com.jiayue.center.entity.server.*;
 import java.net.UnknownHostException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
 
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Properties;
-
-import com.jiayue.ssi.util.Arith;
-import com.jiayue.ssi.util.IPUtils;
+import com.jiayue.center.util.Arith;
+import com.jiayue.center.util.IPUtils;
 import oshi.SystemInfo;
 import oshi.hardware.CentralProcessor;
 import oshi.hardware.CentralProcessor.TickType;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysAlarm.java → console/src/main/java/com/jiayue/center/entity/SysAlarm.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 2
console/src/main/java/com/jiayue/ssi/entity/SysApprove.java → console/src/main/java/com/jiayue/center/entity/SysApprove.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * 审批表

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysBlacklist.java → console/src/main/java/com/jiayue/center/entity/SysBlacklist.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysLogininfor.java → console/src/main/java/com/jiayue/center/entity/SysLogininfor.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysMenu.java → console/src/main/java/com/jiayue/center/entity/SysMenu.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysOperLog.java → console/src/main/java/com/jiayue/center/entity/SysOperLog.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysParameter.java → console/src/main/java/com/jiayue/center/entity/SysParameter.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysPolicy.java → console/src/main/java/com/jiayue/center/entity/SysPolicy.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysRole.java → console/src/main/java/com/jiayue/center/entity/SysRole.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysRoleMenu.java → console/src/main/java/com/jiayue/center/entity/SysRoleMenu.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysUser.java → console/src/main/java/com/jiayue/center/entity/SysUser.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/SysUserRole.java → console/src/main/java/com/jiayue/center/entity/SysUserRole.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/TreeSelect.java → console/src/main/java/com/jiayue/center/entity/TreeSelect.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity;
+package com.jiayue.center.entity;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

+ 2 - 2
console/src/main/java/com/jiayue/ssi/entity/server/Cpu.java → console/src/main/java/com/jiayue/center/entity/server/Cpu.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.entity.server;
+package com.jiayue.center.entity.server;
 
 
-import com.jiayue.ssi.util.Arith;
+import com.jiayue.center.util.Arith;
 
 /**
  * CPU相关信息

+ 3 - 3
console/src/main/java/com/jiayue/ssi/entity/server/Jvm.java → console/src/main/java/com/jiayue/center/entity/server/Jvm.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.entity.server;
+package com.jiayue.center.entity.server;
 
-import com.jiayue.ssi.util.Arith;
-import com.jiayue.ssi.util.DateUtils;
+import com.jiayue.center.util.Arith;
+import com.jiayue.center.util.DateUtils;
 
 import java.lang.management.ManagementFactory;
 

+ 2 - 2
console/src/main/java/com/jiayue/ssi/entity/server/Mem.java → console/src/main/java/com/jiayue/center/entity/server/Mem.java

@@ -1,7 +1,7 @@
-package com.jiayue.ssi.entity.server;
+package com.jiayue.center.entity.server;
 
 
-import com.jiayue.ssi.util.Arith;
+import com.jiayue.center.util.Arith;
 
 /**
  * 內存相关信息

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/server/Sys.java → console/src/main/java/com/jiayue/center/entity/server/Sys.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity.server;
+package com.jiayue.center.entity.server;
 
 /**
  * 系统相关信息

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/server/SysFile.java → console/src/main/java/com/jiayue/center/entity/server/SysFile.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity.server;
+package com.jiayue.center.entity.server;
 
 /**
  * 系统文件相关信息

+ 2 - 2
console/src/main/java/com/jiayue/ssi/entity/vo/MetaVo.java → console/src/main/java/com/jiayue/center/entity/vo/MetaVo.java

@@ -1,6 +1,6 @@
-package com.jiayue.ssi.entity.vo;
+package com.jiayue.center.entity.vo;
 
-import com.jiayue.ssi.util.RyStringUtils;
+import com.jiayue.center.util.RyStringUtils;
 
 /**
  * 路由显示信息

+ 1 - 1
console/src/main/java/com/jiayue/ssi/entity/vo/RouterVo.java → console/src/main/java/com/jiayue/center/entity/vo/RouterVo.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.entity.vo;
+package com.jiayue.center.entity.vo;
 
 import java.util.List;
 

+ 6 - 6
console/src/main/java/com/jiayue/ssi/factory/LoginFactory.java → console/src/main/java/com/jiayue/center/factory/LoginFactory.java

@@ -1,10 +1,10 @@
-package com.jiayue.ssi.factory;
+package com.jiayue.center.factory;
 
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.dto.UserVisitInfoDto;
-import com.jiayue.ssi.entity.SysLogininfor;
-import com.jiayue.ssi.service.SysLogininforService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.constant.Constants;
+import com.jiayue.center.dto.UserVisitInfoDto;
+import com.jiayue.center.entity.SysLogininfor;
+import com.jiayue.center.service.SysLogininforService;
+import com.jiayue.center.util.*;
 import eu.bitwalker.useragentutils.UserAgent;
 
 import java.util.Date;

+ 5 - 5
console/src/main/java/com/jiayue/ssi/factory/OperateLogFactory.java → console/src/main/java/com/jiayue/center/factory/OperateLogFactory.java

@@ -1,9 +1,9 @@
-package com.jiayue.ssi.factory;
+package com.jiayue.center.factory;
 
-import com.jiayue.ssi.entity.SysOperLog;
-import com.jiayue.ssi.service.SysOperLogService;
-import com.jiayue.ssi.util.AddressUtils;
-import com.jiayue.ssi.util.SpringUtils;
+import com.jiayue.center.entity.SysOperLog;
+import com.jiayue.center.service.SysOperLogService;
+import com.jiayue.center.util.AddressUtils;
+import com.jiayue.center.util.SpringUtils;
 
 /**
  * 操作日志工厂

+ 10 - 10
console/src/main/java/com/jiayue/ssi/filter/InterfaceLimitFilter.java → console/src/main/java/com/jiayue/center/filter/InterfaceLimitFilter.java

@@ -1,14 +1,14 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.center.filter;
 
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessStatus;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.entity.SysBlacklist;
-import com.jiayue.ssi.entity.SysOperLog;
-import com.jiayue.ssi.factory.OperateLogFactory;
-import com.jiayue.ssi.service.SysBlacklistService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessStatus;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.entity.SysBlacklist;
+import com.jiayue.center.entity.SysOperLog;
+import com.jiayue.center.factory.OperateLogFactory;
+import com.jiayue.center.service.SysBlacklistService;
+import com.jiayue.center.util.*;
 import io.jsonwebtoken.Claims;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

+ 15 - 19
console/src/main/java/com/jiayue/ssi/filter/JwtAuthenticationTokenFilter.java → console/src/main/java/com/jiayue/center/filter/JwtAuthenticationTokenFilter.java

@@ -1,9 +1,7 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.center.filter;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -11,22 +9,20 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessStatus;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.constant.LoginConstants;
-import com.jiayue.ssi.dto.UserVisitInfoDto;
-import com.jiayue.ssi.entity.SysOperLog;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.factory.OperateLogFactory;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.service.impl.UserServiceImpl;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessStatus;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.constant.LoginConstants;
+import com.jiayue.center.dto.UserVisitInfoDto;
+import com.jiayue.center.entity.SysOperLog;
+import com.jiayue.center.entity.SysPolicy;
+import com.jiayue.center.entity.SysUser;
+import com.jiayue.center.factory.OperateLogFactory;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.service.SysUserService;
+import com.jiayue.center.service.impl.UserServiceImpl;
+import com.jiayue.center.util.*;
 import eu.bitwalker.useragentutils.UserAgent;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;

+ 1 - 1
console/src/main/java/com/jiayue/ssi/filter/PropertyPreExcludeFilter.java → console/src/main/java/com/jiayue/center/filter/PropertyPreExcludeFilter.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.center.filter;
 
 import com.alibaba.fastjson2.filter.SimplePropertyPreFilter;
 

+ 2 - 2
console/src/main/java/com/jiayue/ssi/filter/SqlFilter.java → console/src/main/java/com/jiayue/center/filter/SqlFilter.java

@@ -1,6 +1,6 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.center.filter;
 
-import com.jiayue.ssi.util.ResponseInfo;
+import com.jiayue.center.util.ResponseInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;

+ 6 - 8
console/src/main/java/com/jiayue/ssi/filter/VerifyCodeFilter.java → console/src/main/java/com/jiayue/center/filter/VerifyCodeFilter.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.center.filter;
 
 import java.io.IOException;
 
@@ -7,18 +7,16 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.util.IPUtils;
-import com.jiayue.ssi.util.ResponseInfo;
+import com.jiayue.center.constant.Constants;
+import com.jiayue.center.factory.LoginFactory;
+import com.jiayue.center.util.ResponseInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.util.LocalCache;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.util.LocalCache;
 
 import lombok.RequiredArgsConstructor;
 

+ 6 - 11
console/src/main/java/com/jiayue/ssi/filter/VerifySmFilter.java → console/src/main/java/com/jiayue/center/filter/VerifySmFilter.java

@@ -1,21 +1,16 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.center.filter;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.dto.ActiveUserDto;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.service.impl.UserServiceImpl;
-import com.jiayue.ssi.servlet.ParameterRequestWrapper;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.constant.Constants;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.factory.LoginFactory;
+import com.jiayue.center.servlet.ParameterRequestWrapper;
+import com.jiayue.center.util.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.core.annotation.Order;
-import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;

+ 3 - 4
console/src/main/java/com/jiayue/ssi/filter/XssEscapeFilter.java → console/src/main/java/com/jiayue/center/filter/XssEscapeFilter.java

@@ -1,15 +1,14 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.center.filter;
 /**
  * @author xsl
  * @since 2023/05/17
  */
 
-import com.jiayue.ssi.servlet.XssEscapeHttpServletRequestWrapper;
-import com.jiayue.ssi.util.ResponseInfo;
+import com.jiayue.center.servlet.XssEscapeHttpServletRequestWrapper;
+import com.jiayue.center.util.ResponseInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;

+ 3 - 3
console/src/main/java/com/jiayue/ssi/filter/XssKeywordsFilter.java → console/src/main/java/com/jiayue/center/filter/XssKeywordsFilter.java

@@ -1,8 +1,8 @@
-package com.jiayue.ssi.filter;
+package com.jiayue.center.filter;
 
 
-import com.jiayue.ssi.servlet.XssKeywordsHttpServletRequestWrapper;
-import com.jiayue.ssi.util.ResponseInfo;
+import com.jiayue.center.servlet.XssKeywordsHttpServletRequestWrapper;
+import com.jiayue.center.util.ResponseInfo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;

+ 11 - 16
console/src/main/java/com/jiayue/ssi/handler/CustomAuthenticationFailureHandler.java → console/src/main/java/com/jiayue/center/handler/CustomAuthenticationFailureHandler.java

@@ -1,27 +1,22 @@
-package com.jiayue.ssi.handler;
+package com.jiayue.center.handler;
 
 import java.io.IOException;
-import java.util.List;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.config.SendMailUtil;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.entity.SysAlarm;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.service.SysAlarmService;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.AesUtils;
-import com.jiayue.ssi.util.DateUtils;
-import com.jiayue.ssi.util.IPUtils;
-import com.jiayue.ssi.util.LocalCache;
+import com.jiayue.center.config.SendMailUtil;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.constant.Constants;
+import com.jiayue.center.entity.SysPolicy;
+import com.jiayue.center.entity.SysUser;
+import com.jiayue.center.factory.LoginFactory;
+import com.jiayue.center.service.SysAlarmService;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.service.SysUserService;
+import com.jiayue.center.util.LocalCache;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.AuthenticationException;

+ 14 - 20
console/src/main/java/com/jiayue/ssi/handler/CustomAuthenticationSuccessHandler.java → console/src/main/java/com/jiayue/center/handler/CustomAuthenticationSuccessHandler.java

@@ -1,30 +1,24 @@
-package com.jiayue.ssi.handler;
+package com.jiayue.center.handler;
 
 import java.io.IOException;
 import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.config.SendMailUtil;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.constant.LoginConstants;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.dto.ActiveUserDto;
-import com.jiayue.ssi.dto.UserVisitInfoDto;
-import com.jiayue.ssi.entity.SysLogininfor;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.service.SysAlarmService;
-import com.jiayue.ssi.service.SysLogininforService;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.*;
+import com.jiayue.center.config.SendMailUtil;
+import com.jiayue.center.constant.CacheConstants;
+import com.jiayue.center.constant.Constants;
+import com.jiayue.center.constant.LoginConstants;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.dto.ActiveUserDto;
+import com.jiayue.center.dto.UserVisitInfoDto;
+import com.jiayue.center.factory.LoginFactory;
+import com.jiayue.center.service.SysAlarmService;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.service.SysUserService;
+import com.jiayue.center.util.*;
 import eu.bitwalker.useragentutils.UserAgent;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +27,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
 
-import com.jiayue.ssi.entity.SysUser;
+import com.jiayue.center.entity.SysUser;
 
 import cn.hutool.json.JSONUtil;
 

+ 5 - 15
console/src/main/java/com/jiayue/ssi/handler/CustomLogoutSuccessHandler.java → console/src/main/java/com/jiayue/center/handler/CustomLogoutSuccessHandler.java

@@ -1,17 +1,10 @@
-package com.jiayue.ssi.handler;
+package com.jiayue.center.handler;
 
 import cn.hutool.json.JSONUtil;
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.constant.Constants;
-import com.jiayue.ssi.constant.LoginConstants;
-import com.jiayue.ssi.constant.SecretKeyConstants;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.factory.LoginFactory;
-import com.jiayue.ssi.service.SysUserService;
-import com.jiayue.ssi.util.IPUtils;
-import com.jiayue.ssi.util.ResponseVO;
-import com.jiayue.ssi.util.SM2CryptUtils;
-import com.jiayue.ssi.util.SecurityContextUtil;
+import com.jiayue.center.constant.SecretKeyConstants;
+import com.jiayue.center.service.SysUserService;
+import com.jiayue.center.util.ResponseVO;
+import com.jiayue.center.util.SM2CryptUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.Authentication;
@@ -19,9 +12,6 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
 
 /**
  * 自定义退出处理类 返回成功

+ 1 - 1
console/src/main/java/com/jiayue/ssi/handler/EntryPointUnauthorizedHandler.java → console/src/main/java/com/jiayue/center/handler/EntryPointUnauthorizedHandler.java

@@ -1,4 +1,4 @@
-package com.jiayue.ssi.handler;
+package com.jiayue.center.handler;
 
 import java.io.IOException;
 

+ 2 - 4
console/src/main/java/com/jiayue/ssi/handler/MyMetaObjectHandler.java → console/src/main/java/com/jiayue/center/handler/MyMetaObjectHandler.java

@@ -1,10 +1,8 @@
-package com.jiayue.ssi.handler;
+package com.jiayue.center.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.util.SecurityContextUtil;
+import com.jiayue.center.util.SecurityContextUtil;
 import org.apache.ibatis.reflection.MetaObject;
-import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;

+ 10 - 16
console/src/main/java/com/jiayue/ssi/handler/RestAccessDeniedHandler.java → console/src/main/java/com/jiayue/center/handler/RestAccessDeniedHandler.java

@@ -1,23 +1,17 @@
-package com.jiayue.ssi.handler;
+package com.jiayue.center.handler;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.jiayue.ssi.annotation.OperateLog;
-import com.jiayue.ssi.backenum.AuditType;
-import com.jiayue.ssi.backenum.BusinessStatus;
-import com.jiayue.ssi.backenum.BusinessType;
-import com.jiayue.ssi.entity.SysAlarm;
-import com.jiayue.ssi.entity.SysOperLog;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.factory.OperateLogFactory;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.util.DateUtils;
-import com.jiayue.ssi.util.IPUtils;
-import com.jiayue.ssi.util.JwtTokenUtil;
-import com.jiayue.ssi.util.ServletUtils;
+import com.jiayue.center.backenum.AuditType;
+import com.jiayue.center.backenum.BusinessStatus;
+import com.jiayue.center.backenum.BusinessType;
+import com.jiayue.center.entity.SysOperLog;
+import com.jiayue.center.factory.OperateLogFactory;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.util.IPUtils;
+import com.jiayue.center.util.JwtTokenUtil;
+import com.jiayue.center.util.ServletUtils;
 import io.jsonwebtoken.Claims;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

+ 3 - 5
console/src/main/java/com/jiayue/ssi/interceptor/TokenStatusInterceptor.java → console/src/main/java/com/jiayue/center/interceptor/TokenStatusInterceptor.java

@@ -1,9 +1,7 @@
-package com.jiayue.ssi.interceptor;
+package com.jiayue.center.interceptor;
 
-import com.jiayue.ssi.constant.CacheConstants;
-import com.jiayue.ssi.util.JwtTokenUtil;
-import com.jiayue.ssi.util.LocalCache;
-import com.jiayue.ssi.util.ResponseInfo;
+import com.jiayue.center.util.JwtTokenUtil;
+import com.jiayue.center.util.ResponseInfo;
 import io.jsonwebtoken.Claims;
 import org.springframework.web.servlet.HandlerInterceptor;
 

+ 6 - 6
console/src/main/java/com/jiayue/ssi/job/AutoScanAccount.java → console/src/main/java/com/jiayue/center/job/AutoScanAccount.java

@@ -1,13 +1,13 @@
-package com.jiayue.ssi.job;
+package com.jiayue.center.job;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.jiayue.ssi.entity.SysPolicy;
-import com.jiayue.ssi.entity.SysUser;
-import com.jiayue.ssi.mapper.SysUserMapper;
-import com.jiayue.ssi.service.SysPolicyService;
-import com.jiayue.ssi.service.SysUserService;
+import com.jiayue.center.entity.SysPolicy;
+import com.jiayue.center.entity.SysUser;
+import com.jiayue.center.mapper.SysUserMapper;
+import com.jiayue.center.service.SysPolicyService;
+import com.jiayue.center.service.SysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.