修改了包名之后又还原了，相当于没有修改什么

src/main/java/com/ost/micro/securitycommon/annotation/DataFilter.java → src/main/java/com/ost/micro/common/annotation/DataFilter.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.annotation;
+package com.ost.micro.common.annotation;
 
 import java.lang.annotation.*;
 

src/main/java/com/ost/micro/securitycommon/annotation/LogOperation.java → src/main/java/com/ost/micro/common/annotation/LogOperation.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.annotation;
+package com.ost.micro.common.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

src/main/java/com/ost/micro/securitycommon/aspect/DataFilterAspect.java → src/main/java/com/ost/micro/common/aspect/DataFilterAspect.java

@@ -6,17 +6,17 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.aspect;
+package com.ost.micro.common.aspect;
 
 import cn.hutool.core.collection.CollUtil;
 import com.ost.micro.common.constant.Constant;
 import com.ost.micro.common.exception.ErrorCode;
 import com.ost.micro.common.exception.RenException;
-import com.ost.micro.securitycommon.annotation.DataFilter;
-import com.ost.micro.securitycommon.interceptor.DataScope;
 import com.ost.micro.modules.security.user.SecurityUser;
 import com.ost.micro.modules.security.user.UserDetail;
 import com.ost.micro.modules.sys.enums.SuperAdminEnum;
+import com.ost.micro.common.annotation.DataFilter;
+import com.ost.micro.common.interceptor.DataScope;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
@@ -37,7 +37,7 @@ import java.util.Map;
 @Component
 public class DataFilterAspect {
 
-    @Pointcut("@annotation(com.ost.micro.securitycommon.annotation.DataFilter)")
+    @Pointcut("@annotation(com.ost.micro.common.annotation.DataFilter)")
     public void dataFilterCut() {
 
     }

src/main/java/com/ost/micro/securitycommon/aspect/LogOperationAspect.java → src/main/java/com/ost/micro/common/aspect/LogOperationAspect.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.aspect;
+package com.ost.micro.common.aspect;
 
 import com.alibaba.fastjson.JSON;
 import com.ost.micro.common.utils.HttpContextUtils;
@@ -16,7 +16,7 @@ import com.ost.micro.modules.log.enums.OperationStatusEnum;
 import com.ost.micro.modules.log.service.SysLogOperationService;
 import com.ost.micro.modules.security.user.SecurityUser;
 import com.ost.micro.modules.security.user.UserDetail;
-import com.ost.micro.securitycommon.annotation.LogOperation;
+import com.ost.micro.common.annotation.LogOperation;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -40,7 +40,7 @@ public class LogOperationAspect {
     @Autowired
     private SysLogOperationService sysLogOperationService;
 
-    @Pointcut("@annotation(com.ost.micro.securitycommon.annotation.LogOperation)")
+    @Pointcut("@annotation(com.ost.micro.common.annotation.LogOperation)")
     public void logPointCut() {
 
     }

src/main/java/com/ost/micro/securitycommon/config/KaptchaConfig.java → src/main/java/com/ost/micro/common/config/KaptchaConfig.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.config;
+package com.ost.micro.common.config;
 
 import com.google.code.kaptcha.impl.DefaultKaptcha;
 import com.google.code.kaptcha.util.Config;

src/main/java/com/ost/micro/securitycommon/config/MybatisPlusConfig.java → src/main/java/com/ost/micro/common/config/MybatisPlusConfig.java

@@ -6,10 +6,10 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.config;
+package com.ost.micro.common.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import com.ost.micro.securitycommon.interceptor.DataFilterInterceptor;
+import com.ost.micro.common.interceptor.DataFilterInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;

src/main/java/com/ost/micro/securitycommon/config/Swagger2Config.java → src/main/java/com/ost/micro/common/config/Swagger2Config.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.config;
+package com.ost.micro.common.config;
 
 import com.ost.micro.common.constant.Constant;
 import io.swagger.annotations.ApiOperation;
@@ -42,7 +42,7 @@ public class Swagger2Config {
             //加了ApiOperation注解的类，生成接口文档
             .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
             //包下的类，生成接口文档
-            //.apis(RequestHandlerSelectors.basePackage("com.ost.micro.modules.job.controller"))
+            //.apis(RequestHandlerSelectors.basePackage("com.ost.micro.security.modules.job.controller"))
             .paths(PathSelectors.any())
             .build()
             .directModelSubstitute(java.util.Date.class, String.class)

src/main/java/com/ost/micro/securitycommon/exception/RenExceptionHandler.java → src/main/java/com/ost/micro/common/exception/RenExceptionHandler.java

@@ -6,13 +6,10 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.exception;
+package com.ost.micro.common.exception;
 
 import cn.hutool.core.map.MapUtil;
 import com.alibaba.fastjson.JSON;
-import com.ost.micro.common.exception.ErrorCode;
-import com.ost.micro.common.exception.ExceptionUtils;
-import com.ost.micro.common.exception.RenException;
 import com.ost.micro.common.utils.HttpContextUtils;
 import com.ost.micro.common.utils.IpUtils;
 import com.ost.micro.common.utils.Result;

src/main/java/com/ost/micro/securitycommon/handler/FieldMetaObjectHandler.java → src/main/java/com/ost/micro/common/handler/FieldMetaObjectHandler.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.handler;
+package com.ost.micro.common.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.ost.micro.modules.security.user.SecurityUser;

src/main/java/com/ost/micro/securitycommon/interceptor/DataFilterInterceptor.java → src/main/java/com/ost/micro/common/interceptor/DataFilterInterceptor.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.interceptor;
+package com.ost.micro.common.interceptor;
 
 import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
 import com.baomidou.mybatisplus.extension.handlers.AbstractSqlParserHandler;

src/main/java/com/ost/micro/securitycommon/interceptor/DataScope.java → src/main/java/com/ost/micro/common/interceptor/DataScope.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.interceptor;
+package com.ost.micro.common.interceptor;
 
 /**
  * 数据范围

src/main/java/com/ost/micro/securitycommon/utils/ExcelUtils.java → src/main/java/com/ost/micro/common/utils/ExcelUtils.java

@@ -6,11 +6,10 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.utils;
+package com.ost.micro.common.utils;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
-import com.ost.micro.common.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;

src/main/java/com/ost/micro/securitycommon/validator/group/AliyunGroup.java → src/main/java/com/ost/micro/common/validator/group/AliyunGroup.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.validator.group;
+package com.ost.micro.common.validator.group;
 
 /**
  * 阿里云

src/main/java/com/ost/micro/securitycommon/validator/group/FastDFSGroup.java → src/main/java/com/ost/micro/common/validator/group/FastDFSGroup.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.validator.group;
+package com.ost.micro.common.validator.group;
 
 /**
  * FastDFS

src/main/java/com/ost/micro/securitycommon/validator/group/LocalGroup.java → src/main/java/com/ost/micro/common/validator/group/LocalGroup.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.validator.group;
+package com.ost.micro.common.validator.group;
 
 /**
  * 本地上传

src/main/java/com/ost/micro/securitycommon/validator/group/QcloudGroup.java → src/main/java/com/ost/micro/common/validator/group/QcloudGroup.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.validator.group;
+package com.ost.micro.common.validator.group;
 
 /**
  * 腾讯云

src/main/java/com/ost/micro/securitycommon/validator/group/QiniuGroup.java → src/main/java/com/ost/micro/common/validator/group/QiniuGroup.java

@@ -6,7 +6,7 @@
  * 版权所有，侵权必究！
  */
 
-package com.ost.micro.securitycommon.validator.group;
+package com.ost.micro.common.validator.group;
 
 /**
  * 七牛

src/main/java/com/ost/micro/config/SecurityWebMvcConfigurer.java

@@ -7,7 +7,6 @@ import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.ArrayList;

src/main/java/com/ost/micro/filter/AccessFilter.java

@@ -8,10 +8,8 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.subject.Subject;
 import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
-import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

src/main/java/com/ost/micro/filter/UrlFilter.java

@@ -8,10 +8,6 @@ import org.springframework.cloud.netflix.zuul.filters.support.FilterConstants;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 @Slf4j
 @Component

src/main/java/com/ost/micro/modules/log/controller/SysLogErrorController.java

@@ -13,8 +13,8 @@ import com.ost.micro.common.utils.Result;
 import com.ost.micro.modules.log.dto.SysLogErrorDTO;
 import com.ost.micro.modules.log.excel.SysLogErrorExcel;
 import com.ost.micro.modules.log.service.SysLogErrorService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
-import com.ost.micro.securitycommon.utils.ExcelUtils;
+import com.ost.micro.common.annotation.LogOperation;
+import com.ost.micro.common.utils.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/ost/micro/modules/log/controller/SysLogLoginController.java

@@ -13,8 +13,8 @@ import com.ost.micro.common.utils.Result;
 import com.ost.micro.modules.log.dto.SysLogLoginDTO;
 import com.ost.micro.modules.log.excel.SysLogLoginExcel;
 import com.ost.micro.modules.log.service.SysLogLoginService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
-import com.ost.micro.securitycommon.utils.ExcelUtils;
+import com.ost.micro.common.annotation.LogOperation;
+import com.ost.micro.common.utils.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/ost/micro/modules/log/controller/SysLogOperationController.java

@@ -13,8 +13,8 @@ import com.ost.micro.common.utils.Result;
 import com.ost.micro.modules.log.dto.SysLogOperationDTO;
 import com.ost.micro.modules.log.excel.SysLogOperationExcel;
 import com.ost.micro.modules.log.service.SysLogOperationService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
-import com.ost.micro.securitycommon.utils.ExcelUtils;
+import com.ost.micro.common.annotation.LogOperation;
+import com.ost.micro.common.utils.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/ost/micro/modules/security/controller/LoginController.java

@@ -23,7 +23,6 @@ import com.ost.micro.modules.security.service.CaptchaService;
 import com.ost.micro.modules.security.service.SysUserTokenService;
 import com.ost.micro.modules.security.user.SecurityUser;
 import com.ost.micro.modules.security.user.UserDetail;
-import com.ost.micro.modules.sys.dto.SysUserDTO;
 import com.ost.micro.modules.sys.dto.SysUserExtDTO;
 import com.ost.micro.modules.sys.enums.UserStatusEnum;
 import com.ost.micro.modules.sys.service.SysUserService;

src/main/java/com/ost/micro/modules/security/oauth2/Oauth2Realm.java

@@ -68,7 +68,7 @@ public class Oauth2Realm extends AuthorizingRealm {
         //token失效
         if(tokenEntity == null || tokenEntity.getExpireDate().getTime() < System.currentTimeMillis()){
             //throw new IncorrectCredentialsException(MessageUtils.getMessage(ErrorCode.TOKEN_INVALID));
-            throw new RenException("",ErrorCode.TOKEN_INVALID);
+            throw new RenException("", ErrorCode.TOKEN_INVALID);
         }
 
         //查询用户信息

src/main/java/com/ost/micro/modules/sys/controller/SysDeptController.java

@@ -18,7 +18,7 @@ import com.ost.micro.core.utils.DateUtil;
 import com.ost.micro.modules.sys.dto.SysDeptBizDTO;
 import com.ost.micro.modules.sys.dto.SysDeptDTO;
 import com.ost.micro.modules.sys.service.SysDeptService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
+import com.ost.micro.common.annotation.LogOperation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/ost/micro/modules/sys/controller/SysDictController.java

@@ -17,7 +17,7 @@ import com.ost.micro.common.validator.group.DefaultGroup;
 import com.ost.micro.common.validator.group.UpdateGroup;
 import com.ost.micro.modules.sys.dto.SysDictDTO;
 import com.ost.micro.modules.sys.service.SysDictService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
+import com.ost.micro.common.annotation.LogOperation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/ost/micro/modules/sys/controller/SysMenuController.java

@@ -20,11 +20,10 @@ import com.ost.micro.modules.security.user.UserDetail;
 import com.ost.micro.modules.sys.dto.SysMenuDTO;
 import com.ost.micro.modules.sys.enums.MenuTypeEnum;
 import com.ost.micro.modules.sys.service.SysMenuService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
+import com.ost.micro.common.annotation.LogOperation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/ost/micro/modules/sys/controller/SysParamsController.java

@@ -19,8 +19,8 @@ import com.ost.micro.common.validator.group.UpdateGroup;
 import com.ost.micro.modules.sys.dto.SysParamsDTO;
 import com.ost.micro.modules.sys.excel.SysParamsExcel;
 import com.ost.micro.modules.sys.service.SysParamsService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
-import com.ost.micro.securitycommon.utils.ExcelUtils;
+import com.ost.micro.common.annotation.LogOperation;
+import com.ost.micro.common.utils.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/ost/micro/modules/sys/controller/SysRoleController.java

@@ -23,12 +23,11 @@ import com.ost.micro.modules.sys.service.SysDeptService;
 import com.ost.micro.modules.sys.service.SysRoleDataScopeService;
 import com.ost.micro.modules.sys.service.SysRoleMenuService;
 import com.ost.micro.modules.sys.service.SysRoleService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
+import com.ost.micro.common.annotation.LogOperation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
@@ -36,7 +35,6 @@ import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/ost/micro/modules/sys/controller/SysUserController.java

@@ -30,8 +30,8 @@ import com.ost.micro.modules.sys.excel.SysUserExcel;
 import com.ost.micro.modules.sys.service.SysDeptService;
 import com.ost.micro.modules.sys.service.SysRoleUserService;
 import com.ost.micro.modules.sys.service.SysUserService;
-import com.ost.micro.securitycommon.annotation.LogOperation;
-import com.ost.micro.securitycommon.utils.ExcelUtils;
+import com.ost.micro.common.annotation.LogOperation;
+import com.ost.micro.common.utils.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

src/main/java/com/ost/micro/modules/sys/controller/SystemController.java

@@ -8,8 +8,8 @@
 
 package com.ost.micro.modules.sys.controller;
 
-import com.sun.management.OperatingSystemMXBean;
 import com.ost.micro.common.utils.Result;
+import com.sun.management.OperatingSystemMXBean;
 import com.ost.micro.modules.sys.dto.SystemDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/ost/micro/modules/sys/dto/SysDeptDTO.java

@@ -18,7 +18,6 @@ import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Null;
 import java.io.Serializable;
 import java.util.Date;
 

src/main/java/com/ost/micro/modules/sys/dto/SysMenuDTO.java

@@ -9,7 +9,6 @@
 package com.ost.micro.modules.sys.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.gson.annotations.Expose;
 import com.ost.micro.common.utils.TreeNode;
 import com.ost.micro.common.validator.group.AddGroup;
 import com.ost.micro.common.validator.group.DefaultGroup;
@@ -20,7 +19,6 @@ import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Null;
 import java.io.Serializable;
 import java.util.Date;
 

src/main/java/com/ost/micro/modules/sys/dto/SysRoleDTO.java

@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Null;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;

src/main/java/com/ost/micro/util/Query.java

@@ -7,8 +7,6 @@
  */
 package com.ost.micro.util;
 
-import org.apache.commons.lang.StringUtils;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
 

src/main/resources/application-prod.yml

 spring:
   datasource:
     druid:
-      url: jdbc:mysql:// 10.113.8.24:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: micr_auth
+      url: jdbc:mysql://10.113.8.24:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+      username: micro_security
       password: dbclean&1st->$
-
-  redis:
-    host: 10.113.8.22
-    port: 6379
-    #password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-  activiti:
-   check-process-definitions: false

src/main/resources/application.yml

@@ -6,8 +6,6 @@ server:
 spring:
   datasource:
     druid:
-      username: root
-      password: 123456
       initial-size: 10
       max-active: 100
       min-idle: 10