fix

pom.xml

@@ -52,10 +52,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-annotations</artifactId>
-            </dependency>
 
             <dependency>
                 <groupId>io.springfox</groupId>
@@ -73,14 +69,8 @@
                 <version>${mybatis.version}</version>
             </dependency>
             <dependency>
-                <groupId>repository.org.apache.tomcat.embed</groupId>
+                <groupId>org.apache.tomcat.embed</groupId>
                 <artifactId>tomcat-embed-core</artifactId>
-                <version>9.0.45</version>
-            </dependency>
-            <dependency>
-                <groupId>repository.com.github.pagehelper</groupId>
-                <artifactId>pagehelper</artifactId>
-                <version>5.2.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

zzbusiness-common/pom.xml

@@ -67,7 +67,23 @@
             <version>1.2.75</version>
             <scope>compile</scope>
         </dependency>
-
+        <!-- pagehelper 分页插件 -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.3.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- servlet包 -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+        </dependency>
 
     </dependencies>
 

zzbusiness-common/src/main/java/org/zhongzheng/common/annotation/DataSource.java

@@ -1,6 +1,8 @@
 package org.zhongzheng.common.annotation;
 
-import com.zhongzheng.common.enums.DataSourceType;
+import org.zhongzheng.common.enums.DataSourceType;
+
+import org.zhongzheng.common.enums.DataSourceType;
 
 import java.lang.annotation.*;
 

zzbusiness-common/src/main/java/org/zhongzheng/common/annotation/Log.java

@@ -1,7 +1,9 @@
 package org.zhongzheng.common.annotation;
 
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.enums.OperatorType;
+
+
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.enums.OperatorType;
 
 import java.lang.annotation.*;
 

zzbusiness-common/src/main/java/org/zhongzheng/common/config/WxSmallConfig.java

@@ -1,9 +1,9 @@
 package org.zhongzheng.common.config;
 
-import com.zhongzheng.common.utils.wxpay.IWXPayDomain;
-import com.zhongzheng.common.utils.wxpay.WXPayConfig;
-import com.zhongzheng.common.utils.wxpay.WXPayConstants;
-import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.io.IOUtils;
+import org.zhongzheng.common.utils.wxpay.IWXPayDomain;
+import org.zhongzheng.common.utils.wxpay.WXPayConfig;
+import org.zhongzheng.common.utils.wxpay.WXPayConstants;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/bo/SysRoleBo.java

@@ -2,8 +2,8 @@ package org.zhongzheng.common.core.bo;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.annotation.Excel.ColumnType;
+import org.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excel.ColumnType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -11,8 +11,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import org.springframework.beans.factory.annotation.Value;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/bo/SysUserEditBo.java

@@ -2,16 +2,13 @@ package org.zhongzheng.common.core.bo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.annotation.Excel.ColumnType;
-import com.zhongzheng.common.annotation.Excel.Type;
+import org.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excel.ColumnType;
+import org.zhongzheng.common.annotation.Excel.Type;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
 
 /**
  * 用户对象 SysUserEditBo

zzbusiness-common/src/main/java/org/zhongzheng/common/core/controller/BaseController.java

@@ -4,19 +4,21 @@ package org.zhongzheng.common.core.controller;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpStatus;
+
+
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.PageDomain;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.core.page.TableSupport;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.common.utils.sql.SqlUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.PageDomain;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.core.page.TableSupport;
+import org.zhongzheng.common.utils.DateUtils;
+import org.zhongzheng.common.utils.sql.SqlUtil;
 
 import java.beans.PropertyEditorSupport;
 import java.util.Date;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/TreeSelect.java

@@ -1,8 +1,8 @@
 package org.zhongzheng.common.core.domain;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.zhongzheng.common.core.domain.entity.SysDept;
-import com.zhongzheng.common.core.domain.entity.SysMenu;
+import org.zhongzheng.common.core.domain.entity.SysDept;
+import org.zhongzheng.common.core.domain.entity.SysMenu;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/entity/SysDictData.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.annotation.Excel.ColumnType;
-import com.zhongzheng.common.constant.UserConstants;
+import org.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excel.ColumnType;
+import org.zhongzheng.common.constant.UserConstants;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/entity/SysDictType.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.annotation.Excel.ColumnType;
+import org.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excel.ColumnType;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/entity/SysRole.java

@@ -2,8 +2,8 @@ package org.zhongzheng.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.annotation.Excel.ColumnType;
+import org.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excel.ColumnType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/entity/SysUser.java

@@ -4,11 +4,11 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.annotation.Excel.ColumnType;
-import com.zhongzheng.common.annotation.Excel.Type;
-import com.zhongzheng.common.annotation.Excels;
-import com.zhongzheng.common.type.EncryptHandler;
+import org.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excel.ColumnType;
+import org.zhongzheng.common.annotation.Excel.Type;
+import org.zhongzheng.common.annotation.Excels;
+import org.zhongzheng.common.type.EncryptHandler;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/entity/TopSysRole.java

@@ -1,7 +1,7 @@
 package org.zhongzheng.common.core.domain.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/entity/TopSysUser.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.annotation.Excel.ColumnType;
-import com.zhongzheng.common.annotation.Excel.Type;
-import com.zhongzheng.common.annotation.Excels;
+import org.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excel.ColumnType;
+import org.zhongzheng.common.annotation.Excel.Type;
+import org.zhongzheng.common.annotation.Excels;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/model/LoginUser.java

@@ -1,143 +1,143 @@
-package org.zhongzheng.common.core.domain.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.zhongzheng.common.core.domain.entity.SysUser;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * 登录用户身份权限
- *
- * @author zhongzheng
- */
-
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class LoginUser implements UserDetails
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户唯一标识
-     */
-    private String token;
-
-    /**
-     * 登录时间
-     */
-    private Long loginTime;
-
-    /**
-     * 过期时间
-     */
-    private Long expireTime;
-
-    /**
-     * 登录IP地址
-     */
-    private String ipaddr;
-
-    /**
-     * 登录地点
-     */
-    private String loginLocation;
-
-    /**
-     * 浏览器类型
-     */
-    private String browser;
-
-    /**
-     * 操作系统
-     */
-    private String os;
-
-    /**
-     * 权限列表
-     */
-    private Set<String> permissions;
-
-    /**
-     * 用户信息
-     */
-    private SysUser user;
-
-
-    public LoginUser(SysUser user, Set<String> permissions)
-    {
-        this.user = user;
-        this.permissions = permissions;
-    }
-
-    @JsonIgnore
-    @Override
-    public String getPassword()
-    {
-        return user.getPassword();
-    }
-
-    @Override
-    public String getUsername()
-    {
-        return user.getUserName();
-    }
-
-    /**
-     * 账户是否未过期,过期无法验证
-     */
-    @JsonIgnore
-    @Override
-    public boolean isAccountNonExpired()
-    {
-        return true;
-    }
-
-    /**
-     * 指定用户是否解锁,锁定的用户无法进行身份验证
-     *
-     * @return
-     */
-    @JsonIgnore
-    @Override
-    public boolean isAccountNonLocked()
-    {
-        return true;
-    }
-
-    /**
-     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-     *
-     * @return
-     */
-    @JsonIgnore
-    @Override
-    public boolean isCredentialsNonExpired()
-    {
-        return true;
-    }
-
-    /**
-     * 是否可用 ,禁用的用户不能身份验证
-     *
-     * @return
-     */
-    @JsonIgnore
-    @Override
-    public boolean isEnabled()
-    {
-        return true;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities()
-    {
-        return null;
-    }
-}
+//package org.zhongzheng.common.core.domain.model;
+//
+//import com.fasterxml.jackson.annotation.JsonIgnore;
+//import org.zhongzheng.common.core.domain.entity.SysUser;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//import lombok.experimental.Accessors;
+//import org.springframework.security.core.GrantedAuthority;
+//import org.springframework.security.core.userdetails.UserDetails;
+//
+//import java.util.Collection;
+//import java.util.Set;
+//
+///**
+// * 登录用户身份权限
+// *
+// * @author zhongzheng
+// */
+//
+//@Data
+//@NoArgsConstructor
+//@Accessors(chain = true)
+//public class LoginUser implements UserDetails
+//{
+//    private static final long serialVersionUID = 1L;
+//
+//    /**
+//     * 用户唯一标识
+//     */
+//    private String token;
+//
+//    /**
+//     * 登录时间
+//     */
+//    private Long loginTime;
+//
+//    /**
+//     * 过期时间
+//     */
+//    private Long expireTime;
+//
+//    /**
+//     * 登录IP地址
+//     */
+//    private String ipaddr;
+//
+//    /**
+//     * 登录地点
+//     */
+//    private String loginLocation;
+//
+//    /**
+//     * 浏览器类型
+//     */
+//    private String browser;
+//
+//    /**
+//     * 操作系统
+//     */
+//    private String os;
+//
+//    /**
+//     * 权限列表
+//     */
+//    private Set<String> permissions;
+//
+//    /**
+//     * 用户信息
+//     */
+//    private SysUser user;
+//
+//
+//    public LoginUser(SysUser user, Set<String> permissions)
+//    {
+//        this.user = user;
+//        this.permissions = permissions;
+//    }
+//
+//    @JsonIgnore
+//    @Override
+//    public String getPassword()
+//    {
+//        return user.getPassword();
+//    }
+//
+//    @Override
+//    public String getUsername()
+//    {
+//        return user.getUserName();
+//    }
+//
+//    /**
+//     * 账户是否未过期,过期无法验证
+//     */
+//    @JsonIgnore
+//    @Override
+//    public boolean isAccountNonExpired()
+//    {
+//        return true;
+//    }
+//
+//    /**
+//     * 指定用户是否解锁,锁定的用户无法进行身份验证
+//     *
+//     * @return
+//     */
+//    @JsonIgnore
+//    @Override
+//    public boolean isAccountNonLocked()
+//    {
+//        return true;
+//    }
+//
+//    /**
+//     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
+//     *
+//     * @return
+//     */
+//    @JsonIgnore
+//    @Override
+//    public boolean isCredentialsNonExpired()
+//    {
+//        return true;
+//    }
+//
+//    /**
+//     * 是否可用 ,禁用的用户不能身份验证
+//     *
+//     * @return
+//     */
+//    @JsonIgnore
+//    @Override
+//    public boolean isEnabled()
+//    {
+//        return true;
+//    }
+//
+//    @Override
+//    public Collection<? extends GrantedAuthority> getAuthorities()
+//    {
+//        return null;
+//    }
+//}

zzbusiness-common/src/main/java/org/zhongzheng/common/core/domain/model/TopLoginUser.java

@@ -1,142 +1,141 @@
-package org.zhongzheng.common.core.domain.model;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.zhongzheng.common.core.domain.entity.TopSysUser;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-
-import java.util.Collection;
-import java.util.Set;
-
-/**
- * 登录用户身份权限
- *
- * @author hjl
- */
-
-@Data
-@NoArgsConstructor
-@Accessors(chain = true)
-public class TopLoginUser implements UserDetails
-{
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 用户唯一标识
-     */
-    private String token;
-
-    /**
-     * 登录时间
-     */
-    private Long loginTime;
-
-    /**
-     * 过期时间
-     */
-    private Long expireTime;
-
-    /**
-     * 登录IP地址
-     */
-    private String ipaddr;
-
-    /**
-     * 登录地点
-     */
-    private String loginLocation;
-
-    /**
-     * 浏览器类型
-     */
-    private String browser;
-
-    /**
-     * 操作系统
-     */
-    private String os;
-
-    /**
-     * 权限列表
-     */
-    private Set<String> permissions;
-
-    /**
-     * 用户信息
-     */
-    private TopSysUser user;
-
-    public TopLoginUser(TopSysUser user, Set<String> permissions)
-    {
-        this.user = user;
-        this.permissions = permissions;
-    }
-
-    @JsonIgnore
-    @Override
-    public String getPassword()
-    {
-        return user.getPassword();
-    }
-
-    @Override
-    public String getUsername()
-    {
-        return user.getUserName();
-    }
-
-    /**
-     * 账户是否未过期,过期无法验证
-     */
-    @JsonIgnore
-    @Override
-    public boolean isAccountNonExpired()
-    {
-        return true;
-    }
-
-    /**
-     * 指定用户是否解锁,锁定的用户无法进行身份验证
-     *
-     * @return
-     */
-    @JsonIgnore
-    @Override
-    public boolean isAccountNonLocked()
-    {
-        return true;
-    }
-
-    /**
-     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
-     *
-     * @return
-     */
-    @JsonIgnore
-    @Override
-    public boolean isCredentialsNonExpired()
-    {
-        return true;
-    }
-
-    /**
-     * 是否可用 ,禁用的用户不能身份验证
-     *
-     * @return
-     */
-    @JsonIgnore
-    @Override
-    public boolean isEnabled()
-    {
-        return true;
-    }
-
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities()
-    {
-        return null;
-    }
-}
+//package org.zhongzheng.common.core.domain.model;
+//
+//import com.fasterxml.jackson.annotation.JsonIgnore;
+//import org.zhongzheng.common.core.domain.entity.TopSysUser;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//import lombok.experimental.Accessors;
+//
+//
+//import java.util.Collection;
+//import java.util.Set;
+//
+///**
+// * 登录用户身份权限
+// *
+// * @author hjl
+// */
+//
+//@Data
+//@NoArgsConstructor
+//@Accessors(chain = true)
+//public class TopLoginUser implements UserDetails
+//{
+//    private static final long serialVersionUID = 1L;
+//
+//    /**
+//     * 用户唯一标识
+//     */
+//    private String token;
+//
+//    /**
+//     * 登录时间
+//     */
+//    private Long loginTime;
+//
+//    /**
+//     * 过期时间
+//     */
+//    private Long expireTime;
+//
+//    /**
+//     * 登录IP地址
+//     */
+//    private String ipaddr;
+//
+//    /**
+//     * 登录地点
+//     */
+//    private String loginLocation;
+//
+//    /**
+//     * 浏览器类型
+//     */
+//    private String browser;
+//
+//    /**
+//     * 操作系统
+//     */
+//    private String os;
+//
+//    /**
+//     * 权限列表
+//     */
+//    private Set<String> permissions;
+//
+//    /**
+//     * 用户信息
+//     */
+//    private TopSysUser user;
+//
+//    public TopLoginUser(TopSysUser user, Set<String> permissions)
+//    {
+//        this.user = user;
+//        this.permissions = permissions;
+//    }
+//
+//    @JsonIgnore
+//    @Override
+//    public String getPassword()
+//    {
+//        return user.getPassword();
+//    }
+//
+//    @Override
+//    public String getUsername()
+//    {
+//        return user.getUserName();
+//    }
+//
+//    /**
+//     * 账户是否未过期,过期无法验证
+//     */
+//    @JsonIgnore
+//    @Override
+//    public boolean isAccountNonExpired()
+//    {
+//        return true;
+//    }
+//
+//    /**
+//     * 指定用户是否解锁,锁定的用户无法进行身份验证
+//     *
+//     * @return
+//     */
+//    @JsonIgnore
+//    @Override
+//    public boolean isAccountNonLocked()
+//    {
+//        return true;
+//    }
+//
+//    /**
+//     * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
+//     *
+//     * @return
+//     */
+//    @JsonIgnore
+//    @Override
+//    public boolean isCredentialsNonExpired()
+//    {
+//        return true;
+//    }
+//
+//    /**
+//     * 是否可用 ,禁用的用户不能身份验证
+//     *
+//     * @return
+//     */
+//    @JsonIgnore
+//    @Override
+//    public boolean isEnabled()
+//    {
+//        return true;
+//    }
+//
+//    @Override
+//    public Collection<? extends GrantedAuthority> getAuthorities()
+//    {
+//        return null;
+//    }
+//}

zzbusiness-common/src/main/java/org/zhongzheng/common/core/page/TableSupport.java

@@ -1,6 +1,6 @@
 package org.zhongzheng.common.core.page;
 
-import com.zhongzheng.common.utils.ServletUtils;
+import org.zhongzheng.common.utils.ServletUtils;
 
 /**
  * 表格数据处理

zzbusiness-common/src/main/java/org/zhongzheng/common/core/redis/RedisCache.java

@@ -1,344 +1,344 @@
-package org.zhongzheng.common.core.redis;
-
-import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.utils.ServletUtils;
-import com.zhongzheng.common.utils.ToolsUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.data.redis.core.BoundSetOperations;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.data.redis.core.script.DefaultRedisScript;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * spring redis 工具类
- *
- * @author zhongzheng
- **/
-@SuppressWarnings(value = { "unchecked", "rawtypes" })
-@Component
-public class RedisCache
-{
-    @Autowired
-    public RedisTemplate redisTemplate;
-
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    /**
-     * 缓存基本的对象，Integer、String、实体类等
-     *
-     * @param key 缓存的键值
-     * @param value 缓存的值
-     */
-    public <T> void setCacheObject(final String key, final T value)
-    {
-        String unionKey = key;
-        if(Validator.isNotEmpty(ServletUtils.getRequest())){
-            String tenantId = ServletUtils.getRequest().getHeader("TenantId");
-            if(Validator.isNotEmpty(tenantId)){
-                unionKey = tenantId + key;
-            }
-        }
-        redisTemplate.opsForValue().set(unionKey, value);
-    }
-
-    /**
-     * 缓存基本的对象，Integer、String、实体类等
-     *
-     * @param key 缓存的键值
-     * @param value 缓存的值
-     * @param timeout 时间
-     * @param timeUnit 时间颗粒度
-     */
-    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
-    {
-        String unionKey = key;
-        if(Validator.isNotEmpty(ServletUtils.getRequest())){
-            String tenantId = ToolsUtils.getTenantId();
-            if(Validator.isNotEmpty(tenantId)){
-                unionKey = tenantId + key;
-            }
-        }
-        redisTemplate.opsForValue().set(unionKey, value, timeout, timeUnit);
-
-    }
-
-    public <T> void setCacheObjectTenant(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
-    {
-        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
-
-    }
-
-    /**
-     * 设置有效时间
-     *
-     * @param key Redis键
-     * @param timeout 超时时间
-     * @return true=设置成功；false=设置失败
-     */
-    public boolean expire(final String key, final long timeout)
-    {
-        return expire(key, timeout, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 设置有效时间
-     *
-     * @param key Redis键
-     * @param timeout 超时时间
-     * @param unit 时间单位
-     * @return true=设置成功；false=设置失败
-     */
-    public boolean expire(final String key, final long timeout, final TimeUnit unit)
-    {
-        return redisTemplate.expire(key, timeout, unit);
-    }
-
-    /**
-     * 获得缓存的基本对象。
-     *
-     * @param key 缓存键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> T getCacheObject(final String key)
-    {
-        ValueOperations<String, T> operation = redisTemplate.opsForValue();
-        String unionKey = key;
-        if(Validator.isNotEmpty(ServletUtils.getRequest())){
-            String tenantId = ToolsUtils.getTenantId();
-            if(Validator.isNotEmpty(tenantId)){
-                unionKey = tenantId + key;
-            }
-        }
-        return operation.get(unionKey);
-    }
-
-    /**
-     * 获得缓存的基本对象。
-     *
-     * @param key 缓存键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> T getCacheObjectNoTenant(final String key)
-    {
-        ValueOperations<String, T> operation = redisTemplate.opsForValue();
-        return operation.get(key);
-    }
-
-
-    /**
-     * 删除单个对象
-     *
-     * @param key
-     */
-    public boolean deleteObject(final String key)
-    {
-        String unionKey = key;
-        if(Validator.isNotEmpty(ServletUtils.getRequest())){
-            String tenantId = ServletUtils.getRequest().getHeader("TenantId");
-            if(Validator.isNotEmpty(tenantId)){
-                unionKey = tenantId + key;
-            }
-        }
-        return redisTemplate.delete(unionKey);
-    }
-
-    /**
-     * 删除集合对象
-     *
-     * @param collection 多个对象
-     * @return
-     */
-    public long deleteObject(final Collection collection)
-    {
-        return redisTemplate.delete(collection);
-    }
-
-    /**
-     * 缓存List数据
-     *
-     * @param key 缓存的键值
-     * @param dataList 待缓存的List数据
-     * @return 缓存的对象
-     */
-    public <T> long setCacheList(final String key, final List<T> dataList)
-    {
-        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
-        return count == null ? 0 : count;
-    }
-
-    /**
-     * 获得缓存的list对象
-     *
-     * @param key 缓存的键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> List<T> getCacheList(final String key)
-    {
-        return redisTemplate.opsForList().range(key, 0, -1);
-    }
-
-    /**
-     * 缓存Set
-     *
-     * @param key 缓存键值
-     * @param dataSet 缓存的数据
-     * @return 缓存数据的对象
-     */
-    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
-    {
-        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
-        Iterator<T> it = dataSet.iterator();
-        while (it.hasNext())
-        {
-            setOperation.add(it.next());
-        }
-        return setOperation;
-    }
-
-    /**
-     * 获得缓存的set
-     *
-     * @param key
-     * @return
-     */
-    public <T> Set<T> getCacheSet(final String key)
-    {
-        return redisTemplate.opsForSet().members(key);
-    }
-
-    /**
-     * 缓存Map
-     *
-     * @param key
-     * @param dataMap
-     */
-    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
-    {
-        if (dataMap != null) {
-            redisTemplate.opsForHash().putAll(key, dataMap);
-        }
-    }
-
-    /**
-     * 获得缓存的Map
-     *
-     * @param key
-     * @return
-     */
-    public <T> Map<String, T> getCacheMap(final String key)
-    {
-        return redisTemplate.opsForHash().entries(key);
-    }
-
-    /**
-     * 往Hash中存入数据
-     *
-     * @param key Redis键
-     * @param hKey Hash键
-     * @param value 值
-     */
-    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
-    {
-        redisTemplate.opsForHash().put(key, hKey, value);
-    }
-
-    /**
-     * 获取Hash中的数据
-     *
-     * @param key Redis键
-     * @param hKey Hash键
-     * @return Hash中的对象
-     */
-    public <T> T getCacheMapValue(final String key, final String hKey)
-    {
-        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
-        return opsForHash.get(key, hKey);
-    }
-
-    /**
-     * 获取多个Hash中的数据
-     *
-     * @param key Redis键
-     * @param hKeys Hash键集合
-     * @return Hash对象集合
-     */
-    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
-    {
-        return redisTemplate.opsForHash().multiGet(key, hKeys);
-    }
-
-    /**
-     * 获得缓存的基本对象列表
-     *
-     * @param pattern 字符串前缀
-     * @return 对象列表
-     */
-    public Collection<String> keys(final String pattern)
-    {
-        return redisTemplate.keys(pattern);
-    }
-
-    /**
-     * 加锁，自旋重试三次
-     *
-     * @param redisLockEntity 锁实体
-     * @return
-     */
-    public boolean lock(RedisLockEntity redisLockEntity) {
-        boolean locked = false;
-        int tryCount = 10;
-        while (!locked && tryCount > 0) {
-            locked = redisTemplate.opsForValue().setIfAbsent(redisLockEntity.getLockKey(), redisLockEntity.getRequestId(), 5, TimeUnit.SECONDS);
-            tryCount--;
-            try {
-                Thread.sleep(400);
-            } catch (InterruptedException e) {
-                logger.error("线程被中断" + Thread.currentThread().getId());
-            }
-        }
-        return locked;
-    }
-
-    /**
-     * 非原子解锁，可能解别人锁，不安全
-     *
-     * @param redisLockEntity
-     * @return
-     */
-    public boolean unlock(RedisLockEntity redisLockEntity) {
-        if (redisLockEntity == null || redisLockEntity.getLockKey() == null || redisLockEntity.getRequestId() == null)
-            return false;
-        boolean releaseLock = false;
-        String requestId = (String) redisTemplate.opsForValue().get(redisLockEntity.getLockKey());
-        if (redisLockEntity.getRequestId().equals(requestId)) {
-            releaseLock = redisTemplate.delete(redisLockEntity.getLockKey());
-        }
-        return releaseLock;
-    }
-
-    /**
-     * 使用lua脚本解锁，不会解除别人锁
-     *
-     * @param redisLockEntity
-     * @return
-     */
-    public boolean unlockLua(RedisLockEntity redisLockEntity) {
-        if (redisLockEntity == null || redisLockEntity.getLockKey() == null || redisLockEntity.getRequestId() == null)
-            return false;
-        DefaultRedisScript<Long> redisScript = new DefaultRedisScript();
-        //用于解锁的lua脚本位置
-        redisScript.setLocation(new ClassPathResource("unlock.lua"));
-        redisScript.setResultType(Long.class);
-        //没有指定序列化方式，默认使用上面配置的
-        Object result = redisTemplate.execute(redisScript, Arrays.asList(redisLockEntity.getLockKey()), redisLockEntity.getRequestId());
-        return result.equals(Long.valueOf(1));
-    }
-}
+//package org.zhongzheng.common.core.redis;
+//
+//import cn.hutool.core.lang.Validator;
+//import org.zhongzheng.common.utils.ServletUtils;
+//import org.zhongzheng.common.utils.ToolsUtils;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.core.io.ClassPathResource;
+//import org.springframework.data.redis.core.BoundSetOperations;
+//import org.springframework.data.redis.core.HashOperations;
+//import org.springframework.data.redis.core.RedisTemplate;
+//import org.springframework.data.redis.core.ValueOperations;
+//import org.springframework.data.redis.core.script.DefaultRedisScript;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.*;
+//import java.util.concurrent.TimeUnit;
+//
+///**
+// * spring redis 工具类
+// *
+// * @author zhongzheng
+// **/
+//@SuppressWarnings(value = { "unchecked", "rawtypes" })
+//@Component
+//public class RedisCache
+//{
+//    @Autowired
+//    public RedisTemplate redisTemplate;
+//
+//    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
+//
+//    /**
+//     * 缓存基本的对象，Integer、String、实体类等
+//     *
+//     * @param key 缓存的键值
+//     * @param value 缓存的值
+//     */
+//    public <T> void setCacheObject(final String key, final T value)
+//    {
+//        String unionKey = key;
+//        if(Validator.isNotEmpty(ServletUtils.getRequest())){
+//            String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+//            if(Validator.isNotEmpty(tenantId)){
+//                unionKey = tenantId + key;
+//            }
+//        }
+//        redisTemplate.opsForValue().set(unionKey, value);
+//    }
+//
+//    /**
+//     * 缓存基本的对象，Integer、String、实体类等
+//     *
+//     * @param key 缓存的键值
+//     * @param value 缓存的值
+//     * @param timeout 时间
+//     * @param timeUnit 时间颗粒度
+//     */
+//    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
+//    {
+//        String unionKey = key;
+//        if(Validator.isNotEmpty(ServletUtils.getRequest())){
+//            String tenantId = ToolsUtils.getTenantId();
+//            if(Validator.isNotEmpty(tenantId)){
+//                unionKey = tenantId + key;
+//            }
+//        }
+//        redisTemplate.opsForValue().set(unionKey, value, timeout, timeUnit);
+//
+//    }
+//
+//    public <T> void setCacheObjectTenant(final String key, final T value, final Integer timeout, final TimeUnit timeUnit)
+//    {
+//        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+//
+//    }
+//
+//    /**
+//     * 设置有效时间
+//     *
+//     * @param key Redis键
+//     * @param timeout 超时时间
+//     * @return true=设置成功；false=设置失败
+//     */
+//    public boolean expire(final String key, final long timeout)
+//    {
+//        return expire(key, timeout, TimeUnit.SECONDS);
+//    }
+//
+//    /**
+//     * 设置有效时间
+//     *
+//     * @param key Redis键
+//     * @param timeout 超时时间
+//     * @param unit 时间单位
+//     * @return true=设置成功；false=设置失败
+//     */
+//    public boolean expire(final String key, final long timeout, final TimeUnit unit)
+//    {
+//        return redisTemplate.expire(key, timeout, unit);
+//    }
+//
+//    /**
+//     * 获得缓存的基本对象。
+//     *
+//     * @param key 缓存键值
+//     * @return 缓存键值对应的数据
+//     */
+//    public <T> T getCacheObject(final String key)
+//    {
+//        ValueOperations<String, T> operation = redisTemplate.opsForValue();
+//        String unionKey = key;
+//        if(Validator.isNotEmpty(ServletUtils.getRequest())){
+//            String tenantId = ToolsUtils.getTenantId();
+//            if(Validator.isNotEmpty(tenantId)){
+//                unionKey = tenantId + key;
+//            }
+//        }
+//        return operation.get(unionKey);
+//    }
+//
+//    /**
+//     * 获得缓存的基本对象。
+//     *
+//     * @param key 缓存键值
+//     * @return 缓存键值对应的数据
+//     */
+//    public <T> T getCacheObjectNoTenant(final String key)
+//    {
+//        ValueOperations<String, T> operation = redisTemplate.opsForValue();
+//        return operation.get(key);
+//    }
+//
+//
+//    /**
+//     * 删除单个对象
+//     *
+//     * @param key
+//     */
+//    public boolean deleteObject(final String key)
+//    {
+//        String unionKey = key;
+//        if(Validator.isNotEmpty(ServletUtils.getRequest())){
+//            String tenantId = ServletUtils.getRequest().getHeader("TenantId");
+//            if(Validator.isNotEmpty(tenantId)){
+//                unionKey = tenantId + key;
+//            }
+//        }
+//        return redisTemplate.delete(unionKey);
+//    }
+//
+//    /**
+//     * 删除集合对象
+//     *
+//     * @param collection 多个对象
+//     * @return
+//     */
+//    public long deleteObject(final Collection collection)
+//    {
+//        return redisTemplate.delete(collection);
+//    }
+//
+//    /**
+//     * 缓存List数据
+//     *
+//     * @param key 缓存的键值
+//     * @param dataList 待缓存的List数据
+//     * @return 缓存的对象
+//     */
+//    public <T> long setCacheList(final String key, final List<T> dataList)
+//    {
+//        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
+//        return count == null ? 0 : count;
+//    }
+//
+//    /**
+//     * 获得缓存的list对象
+//     *
+//     * @param key 缓存的键值
+//     * @return 缓存键值对应的数据
+//     */
+//    public <T> List<T> getCacheList(final String key)
+//    {
+//        return redisTemplate.opsForList().range(key, 0, -1);
+//    }
+//
+//    /**
+//     * 缓存Set
+//     *
+//     * @param key 缓存键值
+//     * @param dataSet 缓存的数据
+//     * @return 缓存数据的对象
+//     */
+//    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
+//    {
+//        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
+//        Iterator<T> it = dataSet.iterator();
+//        while (it.hasNext())
+//        {
+//            setOperation.add(it.next());
+//        }
+//        return setOperation;
+//    }
+//
+//    /**
+//     * 获得缓存的set
+//     *
+//     * @param key
+//     * @return
+//     */
+//    public <T> Set<T> getCacheSet(final String key)
+//    {
+//        return redisTemplate.opsForSet().members(key);
+//    }
+//
+//    /**
+//     * 缓存Map
+//     *
+//     * @param key
+//     * @param dataMap
+//     */
+//    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
+//    {
+//        if (dataMap != null) {
+//            redisTemplate.opsForHash().putAll(key, dataMap);
+//        }
+//    }
+//
+//    /**
+//     * 获得缓存的Map
+//     *
+//     * @param key
+//     * @return
+//     */
+//    public <T> Map<String, T> getCacheMap(final String key)
+//    {
+//        return redisTemplate.opsForHash().entries(key);
+//    }
+//
+//    /**
+//     * 往Hash中存入数据
+//     *
+//     * @param key Redis键
+//     * @param hKey Hash键
+//     * @param value 值
+//     */
+//    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
+//    {
+//        redisTemplate.opsForHash().put(key, hKey, value);
+//    }
+//
+//    /**
+//     * 获取Hash中的数据
+//     *
+//     * @param key Redis键
+//     * @param hKey Hash键
+//     * @return Hash中的对象
+//     */
+//    public <T> T getCacheMapValue(final String key, final String hKey)
+//    {
+//        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
+//        return opsForHash.get(key, hKey);
+//    }
+//
+//    /**
+//     * 获取多个Hash中的数据
+//     *
+//     * @param key Redis键
+//     * @param hKeys Hash键集合
+//     * @return Hash对象集合
+//     */
+//    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
+//    {
+//        return redisTemplate.opsForHash().multiGet(key, hKeys);
+//    }
+//
+//    /**
+//     * 获得缓存的基本对象列表
+//     *
+//     * @param pattern 字符串前缀
+//     * @return 对象列表
+//     */
+//    public Collection<String> keys(final String pattern)
+//    {
+//        return redisTemplate.keys(pattern);
+//    }
+//
+//    /**
+//     * 加锁，自旋重试三次
+//     *
+//     * @param redisLockEntity 锁实体
+//     * @return
+//     */
+//    public boolean lock(RedisLockEntity redisLockEntity) {
+//        boolean locked = false;
+//        int tryCount = 10;
+//        while (!locked && tryCount > 0) {
+//            locked = redisTemplate.opsForValue().setIfAbsent(redisLockEntity.getLockKey(), redisLockEntity.getRequestId(), 5, TimeUnit.SECONDS);
+//            tryCount--;
+//            try {
+//                Thread.sleep(400);
+//            } catch (InterruptedException e) {
+//                logger.error("线程被中断" + Thread.currentThread().getId());
+//            }
+//        }
+//        return locked;
+//    }
+//
+//    /**
+//     * 非原子解锁，可能解别人锁，不安全
+//     *
+//     * @param redisLockEntity
+//     * @return
+//     */
+//    public boolean unlock(RedisLockEntity redisLockEntity) {
+//        if (redisLockEntity == null || redisLockEntity.getLockKey() == null || redisLockEntity.getRequestId() == null)
+//            return false;
+//        boolean releaseLock = false;
+//        String requestId = (String) redisTemplate.opsForValue().get(redisLockEntity.getLockKey());
+//        if (redisLockEntity.getRequestId().equals(requestId)) {
+//            releaseLock = redisTemplate.delete(redisLockEntity.getLockKey());
+//        }
+//        return releaseLock;
+//    }
+//
+//    /**
+//     * 使用lua脚本解锁，不会解除别人锁
+//     *
+//     * @param redisLockEntity
+//     * @return
+//     */
+//    public boolean unlockLua(RedisLockEntity redisLockEntity) {
+//        if (redisLockEntity == null || redisLockEntity.getLockKey() == null || redisLockEntity.getRequestId() == null)
+//            return false;
+//        DefaultRedisScript<Long> redisScript = new DefaultRedisScript();
+//        //用于解锁的lua脚本位置
+//        redisScript.setLocation(new ClassPathResource("unlock.lua"));
+//        redisScript.setResultType(Long.class);
+//        //没有指定序列化方式，默认使用上面配置的
+//        Object result = redisTemplate.execute(redisScript, Arrays.asList(redisLockEntity.getLockKey()), redisLockEntity.getRequestId());
+//        return result.equals(Long.valueOf(1));
+//    }
+//}

zzbusiness-common/src/main/java/org/zhongzheng/common/exception/BaseException.java

@@ -1,7 +1,7 @@
 package org.zhongzheng.common.exception;
 
 import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.utils.MessageUtils;
+import org.zhongzheng.common.utils.MessageUtils;
 
 /**
  * 基础异常

zzbusiness-common/src/main/java/org/zhongzheng/common/exception/file/FileException.java

@@ -1,6 +1,6 @@
 package org.zhongzheng.common.exception.file;
 
-import com.zhongzheng.common.exception.BaseException;
+import org.zhongzheng.common.exception.BaseException;
 
 /**
  * 文件信息异常类

zzbusiness-common/src/main/java/org/zhongzheng/common/exception/user/UserException.java

@@ -1,6 +1,6 @@
 package org.zhongzheng.common.exception.user;
 
-import com.zhongzheng.common.exception.BaseException;
+import org.zhongzheng.common.exception.BaseException;
 
 /**
  * 用户信息异常类

zzbusiness-common/src/main/java/org/zhongzheng/common/filter/RepeatableFilter.java

@@ -3,9 +3,11 @@ package org.zhongzheng.common.filter;
 import cn.hutool.core.util.StrUtil;
 import org.springframework.http.MediaType;
 
+import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
+
 /**
  * Repeatable 过滤器
  * 

zzbusiness-common/src/main/java/org/zhongzheng/common/filter/RepeatedlyRequestWrapper.java

@@ -1,6 +1,6 @@
 package org.zhongzheng.common.filter;
 
-import com.zhongzheng.common.utils.http.HttpHelper;
+import org.zhongzheng.common.utils.http.HttpHelper;
 
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
@@ -14,7 +14,7 @@ import java.io.InputStreamReader;
 
 /**
  * 构建可重复读取inputStream的request
- * 
+ *
  * @author zhongzheng
  */
 public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/DictUtils.java

@@ -3,10 +3,10 @@ package org.zhongzheng.common.utils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.core.domain.entity.SysDictData;
-import com.zhongzheng.common.core.redis.RedisCache;
-import com.zhongzheng.common.utils.spring.SpringUtils;
+import org.zhongzheng.common.constant.Constants;
+import org.zhongzheng.common.core.domain.entity.SysDictData;
+import org.zhongzheng.common.core.redis.RedisCache;
+import org.zhongzheng.common.utils.spring.SpringUtils;
 
 import java.util.Collection;
 import java.util.List;

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/MessageUtils.java

@@ -1,6 +1,6 @@
 package org.zhongzheng.common.utils;
 
-import com.zhongzheng.common.utils.spring.SpringUtils;
+import org.zhongzheng.common.utils.spring.SpringUtils;
 import org.springframework.context.MessageSource;
 import org.springframework.context.i18n.LocaleContextHolder;
 

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/SecurityUtils.java

@@ -1,9 +1,9 @@
 package org.zhongzheng.common.utils;
 
 import cn.hutool.http.HttpStatus;
-import com.zhongzheng.common.core.domain.model.LoginUser;
-import com.zhongzheng.common.core.domain.model.TopLoginUser;
-import com.zhongzheng.common.exception.CustomException;
+import org.zhongzheng.common.core.domain.model.LoginUser;
+import org.zhongzheng.common.core.domain.model.TopLoginUser;
+import org.zhongzheng.common.exception.CustomException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/ToolsUtils.java

@@ -4,7 +4,7 @@ package org.zhongzheng.common.utils;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.google.zxing.common.BitMatrix;
-import com.zhongzheng.common.exception.CustomException;
+import org.zhongzheng.common.exception.CustomException;
 import io.micrometer.core.lang.NonNull;
 
 import javax.crypto.Cipher;

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/file/FileUploadUtils.java

@@ -3,12 +3,12 @@ package org.zhongzheng.common.utils.file;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.config.RuoYiConfig;
-import com.zhongzheng.common.constant.Constants;
-import com.zhongzheng.common.exception.file.FileNameLengthLimitExceededException;
-import com.zhongzheng.common.exception.file.FileSizeLimitExceededException;
-import com.zhongzheng.common.exception.file.InvalidExtensionException;
-import com.zhongzheng.common.utils.DateUtils;
+import org.zhongzheng.common.config.RuoYiConfig;
+import org.zhongzheng.common.constant.Constants;
+import org.zhongzheng.common.exception.file.FileNameLengthLimitExceededException;
+import org.zhongzheng.common.exception.file.FileSizeLimitExceededException;
+import org.zhongzheng.common.exception.file.InvalidExtensionException;
+import org.zhongzheng.common.utils.DateUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.springframework.web.multipart.MultipartFile;
 

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/file/FileUtils.java

@@ -2,8 +2,8 @@ package org.zhongzheng.common.utils.file;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.config.RuoYiConfig;
-import com.zhongzheng.common.exception.CustomException;
+import org.zhongzheng.common.config.RuoYiConfig;
+import org.zhongzheng.common.exception.CustomException;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.io.IOUtils;

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/file/ImageUtils.java

@@ -1,8 +1,8 @@
 package org.zhongzheng.common.utils.file;
 
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.config.RuoYiConfig;
-import com.zhongzheng.common.constant.Constants;
+import org.zhongzheng.common.config.RuoYiConfig;
+import org.zhongzheng.common.constant.Constants;
 import org.apache.poi.util.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/poi/ExcelUtil.java

@@ -1,30 +1,21 @@
 package org.zhongzheng.common.utils.poi;
 
-import cn.afterturn.easypoi.excel.ExcelExportUtil;
-import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
-import com.zhongzheng.common.annotation.Excel;
-import com.zhongzheng.common.annotation.Excel.ColumnType;
-import com.zhongzheng.common.annotation.Excel.Type;
-import com.zhongzheng.common.annotation.Excels;
-import com.zhongzheng.common.config.RuoYiConfig;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.exception.CustomException;
-import com.zhongzheng.common.utils.DateUtils;
-import com.zhongzheng.common.utils.DictUtils;
-import com.zhongzheng.common.utils.file.FileTypeUtils;
-import com.zhongzheng.common.utils.file.ImageUtils;
-import com.zhongzheng.common.utils.reflect.ReflectUtils;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.zhongzheng.common.annotation.Excel;
+import org.zhongzheng.common.annotation.Excels;
+import org.zhongzheng.common.config.RuoYiConfig;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.exception.CustomException;
+import org.zhongzheng.common.utils.DateUtils;
+import org.zhongzheng.common.utils.DictUtils;
+import org.zhongzheng.common.utils.file.FileTypeUtils;
+import org.zhongzheng.common.utils.file.ImageUtils;
+import org.zhongzheng.common.utils.reflect.ReflectUtils;
 
 import java.io.*;
 import java.lang.reflect.Field;

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/reflect/ReflectUtils.java

@@ -1,7 +1,7 @@
 package org.zhongzheng.common.utils.reflect;
 
 import cn.hutool.core.convert.Convert;
-import com.zhongzheng.common.utils.DateUtils;
+import org.zhongzheng.common.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/sql/SqlUtil.java

@@ -1,7 +1,7 @@
 package org.zhongzheng.common.utils.sql;
 
 import cn.hutool.core.lang.Validator;
-import com.zhongzheng.common.exception.BaseException;
+import org.zhongzheng.common.exception.BaseException;
 
 /**
  * sql操作工具类

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/wxpay/WXPay.java

@@ -1,6 +1,6 @@
 package org.zhongzheng.common.utils.wxpay;
 
-import com.zhongzheng.common.utils.wxpay.WXPayConstants.SignType;
+import org.zhongzheng.common.utils.wxpay.WXPayConstants.SignType;
 
 import java.util.HashMap;
 import java.util.Map;

zzbusiness-common/src/main/java/org/zhongzheng/common/utils/wxpay/WXPayUtil.java

@@ -1,5 +1,5 @@
 package org.zhongzheng.common.utils.wxpay;
-import com.zhongzheng.common.utils.wxpay.WXPayConstants.SignType;
+import org.zhongzheng.common.utils.wxpay.WXPayConstants.SignType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Node;

zzbusiness-info/pom.xml

@@ -62,7 +62,7 @@
                         <!--生成的jar中，不要包含pom.xml和pom.properties这两个文件-->
                         <addMavenDescriptor>true</addMavenDescriptor>
                         <manifest>
-                            <mainClass>org.zhongzheng.user.UserApplication</mainClass>
+                            <mainClass>org.zhongzheng.InfoApplication</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

zzbusiness-info/src/main/java/org/zhongzheng/controller/company/CompanyCertificateController.java

@@ -1,23 +1,24 @@
 package org.zhongzheng.controller.company;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.company.bo.CompanyCertificateAddBo;
-import com.zhongzheng.modules.company.bo.CompanyCertificateEditBo;
-import com.zhongzheng.modules.company.bo.CompanyCertificateQueryBo;
-import com.zhongzheng.modules.company.bo.ExcelCompanyCertificateBo;
-import com.zhongzheng.modules.company.service.ICompanyCertificateService;
-import com.zhongzheng.modules.company.vo.CompanyCertificateVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.zhongzheng.common.annotation.Log;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyCertificateAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyCertificateEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyCertificateQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.ExcelCompanyCertificateBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.service.ICompanyCertificateService;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.vo.CompanyCertificateVo;
 
 import java.util.List;
 
@@ -39,7 +40,6 @@ public class CompanyCertificateController extends BaseController {
      * 查询企业证书列表
      */
     @ApiOperation("查询企业证书列表")
-    @PreAuthorize("@ss.hasPermi('system:certificate:list')")
     @GetMapping("/certificateList")
     public TableDataInfo<CompanyCertificateVo> list(CompanyCertificateQueryBo bo) {
         startPage();
@@ -51,7 +51,6 @@ public class CompanyCertificateController extends BaseController {
      * 导出企业证书列表
      */
     @ApiOperation("导出企业证书列表")
-    @PreAuthorize("@ss.hasPermi('system:certificate:export')")
     @Log(title = "企业证书", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<CompanyCertificateVo> export(CompanyCertificateQueryBo bo) {
@@ -64,7 +63,6 @@ public class CompanyCertificateController extends BaseController {
      * 获取企业证书详细信息
      */
     @ApiOperation("获取企业证书详细信息")
-    @PreAuthorize("@ss.hasPermi('system:certificate:query')")
     @GetMapping("/{certificateId}")
     public AjaxResult<CompanyCertificateVo> getInfo(@PathVariable("certificateId" ) Long certificateId) {
         return AjaxResult.success(iCompanyCertificateService.queryById(certificateId));
@@ -74,7 +72,6 @@ public class CompanyCertificateController extends BaseController {
      * 新增企业证书
      */
     @ApiOperation("新增企业证书")
-    @PreAuthorize("@ss.hasPermi('system:certificate:add')")
     @Log(title = "企业证书", businessType = BusinessType.INSERT)
     @PostMapping("/addCertificate")
     public AjaxResult<Void> add(@RequestBody CompanyCertificateAddBo bo) {
@@ -85,7 +82,6 @@ public class CompanyCertificateController extends BaseController {
      * 修改企业证书
      */
     @ApiOperation("修改企业证书")
-    @PreAuthorize("@ss.hasPermi('system:certificate:edit')")
     @Log(title = "企业证书", businessType = BusinessType.UPDATE)
     @PostMapping("/updateCertificate")
     public AjaxResult<Void> edit(@RequestBody CompanyCertificateEditBo bo) {
@@ -96,7 +92,6 @@ public class CompanyCertificateController extends BaseController {
      * 删除企业证书
      */
     @ApiOperation("删除企业证书")
-    @PreAuthorize("@ss.hasPermi('system:certificate:remove')")
     @Log(title = "企业证书" , businessType = BusinessType.DELETE)
     @PostMapping("/deleteCertificate")
     public AjaxResult<Void> remove(@RequestBody CompanyCertificateEditBo bo) {

zzbusiness-info/src/main/java/org/zhongzheng/controller/company/CompanyController.java

@@ -1,22 +1,22 @@
 package org.zhongzheng.controller.company;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.company.bo.CompanyAddBo;
-import com.zhongzheng.modules.company.bo.CompanyEditBo;
-import com.zhongzheng.modules.company.bo.CompanyQueryBo;
-import com.zhongzheng.modules.company.service.ICompanyService;
-import com.zhongzheng.modules.company.vo.CompanyVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.zhongzheng.common.annotation.Log;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.service.ICompanyService;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.vo.CompanyVo;
 
 import java.util.List;
 
@@ -38,7 +38,6 @@ public class CompanyController extends BaseController {
      * 查询企业列表
      */
     @ApiOperation("查询企业列表")
-    @PreAuthorize("@ss.hasPermi('system:company:list')")
     @GetMapping("/companyList")
     public TableDataInfo<CompanyVo> list(CompanyQueryBo bo) {
         startPage();
@@ -49,7 +48,6 @@ public class CompanyController extends BaseController {
      * 查询企业列表
      */
     @ApiOperation("查询企业部门列表")
-    @PreAuthorize("@ss.hasPermi('system:company:list')")
     @GetMapping("/departmentList")
     public TableDataInfo<CompanyVo> selectCompanyDept(CompanyQueryBo bo) {
         startPage();
@@ -61,8 +59,6 @@ public class CompanyController extends BaseController {
      * 导出企业列表
      */
     @ApiOperation("导出企业列表")
-    @PreAuthorize("@ss.hasPermi('system:company:export')")
-    @Log(title = "企业", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<CompanyVo> export(CompanyQueryBo bo) {
         List<CompanyVo> list = iCompanyService.queryList(bo);
@@ -74,7 +70,6 @@ public class CompanyController extends BaseController {
      * 获取企业详细信息
      */
     @ApiOperation("获取企业详细信息")
-    @PreAuthorize("@ss.hasPermi('system:company:query')")
     @GetMapping("/{companyId}")
     public AjaxResult<CompanyVo> getInfo(@PathVariable("companyId" ) Long companyId) {
         return AjaxResult.success(iCompanyService.queryById(companyId));
@@ -84,8 +79,6 @@ public class CompanyController extends BaseController {
      * 新增企业
      */
     @ApiOperation("新增企业")
-    @PreAuthorize("@ss.hasPermi('system:company:add')")
-    @Log(title = "企业", businessType = BusinessType.INSERT)
     @PostMapping("/addCompany")
     public AjaxResult<Void> add(@RequestBody CompanyAddBo bo) {
         return toAjax(iCompanyService.insertByAddBo(bo) ? 1 : 0);
@@ -95,8 +88,6 @@ public class CompanyController extends BaseController {
      * 修改企业
      */
     @ApiOperation("修改企业")
-    @PreAuthorize("@ss.hasPermi('system:company:edit')")
-    @Log(title = "企业", businessType = BusinessType.UPDATE)
     @PostMapping("/updateCompany")
     public AjaxResult<Void> edit(@RequestBody CompanyEditBo bo) {
         return toAjax(iCompanyService.updateByEditBo(bo) ? 1 : 0);
@@ -106,8 +97,6 @@ public class CompanyController extends BaseController {
      * 删除企业
      */
     @ApiOperation("删除企业")
-    @PreAuthorize("@ss.hasPermi('system:company:remove')")
-    @Log(title = "企业" , businessType = BusinessType.DELETE)
     @PostMapping("/deleteCompany")
     public AjaxResult<Void> remove(@RequestBody CompanyEditBo bo) {
         return toAjax(iCompanyService.deleteWithValidByIds(bo) ? 1 : 0);

zzbusiness-info/src/main/java/org/zhongzheng/controller/company/CompanyDepartmentController.java

@@ -1,22 +1,22 @@
 package org.zhongzheng.controller.company;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.company.bo.CompanyDepartmentAddBo;
-import com.zhongzheng.modules.company.bo.CompanyDepartmentEditBo;
-import com.zhongzheng.modules.company.bo.CompanyDepartmentQueryBo;
-import com.zhongzheng.modules.company.service.ICompanyDepartmentService;
-import com.zhongzheng.modules.company.vo.CompanyDepartmentVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.zhongzheng.common.annotation.Log;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyDepartmentAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyDepartmentEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyDepartmentQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.service.ICompanyDepartmentService;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.vo.CompanyDepartmentVo;
 
 import java.util.List;
 
@@ -38,7 +38,6 @@ public class CompanyDepartmentController extends BaseController {
      * 查询企业部门列表
      */
     @ApiOperation("查询企业部门列表")
-    @PreAuthorize("@ss.hasPermi('system:department:list')")
     @GetMapping("/departmentList")
     public TableDataInfo<CompanyDepartmentVo> list(CompanyDepartmentQueryBo bo) {
         startPage();
@@ -50,7 +49,6 @@ public class CompanyDepartmentController extends BaseController {
      * 导出企业部门列表
      */
     @ApiOperation("导出企业部门列表")
-    @PreAuthorize("@ss.hasPermi('system:department:export')")
     @Log(title = "企业部门", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<CompanyDepartmentVo> export(CompanyDepartmentQueryBo bo) {
@@ -63,7 +61,6 @@ public class CompanyDepartmentController extends BaseController {
      * 获取企业部门详细信息
      */
     @ApiOperation("获取企业部门详细信息")
-    @PreAuthorize("@ss.hasPermi('system:department:query')")
     @GetMapping("/{departmentId}")
     public AjaxResult<CompanyDepartmentVo> getInfo(@PathVariable("departmentId" ) Long departmentId) {
         return AjaxResult.success(iCompanyDepartmentService.queryById(departmentId));
@@ -73,7 +70,6 @@ public class CompanyDepartmentController extends BaseController {
      * 新增企业部门
      */
     @ApiOperation("新增企业部门")
-    @PreAuthorize("@ss.hasPermi('system:department:add')")
     @Log(title = "企业部门", businessType = BusinessType.INSERT)
     @PostMapping("addDepartment")
     public AjaxResult<Void> add(@RequestBody CompanyDepartmentAddBo bo) {
@@ -84,7 +80,6 @@ public class CompanyDepartmentController extends BaseController {
      * 修改企业部门
      */
     @ApiOperation("修改企业部门")
-    @PreAuthorize("@ss.hasPermi('system:department:edit')")
     @Log(title = "企业部门", businessType = BusinessType.UPDATE)
     @PostMapping("updateDepartment")
     public AjaxResult<Void> edit(@RequestBody CompanyDepartmentEditBo bo) {
@@ -95,7 +90,6 @@ public class CompanyDepartmentController extends BaseController {
      * 删除企业部门
      */
     @ApiOperation("删除企业部门")
-    @PreAuthorize("@ss.hasPermi('system:department:remove')")
     @Log(title = "企业部门" , businessType = BusinessType.DELETE)
     @PostMapping("/deleteDepartment")
     public AjaxResult<Void> remove(@RequestBody CompanyDepartmentEditBo bo) {

zzbusiness-info/src/main/java/org/zhongzheng/controller/company/CompanyUserController.java

@@ -1,21 +1,20 @@
 package org.zhongzheng.controller.company;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.modules.company.bo.CompanyUserAddBo;
-import com.zhongzheng.modules.company.bo.CompanyUserEditBo;
-import com.zhongzheng.modules.company.bo.CompanyUserQueryBo;
-import com.zhongzheng.modules.company.service.ICompanyUserService;
-import com.zhongzheng.modules.company.vo.CompanyUserVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyUserAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyUserEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.bo.CompanyUserQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.service.ICompanyUserService;
+import org.zhongzheng.feignclient.zzbusinessinfo.company.vo.CompanyUserVo;
 
 import java.util.Arrays;
 import java.util.List;
@@ -38,7 +37,6 @@ public class CompanyUserController extends BaseController {
      * 查询企业用户列表
      */
     @ApiOperation("查询企业用户列表")
-    @PreAuthorize("@ss.hasPermi('system:user:list')")
     @GetMapping("/list")
     public TableDataInfo<CompanyUserVo> list(CompanyUserQueryBo bo) {
         startPage();
@@ -52,7 +50,6 @@ public class CompanyUserController extends BaseController {
      * 获取企业用户详细信息
      */
     @ApiOperation("获取企业用户详细信息")
-    @PreAuthorize("@ss.hasPermi('system:user:query')")
     @GetMapping("/{userId}")
     public AjaxResult<CompanyUserVo> getInfo(@PathVariable("userId" ) Long userId) {
         return AjaxResult.success(iCompanyUserService.queryById(userId));
@@ -62,8 +59,6 @@ public class CompanyUserController extends BaseController {
      * 新增企业用户
      */
     @ApiOperation("新增企业用户")
-    @PreAuthorize("@ss.hasPermi('system:user:add')")
-    @Log(title = "企业用户", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody CompanyUserAddBo bo) {
         return toAjax(iCompanyUserService.insertByAddBo(bo) ? 1 : 0);
@@ -73,8 +68,6 @@ public class CompanyUserController extends BaseController {
      * 修改企业用户
      */
     @ApiOperation("修改企业用户")
-    @PreAuthorize("@ss.hasPermi('system:user:edit')")
-    @Log(title = "企业用户", businessType = BusinessType.UPDATE)
     @PutMapping()
     public AjaxResult<Void> edit(@RequestBody CompanyUserEditBo bo) {
         return toAjax(iCompanyUserService.updateByEditBo(bo) ? 1 : 0);
@@ -84,8 +77,6 @@ public class CompanyUserController extends BaseController {
      * 删除企业用户
      */
     @ApiOperation("删除企业用户")
-    @PreAuthorize("@ss.hasPermi('system:user:remove')")
-    @Log(title = "企业用户" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{userIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] userIds) {
         return toAjax(iCompanyUserService.deleteWithValidByIds(Arrays.asList(userIds), true) ? 1 : 0);

zzbusiness-info/src/main/java/org/zhongzheng/controller/staff/StaffBankInfoController.java

@@ -1,22 +1,22 @@
 package org.zhongzheng.controller.staff;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.staff.bo.StaffBankInfoAddBo;
-import com.zhongzheng.modules.staff.bo.StaffBankInfoEditBo;
-import com.zhongzheng.modules.staff.bo.StaffBankInfoQueryBo;
-import com.zhongzheng.modules.staff.service.IStaffBankInfoService;
-import com.zhongzheng.modules.staff.vo.StaffBankInfoVo;
+
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffBankInfoAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffBankInfoEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffBankInfoQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.service.IStaffBankInfoService;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.vo.StaffBankInfoVo;
 
 import java.util.Arrays;
 import java.util.List;
@@ -39,7 +39,6 @@ public class StaffBankInfoController extends BaseController {
      * 查询员工银行信息列表
      */
     @ApiOperation("查询员工银行信息列表")
-    @PreAuthorize("@ss.hasPermi('system:info:list')")
     @GetMapping("/list")
     public TableDataInfo<StaffBankInfoVo> list(StaffBankInfoQueryBo bo) {
         startPage();
@@ -51,8 +50,6 @@ public class StaffBankInfoController extends BaseController {
      * 导出员工银行信息列表
      */
     @ApiOperation("导出员工银行信息列表")
-    @PreAuthorize("@ss.hasPermi('system:info:export')")
-    @Log(title = "员工银行信息", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<StaffBankInfoVo> export(StaffBankInfoQueryBo bo) {
         List<StaffBankInfoVo> list = iStaffBankInfoService.queryList(bo);
@@ -64,7 +61,6 @@ public class StaffBankInfoController extends BaseController {
      * 获取员工银行信息详细信息
      */
     @ApiOperation("获取员工银行信息详细信息")
-    @PreAuthorize("@ss.hasPermi('system:info:query')")
     @GetMapping("/{infoId}")
     public AjaxResult<StaffBankInfoVo> getInfo(@PathVariable("infoId" ) Long infoId) {
         return AjaxResult.success(iStaffBankInfoService.queryById(infoId));
@@ -74,8 +70,6 @@ public class StaffBankInfoController extends BaseController {
      * 新增员工银行信息
      */
     @ApiOperation("新增员工银行信息")
-    @PreAuthorize("@ss.hasPermi('system:info:add')")
-    @Log(title = "员工银行信息", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody StaffBankInfoAddBo bo) {
         return toAjax(iStaffBankInfoService.insertByAddBo(bo) ? 1 : 0);
@@ -85,8 +79,6 @@ public class StaffBankInfoController extends BaseController {
      * 修改员工银行信息
      */
     @ApiOperation("修改员工银行信息")
-    @PreAuthorize("@ss.hasPermi('system:info:edit')")
-    @Log(title = "员工银行信息", businessType = BusinessType.UPDATE)
     @PutMapping()
     public AjaxResult<Void> edit(@RequestBody StaffBankInfoEditBo bo) {
         return toAjax(iStaffBankInfoService.updateByEditBo(bo) ? 1 : 0);
@@ -96,8 +88,6 @@ public class StaffBankInfoController extends BaseController {
      * 删除员工银行信息
      */
     @ApiOperation("删除员工银行信息")
-    @PreAuthorize("@ss.hasPermi('system:info:remove')")
-    @Log(title = "员工银行信息" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] infoIds) {
         return toAjax(iStaffBankInfoService.deleteWithValidByIds(Arrays.asList(infoIds), true) ? 1 : 0);

zzbusiness-info/src/main/java/org/zhongzheng/controller/staff/StaffCertificateController.java

@@ -1,23 +1,22 @@
 package org.zhongzheng.controller.staff;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.staff.bo.StaffCertificateAddBo;
-import com.zhongzheng.modules.staff.bo.StaffCertificateEditBo;
-import com.zhongzheng.modules.staff.bo.StaffCertificateQueryBo;
-import com.zhongzheng.modules.staff.service.IStaffCertificateService;
-import com.zhongzheng.modules.staff.vo.StaffCertificateVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffCertificateAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffCertificateEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffCertificateQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.service.IStaffCertificateService;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.vo.StaffCertificateVo;
 
 import java.util.List;
 
@@ -39,7 +38,6 @@ public class StaffCertificateController extends BaseController {
      * 查询员工证书列表
      */
     @ApiOperation("查询员工证书列表")
-    @PreAuthorize("@ss.hasPermi('system:certificate:list')")
     @GetMapping("/list")
     public TableDataInfo<StaffCertificateVo> list(StaffCertificateQueryBo bo) {
         startPage();
@@ -51,8 +49,6 @@ public class StaffCertificateController extends BaseController {
      * 导出员工证书列表
      */
     @ApiOperation("导出员工证书列表")
-    @PreAuthorize("@ss.hasPermi('system:certificate:export')")
-    @Log(title = "员工证书", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<StaffCertificateVo> export(StaffCertificateQueryBo bo) {
         List<StaffCertificateVo> list = iStaffCertificateService.queryList(bo);
@@ -64,7 +60,6 @@ public class StaffCertificateController extends BaseController {
      * 获取员工证书详细信息
      */
     @ApiOperation("获取员工证书详细信息")
-    @PreAuthorize("@ss.hasPermi('system:certificate:query')")
     @GetMapping("/{certificateId}")
     public AjaxResult<StaffCertificateVo> getInfo(@PathVariable("certificateId" ) Long certificateId) {
         return AjaxResult.success(iStaffCertificateService.queryById(certificateId));
@@ -74,8 +69,6 @@ public class StaffCertificateController extends BaseController {
      * 新增员工证书
      */
     @ApiOperation("新增员工证书")
-    @PreAuthorize("@ss.hasPermi('system:certificate:add')")
-    @Log(title = "员工证书", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public AjaxResult<Void> add(@RequestBody StaffCertificateAddBo bo) {
         return toAjax(iStaffCertificateService.insertByAddBo(bo) ? 1 : 0);
@@ -85,8 +78,6 @@ public class StaffCertificateController extends BaseController {
      * 修改员工证书
      */
     @ApiOperation("修改员工证书")
-    @PreAuthorize("@ss.hasPermi('system:certificate:edit')")
-    @Log(title = "员工证书", businessType = BusinessType.UPDATE)
     @PostMapping("/update")
     public AjaxResult<Void> edit(@RequestBody StaffCertificateEditBo bo) {
         return toAjax(iStaffCertificateService.updateByEditBo(bo) ? 1 : 0);
@@ -96,8 +87,6 @@ public class StaffCertificateController extends BaseController {
      * 删除员工证书
      */
     @ApiOperation("删除员工证书")
-    @PreAuthorize("@ss.hasPermi('system:certificate:remove')")
-    @Log(title = "员工证书" , businessType = BusinessType.DELETE)
     @PostMapping("/delete")
     public AjaxResult<Void> remove(@RequestBody StaffCertificateEditBo bo) {
         return toAjax(iStaffCertificateService.deleteWithValidByIds(bo) ? 1 : 0);
@@ -106,8 +95,6 @@ public class StaffCertificateController extends BaseController {
      * 导入部门员工证书excel
      */
     @ApiOperation("导入员工文档列表")
-    @PreAuthorize("@ss.hasPermi('system:staff:importStaffList')")
-    @Log(title = "部门员工" , businessType = BusinessType.DELETE)
     @PostMapping("/importStaffCertificateList")
     public AjaxResult<Void> importStaffCertificateList( MultipartFile file ) {
         return toAjax(iStaffCertificateService.importStaffCertificateList(file)?1:0);

zzbusiness-info/src/main/java/org/zhongzheng/controller/staff/StaffContractArchivesController.java

@@ -1,22 +1,21 @@
 package org.zhongzheng.controller.staff;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.staff.bo.StaffContractArchivesAddBo;
-import com.zhongzheng.modules.staff.bo.StaffContractArchivesEditBo;
-import com.zhongzheng.modules.staff.bo.StaffContractArchivesQueryBo;
-import com.zhongzheng.modules.staff.service.IStaffContractArchivesService;
-import com.zhongzheng.modules.staff.vo.StaffContractArchivesVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffContractArchivesAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffContractArchivesEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffContractArchivesQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.service.IStaffContractArchivesService;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.vo.StaffContractArchivesVo;
 
 import java.util.Arrays;
 import java.util.List;
@@ -39,7 +38,6 @@ public class StaffContractArchivesController extends BaseController {
      * 查询员工合同档案列表
      */
     @ApiOperation("查询员工合同档案列表")
-    @PreAuthorize("@ss.hasPermi('system:archives:list')")
     @GetMapping("/list")
     public TableDataInfo<StaffContractArchivesVo> list(StaffContractArchivesQueryBo bo) {
         startPage();
@@ -51,8 +49,6 @@ public class StaffContractArchivesController extends BaseController {
      * 导出员工合同档案列表
      */
     @ApiOperation("导出员工合同档案列表")
-    @PreAuthorize("@ss.hasPermi('system:archives:export')")
-    @Log(title = "员工合同档案", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<StaffContractArchivesVo> export(StaffContractArchivesQueryBo bo) {
         List<StaffContractArchivesVo> list = iStaffContractArchivesService.queryList(bo);
@@ -64,7 +60,6 @@ public class StaffContractArchivesController extends BaseController {
      * 获取员工合同档案详细信息
      */
     @ApiOperation("获取员工合同档案详细信息")
-    @PreAuthorize("@ss.hasPermi('system:archives:query')")
     @GetMapping("/{archivesId}")
     public AjaxResult<StaffContractArchivesVo> getInfo(@PathVariable("archivesId" ) Long archivesId) {
         return AjaxResult.success(iStaffContractArchivesService.queryById(archivesId));
@@ -74,8 +69,6 @@ public class StaffContractArchivesController extends BaseController {
      * 新增员工合同档案
      */
     @ApiOperation("新增员工合同档案")
-    @PreAuthorize("@ss.hasPermi('system:archives:add')")
-    @Log(title = "员工合同档案", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody StaffContractArchivesAddBo bo) {
         return toAjax(iStaffContractArchivesService.insertByAddBo(bo) ? 1 : 0);
@@ -85,8 +78,6 @@ public class StaffContractArchivesController extends BaseController {
      * 修改员工合同档案
      */
     @ApiOperation("修改员工合同档案")
-    @PreAuthorize("@ss.hasPermi('system:archives:edit')")
-    @Log(title = "员工合同档案", businessType = BusinessType.UPDATE)
     @PutMapping()
     public AjaxResult<Void> edit(@RequestBody StaffContractArchivesEditBo bo) {
         return toAjax(iStaffContractArchivesService.updateByEditBo(bo) ? 1 : 0);
@@ -96,8 +87,6 @@ public class StaffContractArchivesController extends BaseController {
      * 删除员工合同档案
      */
     @ApiOperation("删除员工合同档案")
-    @PreAuthorize("@ss.hasPermi('system:archives:remove')")
-    @Log(title = "员工合同档案" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{archivesIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] archivesIds) {
         return toAjax(iStaffContractArchivesService.deleteWithValidByIds(Arrays.asList(archivesIds), true) ? 1 : 0);

zzbusiness-info/src/main/java/org/zhongzheng/controller/staff/StaffController.java

@@ -1,23 +1,21 @@
 package org.zhongzheng.controller.staff;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.staff.bo.StaffAddBo;
-import com.zhongzheng.modules.staff.bo.StaffEditBo;
-import com.zhongzheng.modules.staff.bo.StaffQueryBo;
-import com.zhongzheng.modules.staff.service.IStaffService;
-import com.zhongzheng.modules.staff.vo.StaffVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.service.IStaffService;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.vo.StaffVo;
 
 import java.util.List;
 
@@ -39,7 +37,6 @@ public class StaffController extends BaseController {
      * 查询企业部门员工列表
      */
     @ApiOperation("查询企业部门员工列表")
-    @PreAuthorize("@ss.hasPermi('system:staff:list')")
     @GetMapping("/staffList")
     public TableDataInfo<StaffVo> list(StaffQueryBo bo) {
         startPage();
@@ -51,8 +48,6 @@ public class StaffController extends BaseController {
      * 导出企业部门员工列表
      */
     @ApiOperation("导出企业部门员工列表")
-    @PreAuthorize("@ss.hasPermi('system:staff:export')")
-    @Log(title = "企业部门员工", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<StaffVo> export(StaffQueryBo bo) {
         List<StaffVo> list = iStaffService.queryList(bo);
@@ -64,7 +59,6 @@ public class StaffController extends BaseController {
      * 获取企业部门员工详细信息
      */
     @ApiOperation("获取企业部门员工详细信息")
-    @PreAuthorize("@ss.hasPermi('system:staff:query')")
     @GetMapping("/{staffId}")
     public AjaxResult<StaffVo> getInfo(@PathVariable("staffId" ) Long staffId) {
         return AjaxResult.success(iStaffService.queryById(staffId));
@@ -74,8 +68,6 @@ public class StaffController extends BaseController {
      * 新增企业部门员工
      */
     @ApiOperation("新增企业部门员工")
-    @PreAuthorize("@ss.hasPermi('system:staff:add')")
-    @Log(title = "企业部门员工", businessType = BusinessType.INSERT)
     @PostMapping("/insertOrUpdateStaff")
     public AjaxResult<Void> add(@RequestBody StaffAddBo bo) {
         return toAjax(iStaffService.insertByAddBo(bo) ? 1 : 0);
@@ -85,8 +77,6 @@ public class StaffController extends BaseController {
      * 修改企业部门员工
      */
     @ApiOperation("修改企业部门员工")
-    @PreAuthorize("@ss.hasPermi('system:staff:edit')")
-    @Log(title = "企业部门员工", businessType = BusinessType.UPDATE)
     @PostMapping("/updateStaffRemarks")
     public AjaxResult<Void> edit(@RequestBody StaffEditBo bo) {
         return toAjax(iStaffService.updateByEditBo(bo) ? 1 : 0);
@@ -96,8 +86,6 @@ public class StaffController extends BaseController {
      * 删除企业部门员工
      */
     @ApiOperation("删除企业部门员工")
-    @PreAuthorize("@ss.hasPermi('system:staff:remove')")
-    @Log(title = "企业部门员工" , businessType = BusinessType.DELETE)
     @PostMapping("/deleteStaff")
     public AjaxResult<Void> remove(@RequestBody StaffEditBo bo ) {
         return toAjax(iStaffService.deleteWithValidByIds(bo)?1:0);
@@ -106,8 +94,6 @@ public class StaffController extends BaseController {
      * 导入部门员工excel
      */
     @ApiOperation("导入员工文档列表")
-    @PreAuthorize("@ss.hasPermi('system:staff:importStaffList')")
-    @Log(title = "部门员工" , businessType = BusinessType.DELETE)
     @PostMapping("/importStaffList")
     public AjaxResult<Void> importStaffList( MultipartFile  file ) {
         return toAjax(iStaffService.importExcelList(file)?1:0);

zzbusiness-info/src/main/java/org/zhongzheng/controller/staff/StaffEduBgController.java

@@ -1,22 +1,22 @@
 package org.zhongzheng.controller.staff;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.staff.bo.StaffEduBgAddBo;
-import com.zhongzheng.modules.staff.bo.StaffEduBgEditBo;
-import com.zhongzheng.modules.staff.bo.StaffEduBgQueryBo;
-import com.zhongzheng.modules.staff.service.IStaffEduBgService;
-import com.zhongzheng.modules.staff.vo.StaffEduBgVo;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.zhongzheng.common.annotation.Log;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffEduBgAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffEduBgEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffEduBgQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.service.IStaffEduBgService;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.vo.StaffEduBgVo;
 
 import java.util.Arrays;
 import java.util.List;
@@ -39,7 +39,6 @@ public class StaffEduBgController extends BaseController {
      * 查询员工教育背景列表
      */
     @ApiOperation("查询员工教育背景列表")
-    @PreAuthorize("@ss.hasPermi('system:bg:list')")
     @GetMapping("/list")
     public TableDataInfo<StaffEduBgVo> list(StaffEduBgQueryBo bo) {
         startPage();
@@ -51,7 +50,6 @@ public class StaffEduBgController extends BaseController {
      * 导出员工教育背景列表
      */
     @ApiOperation("导出员工教育背景列表")
-    @PreAuthorize("@ss.hasPermi('system:bg:export')")
     @Log(title = "员工教育背景", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<StaffEduBgVo> export(StaffEduBgQueryBo bo) {
@@ -64,7 +62,6 @@ public class StaffEduBgController extends BaseController {
      * 获取员工教育背景详细信息
      */
     @ApiOperation("获取员工教育背景详细信息")
-    @PreAuthorize("@ss.hasPermi('system:bg:query')")
     @GetMapping("/{eduBgId}")
     public AjaxResult<StaffEduBgVo> getInfo(@PathVariable("eduBgId" ) Long eduBgId) {
         return AjaxResult.success(iStaffEduBgService.queryById(eduBgId));
@@ -74,7 +71,6 @@ public class StaffEduBgController extends BaseController {
      * 新增员工教育背景
      */
     @ApiOperation("新增员工教育背景")
-    @PreAuthorize("@ss.hasPermi('system:bg:add')")
     @Log(title = "员工教育背景", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody StaffEduBgAddBo bo) {
@@ -85,7 +81,6 @@ public class StaffEduBgController extends BaseController {
      * 修改员工教育背景
      */
     @ApiOperation("修改员工教育背景")
-    @PreAuthorize("@ss.hasPermi('system:bg:edit')")
     @Log(title = "员工教育背景", businessType = BusinessType.UPDATE)
     @PutMapping()
     public AjaxResult<Void> edit(@RequestBody StaffEduBgEditBo bo) {
@@ -96,7 +91,6 @@ public class StaffEduBgController extends BaseController {
      * 删除员工教育背景
      */
     @ApiOperation("删除员工教育背景")
-    @PreAuthorize("@ss.hasPermi('system:bg:remove')")
     @Log(title = "员工教育背景" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{eduBgIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] eduBgIds) {

zzbusiness-info/src/main/java/org/zhongzheng/controller/staff/StaffEmergencyContactController.java

@@ -1,22 +1,21 @@
 package org.zhongzheng.controller.staff;
 
-import com.zhongzheng.common.annotation.Log;
-import com.zhongzheng.common.core.controller.BaseController;
-import com.zhongzheng.common.core.domain.AjaxResult;
-import com.zhongzheng.common.core.page.TableDataInfo;
-import com.zhongzheng.common.enums.BusinessType;
-import com.zhongzheng.common.utils.poi.ExcelUtil;
-import com.zhongzheng.modules.staff.bo.StaffEmergencyContactAddBo;
-import com.zhongzheng.modules.staff.bo.StaffEmergencyContactEditBo;
-import com.zhongzheng.modules.staff.bo.StaffEmergencyContactQueryBo;
-import com.zhongzheng.modules.staff.service.IStaffEmergencyContactService;
-import com.zhongzheng.modules.staff.vo.StaffEmergencyContactVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import org.zhongzheng.common.annotation.Log;
+import org.zhongzheng.common.core.controller.BaseController;
+import org.zhongzheng.common.core.domain.AjaxResult;
+import org.zhongzheng.common.core.page.TableDataInfo;
+import org.zhongzheng.common.enums.BusinessType;
+import org.zhongzheng.common.utils.poi.ExcelUtil;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffEmergencyContactAddBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffEmergencyContactEditBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffEmergencyContactQueryBo;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.service.IStaffEmergencyContactService;
+import org.zhongzheng.feignclient.zzbusinessinfo.staff.vo.StaffEmergencyContactVo;
 
 import java.util.Arrays;
 import java.util.List;
@@ -39,7 +38,6 @@ public class StaffEmergencyContactController extends BaseController {
      * 查询员工紧急联系人列表
      */
     @ApiOperation("查询员工紧急联系人列表")
-    @PreAuthorize("@ss.hasPermi('system:contact:list')")
     @GetMapping("/list")
     public TableDataInfo<StaffEmergencyContactVo> list(StaffEmergencyContactQueryBo bo) {
         startPage();
@@ -51,7 +49,6 @@ public class StaffEmergencyContactController extends BaseController {
      * 导出员工紧急联系人列表
      */
     @ApiOperation("导出员工紧急联系人列表")
-    @PreAuthorize("@ss.hasPermi('system:contact:export')")
     @Log(title = "员工紧急联系人", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<StaffEmergencyContactVo> export(StaffEmergencyContactQueryBo bo) {
@@ -64,7 +61,6 @@ public class StaffEmergencyContactController extends BaseController {
      * 获取员工紧急联系人详细信息
      */
     @ApiOperation("获取员工紧急联系人详细信息")
-    @PreAuthorize("@ss.hasPermi('system:contact:query')")
     @GetMapping("/{contactId}")
     public AjaxResult<StaffEmergencyContactVo> getInfo(@PathVariable("contactId" ) Long contactId) {
         return AjaxResult.success(iStaffEmergencyContactService.queryById(contactId));
@@ -74,7 +70,6 @@ public class StaffEmergencyContactController extends BaseController {
      * 新增员工紧急联系人
      */
     @ApiOperation("新增员工紧急联系人")
-    @PreAuthorize("@ss.hasPermi('system:contact:add')")
     @Log(title = "员工紧急联系人", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody StaffEmergencyContactAddBo bo) {
@@ -85,7 +80,6 @@ public class StaffEmergencyContactController extends BaseController {
      * 修改员工紧急联系人
      */
     @ApiOperation("修改员工紧急联系人")
-    @PreAuthorize("@ss.hasPermi('system:contact:edit')")
     @Log(title = "员工紧急联系人", businessType = BusinessType.UPDATE)
     @PutMapping()
     public AjaxResult<Void> edit(@RequestBody StaffEmergencyContactEditBo bo) {
@@ -96,7 +90,6 @@ public class StaffEmergencyContactController extends BaseController {
      * 删除员工紧急联系人
      */
     @ApiOperation("删除员工紧急联系人")
-    @PreAuthorize("@ss.hasPermi('system:contact:remove')")
     @Log(title = "员工紧急联系人" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{contactIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] contactIds) {

zzbusiness-info/src/main/java/org/zhongzheng/feignclient/zzbusinessinfo/entity/ClientBsLoginUser.java

@@ -1,6 +1,6 @@
 package org.zhongzheng.feignclient.zzbusinessinfo.entity;
 
-import com.zhongzheng.modules.company.domain.CompanyUser;
+import org.zhongzheng.modules.company.domain.CompanyUser;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;

zzbusiness-info/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 9009
 spring:
   application:
-    name: ZZBUSINESS-USER
+    name: ZZBUSINESS-INfO
   datasource:
     url: jdbc:mysql://192.168.1.222:3306/test_saas?useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root

zzbusiness-info/src/main/resources/company/CompanyCertificateMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.company.mapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.company.mapper.CompanyCertificateMapper">
 
-    <resultMap type="com.zhongzheng.modules.company.domain.CompanyCertificate" id="CompanyCertificateResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.company.domain.CompanyCertificate" id="CompanyCertificateResult">
         <result property="certificateId" column="certificate_id"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="companyId" column="company_id"/>
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="documentType" column="document_type"/>
         <result property="companyCertificateRemarks" column="company_certificate_remarks"/>
     </resultMap>
-    <resultMap type="com.zhongzheng.modules.company.vo.CompanyCertificateVo" id="CompanyCertificateResultVo">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.company.vo.CompanyCertificateVo" id="CompanyCertificateResultVo">
         <result property="certificateId" column="certificate_id"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="companyId" column="company_id"/>
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
-    <select id="selectCompanyCertificate" parameterType="com.zhongzheng.modules.company.vo.CompanyCertificateVo" resultMap="CompanyCertificateResultVo">
+    <select id="selectCompanyCertificate" parameterType="org.zhongzheng.feignclient.zzbusinessinfo.company.vo.CompanyCertificateVo" resultMap="CompanyCertificateResultVo">
         select *
         from company_certificate cc where cc.status=1
         <if test="certificateType != null">

zzbusiness-info/src/main/resources/company/CompanyDepartmentMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.company.mapper.CompanyDepartmentMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.company.mapper.CompanyDepartmentMapper">
 
-    <resultMap type="com.zhongzheng.modules.company.domain.CompanyDepartment" id="CompanyDepartmentResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.company.domain.CompanyDepartment" id="CompanyDepartmentResult">
         <result property="departmentId" column="department_id"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="companyId" column="company_id"/>

zzbusiness-info/src/main/resources/company/CompanyMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.company.mapper.CompanyMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.company.mapper.CompanyMapper">
 
-    <resultMap type="com.zhongzheng.modules.company.domain.Company" id="CompanyResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.company.domain.Company" id="CompanyResult">
         <result property="companyId" column="company_id"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="companyName" column="company_name"/>

zzbusiness-info/src/main/resources/company/CompanyUserMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.company.mapper.CompanyUserMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.company.mapper.CompanyUserMapper">
 
-    <resultMap type="com.zhongzheng.modules.company.domain.CompanyUser" id="CompanyUserResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.company.domain.CompanyUser" id="CompanyUserResult">
         <result property="userId" column="user_id"/>
         <result property="companyId" column="company_id"/>
         <result property="username" column="username"/>

zzbusiness-info/src/main/resources/staff/StaffBankInfoMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.staff.mapper.StaffBankInfoMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.staff.mapper.StaffBankInfoMapper">
 
-    <resultMap type="com.zhongzheng.modules.staff.domain.StaffBankInfo" id="StaffBankInfoResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.staff.domain.StaffBankInfo" id="StaffBankInfoResult">
         <result property="infoId" column="info_id"/>
         <result property="staffId" column="staff_id"/>
         <result property="companyId" column="company_id"/>

zzbusiness-info/src/main/resources/staff/StaffCertificateMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.staff.mapper.StaffCertificateMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.staff.mapper.StaffCertificateMapper">
 
-    <resultMap type="com.zhongzheng.modules.staff.domain.StaffCertificate" id="StaffCertificateResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.staff.domain.StaffCertificate" id="StaffCertificateResult">
         <result property="staffCertificateId" column="staff_certificate_id"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="staffId" column="staff_id"/>

zzbusiness-info/src/main/resources/staff/StaffContractArchivesMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.staff.mapper.StaffContractArchivesMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.staff.mapper.StaffContractArchivesMapper">
 
-    <resultMap type="com.zhongzheng.modules.staff.domain.StaffContractArchives" id="StaffContractArchivesResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.staff.domain.StaffContractArchives" id="StaffContractArchivesResult">
         <result property="archivesId" column="archives_id"/>
         <result property="staffId" column="staff_id"/>
         <result property="companyId" column="company_id"/>

zzbusiness-info/src/main/resources/staff/StaffEduBgMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.staff.mapper.StaffEduBgMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.staff.mapper.StaffEduBgMapper">
 
-    <resultMap type="com.zhongzheng.modules.staff.domain.StaffEduBg" id="StaffEduBgResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.staff.domain.StaffEduBg" id="StaffEduBgResult">
         <result property="eduBgId" column="edu_bg_id"/>
         <result property="staffId" column="staff_id"/>
         <result property="companyId" column="company_id"/>

zzbusiness-info/src/main/resources/staff/StaffEmergencyContactMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.staff.mapper.StaffEmergencyContactMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.staff.mapper.StaffEmergencyContactMapper">
 
-    <resultMap type="com.zhongzheng.modules.staff.domain.StaffEmergencyContact" id="StaffEmergencyContactResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.staff.domain.StaffEmergencyContact" id="StaffEmergencyContactResult">
         <result property="contactId" column="contact_id"/>
         <result property="staffId" column="staff_id"/>
         <result property="companyId" column="company_id"/>

zzbusiness-info/src/main/resources/staff/StaffMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.zhongzheng.modules.staff.mapper.StaffMapper">
+<mapper namespace="org.zhongzheng.feignclient.zzbusinessinfo.staff.mapper.StaffMapper">
 
-    <resultMap type="com.zhongzheng.modules.staff.domain.Staff" id="StaffResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.staff.domain.Staff" id="StaffResult">
         <result property="staffId" column="staff_id"/>
         <result property="companyId" column="company_id"/>
         <result property="departmentId" column="department_id"/>
@@ -39,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-    <resultMap type="com.zhongzheng.modules.staff.vo.StaffVo" id="StaffVoResult">
+    <resultMap type="org.zhongzheng.feignclient.zzbusinessinfo.staff.vo.StaffVo" id="StaffVoResult">
         <result property="staffId" column="staff_id"/>
         <result property="companyId" column="company_id"/>
         <result property="departmentId" column="department_id"/>
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
 
     </resultMap>
-    <select id="selectAllStaffList" parameterType="com.zhongzheng.modules.staff.bo.StaffQueryBo" resultMap="StaffVoResult">
+    <select id="selectAllStaffList" parameterType="org.zhongzheng.feignclient.zzbusinessinfo.staff.bo.StaffQueryBo" resultMap="StaffVoResult">
         select * from staff s where (select count(seb.staff_id) from staff_edu_bg seb where seb.staff_id=s.staff_id
         <if test="degree != null and degree != ''">
             AND seb.degree = #{degree}