refactor/重构

Author: freestylefly

pmhub-auth/src/main/java/com/laigeoffer/pmhub/auth/service/SysPasswordService.java

@@ -5,7 +5,7 @@
 import com.laigeoffer.pmhub.base.core.core.domain.entity.SysUser;
 import com.laigeoffer.pmhub.base.core.exception.user.UserPasswordNotMatchException;
 import com.laigeoffer.pmhub.base.core.exception.user.UserPasswordRetryLimitExceedException;
-import com.laigeoffer.pmhub.base.core.utils.SecurityUtils;
+import com.laigeoffer.pmhub.base.security.utils.SecurityUtils;
 import com.laigeoffer.pmhub.base.security.context.AuthenticationContextHolder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;

pmhub-auth/src/main/java/com/laigeoffer/pmhub/auth/service/SysRegisterService.java

@@ -8,7 +8,7 @@
 //import com.laigeoffer.pmhub.base.core.exception.user.CaptchaException;
 //import com.laigeoffer.pmhub.base.core.exception.user.CaptchaExpireException;
 //import com.laigeoffer.pmhub.base.core.utils.MessageUtils;
-//import com.laigeoffer.pmhub.base.core.utils.SecurityUtils;
+//import com.laigeoffer.pmhub.base.security.utils.SecurityUtils;
 //import com.laigeoffer.pmhub.base.core.utils.StringUtils;
 //import com.laigeoffer.pmhub.base.framework.manager.AsyncManager;
 //import com.laigeoffer.pmhub.base.framework.manager.factory.AsyncFactory;

pmhub-base/pmhub-base-core/pom.xml

@@ -73,10 +73,10 @@
         </dependency>
 
         <!-- spring security 安全认证 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-security</artifactId>-->
+<!--        </dependency>-->
 
         <!-- collections工具类 -->
         <dependency>

pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/config/MetaObjectHandlerConfig.java

@@ -1,7 +1,6 @@
 package com.laigeoffer.pmhub.base.core.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.laigeoffer.pmhub.base.core.utils.SecurityUtils;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
@@ -35,10 +34,12 @@ public void insertFill(MetaObject metaObject) {
             this.strictInsertFill(metaObject, "deleted", Integer.class, 0);
         }
         if (createdBy == null) {
-            this.strictInsertFill(metaObject, "createBy", String.class, SecurityUtils.getUsername());
+            // TODO: 2024.05.11 拿到用户信息
+            this.strictInsertFill(metaObject, "createBy", String.class, null);
         }
         if (updatedBy == null) {
-            this.strictInsertFill(metaObject, "updateBy", String.class, SecurityUtils.getUsername());
+            // TODO: 2024.05.11 拿到用户信息
+            this.strictInsertFill(metaObject, "updateBy", String.class,null);
         }
 
 
@@ -53,7 +54,8 @@ public void updateFill(MetaObject metaObject) {
             this.strictInsertFill(metaObject, "updateTime", LocalDateTime.class, LocalDateTime.now());
         }
         if (updatedBy == null) {
-            this.strictInsertFill(metaObject, "updateBy", String.class, SecurityUtils.getUsername());
+            // TODO: 2024.05.11 拿到用户信息
+            this.strictInsertFill(metaObject, "updateBy", String.class, null);
         }
     }
 }

pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/core/controller/BaseController.java

@@ -5,14 +5,12 @@
 import com.laigeoffer.pmhub.base.core.constant.HttpStatus;
 import com.laigeoffer.pmhub.base.core.core.domain.AjaxResult;
 import com.laigeoffer.pmhub.base.core.core.domain.R;
-import com.laigeoffer.pmhub.base.core.core.domain.model.LoginUser;
 import com.laigeoffer.pmhub.base.core.core.page.PageDomain;
 import com.laigeoffer.pmhub.base.core.core.page.TableDataInfo;
 import com.laigeoffer.pmhub.base.core.core.page.TableDataInfoForUs;
 import com.laigeoffer.pmhub.base.core.core.page.TableSupport;
 import com.laigeoffer.pmhub.base.core.utils.DateUtils;
 import com.laigeoffer.pmhub.base.core.utils.PageUtils;
-import com.laigeoffer.pmhub.base.core.utils.SecurityUtils;
 import com.laigeoffer.pmhub.base.core.utils.StringUtils;
 import com.laigeoffer.pmhub.base.core.utils.sql.SqlUtil;
 import org.slf4j.Logger;
@@ -186,31 +184,4 @@ public String redirect(String url) {
         return StringUtils.format("redirect:{}", url);
     }
 
-    /**
-     * 获取用户缓存信息
-     */
-    public LoginUser getLoginUser() {
-        return SecurityUtils.getLoginUser();
-    }
-
-    /**
-     * 获取登录用户id
-     */
-    public Long getUserId() {
-        return getLoginUser().getUserId();
-    }
-
-    /**
-     * 获取登录部门id
-     */
-    public Long getDeptId() {
-        return getLoginUser().getDeptId();
-    }
-
-    /**
-     * 获取登录用户名
-     */
-    public String getUsername() {
-        return getLoginUser().getUsername();
-    }
 }

pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/core/domain/model/LoginUser.java

@@ -2,18 +2,16 @@
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.laigeoffer.pmhub.base.core.core.domain.entity.SysUser;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
 
-import java.util.Collection;
+import java.io.Serializable;
 import java.util.Set;
 
 /**
  * 登录用户身份权限
  *
  * @author canghe
  */
-public class LoginUser implements UserDetails {
+public class LoginUser implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -118,57 +116,57 @@ public void setToken(String token) {
     }
 
     @JSONField(serialize = false)
-    @Override
+//    @Override
     public String getPassword() {
         return user.getPassword();
     }
 
-    @Override
+//    @Override
     public String getUsername() {
         return user.getUserName();
     }
 
     /**
      * 账户是否未过期,过期无法验证
      */
-    @JSONField(serialize = false)
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
+//    @JSONField(serialize = false)
+//    @Override
+//    public boolean isAccountNonExpired() {
+//        return true;
+//    }
 
     /**
      * 指定用户是否解锁,锁定的用户无法进行身份验证
      *
      * @return
      */
-    @JSONField(serialize = false)
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
+//    @JSONField(serialize = false)
+//    @Override
+//    public boolean isAccountNonLocked() {
+//        return true;
+//    }
 
     /**
      * 指示是否已过期的用户的凭据(密码),过期的凭据防止认证
      *
      * @return
      */
-    @JSONField(serialize = false)
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
+//    @JSONField(serialize = false)
+//    @Override
+//    public boolean isCredentialsNonExpired() {
+//        return true;
+//    }
 
     /**
      * 是否可用 ,禁用的用户不能身份验证
      *
      * @return
      */
-    @JSONField(serialize = false)
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
+//    @JSONField(serialize = false)
+//    @Override
+//    public boolean isEnabled() {
+//        return true;
+//    }
 
     public Long getLoginTime() {
         return loginTime;
@@ -242,8 +240,8 @@ public void setRoles(Set<String> roles) {
         this.roles = roles;
     }
 
-    @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
-        return null;
-    }
+//    @Override
+//    public Collection<? extends GrantedAuthority> getAuthorities() {
+//        return null;
+//    }
 }

pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/utils/ExcelUtils.java

@@ -1,15 +1,12 @@
 package com.laigeoffer.pmhub.base.core.utils;
 
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.log.LogFactory;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
-import com.laigeoffer.pmhub.base.core.utils.file.FileUtils;
 import org.apache.poi.ss.usermodel.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -34,15 +31,15 @@ public static void exportExcelRows(List<Map<String, Object>> rows, HttpServletRe
         }
 
         // 文件输出
-        try {
-            FileUtils.setAttachmentResponseHeader(response, fileName);
-            FileUtils.writeBytes(tmpExcelPath, response);
-        }catch (IOException ex){
-            LogFactory.get().error(ex);
-            throw new RuntimeException("文件导出失败！");
-        }
-
-        FileUtils.deleteFile(tmpExcelPath);
+//        try {
+//            FileUtils.setAttachmentResponseHeader(response, fileName);
+//            FileUtils.writeBytes(tmpExcelPath, response);
+//        }catch (IOException ex){
+//            LogFactory.get().error(ex);
+//            throw new RuntimeException("文件导出失败！");
+//        }
+//
+//        FileUtils.deleteFile(tmpExcelPath);
     }
 
     public static String createExcel(List<Map<String, Object>> rows,String path,String fileName){
@@ -121,13 +118,13 @@ public static void exportMaterialsChangeRows(List<Map<String, Object>> rows, Htt
         // 关闭writer，释放内存
         writer.close();
         // 文件输出
-        try {
-            FileUtils.setAttachmentResponseHeader(response, fileName);
-            FileUtils.writeBytes(tmpExcelPath, response);
-        }catch (IOException ex){
-            LogFactory.get().error(ex);
-            throw new RuntimeException("文件导出失败！");
-        }
-        FileUtils.deleteFile(tmpExcelPath);
+//        try {
+//            FileUtils.setAttachmentResponseHeader(response, fileName);
+//            FileUtils.writeBytes(tmpExcelPath, response);
+//        }catch (IOException ex){
+//            LogFactory.get().error(ex);
+//            throw new RuntimeException("文件导出失败！");
+//        }
+//        FileUtils.deleteFile(tmpExcelPath);
     }
 }

pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/utils/UserMessageUtils.java

@@ -13,7 +13,6 @@
 import com.laigeoffer.pmhub.base.core.utils.DateUtils;
 import com.laigeoffer.pmhub.base.core.utils.StringUtils;
 import com.laigeoffer.pmhub.base.core.utils.file.FileTypeUtils;
-import com.laigeoffer.pmhub.base.core.utils.file.FileUtils;
 import com.laigeoffer.pmhub.base.core.utils.file.ImageUtils;
 import com.laigeoffer.pmhub.base.core.utils.reflect.ReflectUtils;
 import org.apache.commons.lang3.ArrayUtils;
@@ -466,7 +465,7 @@ public List<T> importExcel(String sheetName, InputStream is, int titleNum) throw
                                 val = "";
                             } else {
                                 byte[] data = image.getData();
-                                val = FileUtils.writeImportBytes(data);
+//                                val = FileUtils.writeImportBytes(data);
                             }
                         }
                         ReflectUtils.invokeSetter(entity, propertyName, val);
@@ -1412,7 +1411,7 @@ public static <T> void exportExcel2(List<T> list, String sheetName, Class<T> cla
      */
     private static void resetResponse(String sheetName, HttpServletResponse response) throws UnsupportedEncodingException {
         String filename = encodingFilename(sheetName);
-        FileUtils.setAttachmentResponseHeader(response, filename);
+//        FileUtils.setAttachmentResponseHeader(response, filename);
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8");
     }
 }

pmhub-base/pmhub-base-core/src/main/java/com/laigeoffer/pmhub/base/core/utils/poi/ExcelUtil.java

@@ -6,7 +6,7 @@
 //import com.laigeoffer.pmhub.base.core.enums.BusinessStatus;
 //import com.laigeoffer.pmhub.base.core.filter.PropertyPreExcludeFilter;
 //import com.laigeoffer.pmhub.base.core.manage.AsyncManager;
-//import com.laigeoffer.pmhub.base.core.utils.SecurityUtils;
+//import com.laigeoffer.pmhub.base.security.utils.SecurityUtils;
 //import com.laigeoffer.pmhub.base.core.utils.ServletUtils;
 //import com.laigeoffer.pmhub.base.core.utils.StringUtils;
 //import com.laigeoffer.pmhub.base.core.utils.ip.IpUtils;

pmhub-base/pmhub-base-log/src/main/java/com/laigeoffer/pmhub/base/log/aspect/LogAspect.java

@@ -7,7 +7,7 @@
 import com.laigeoffer.pmhub.base.core.core.domain.entity.SysUser;
 import com.laigeoffer.pmhub.base.core.core.domain.model.LoginUser;
 import com.laigeoffer.pmhub.base.core.core.text.Convert;
-import com.laigeoffer.pmhub.base.core.utils.SecurityUtils;
+import com.laigeoffer.pmhub.base.security.utils.SecurityUtils;
 import com.laigeoffer.pmhub.base.core.utils.StringUtils;
 import com.laigeoffer.pmhub.base.security.context.PermissionContextHolder;
 import org.aspectj.lang.JoinPoint;

pmhub-base/pmhub-base-security/src/main/java/com/laigeoffer/pmhub/base/security/aspect/DataScopeAspect.java

@@ -5,7 +5,7 @@
 import com.laigeoffer.pmhub.base.core.exception.auth.NotLoginException;
 import com.laigeoffer.pmhub.base.core.exception.auth.NotPermissionException;
 import com.laigeoffer.pmhub.base.core.exception.auth.NotRoleException;
-import com.laigeoffer.pmhub.base.core.utils.SecurityUtils;
+import com.laigeoffer.pmhub.base.security.utils.SecurityUtils;
 import com.laigeoffer.pmhub.base.core.utils.spring.SpringUtils;
 import com.laigeoffer.pmhub.base.security.annotation.Logical;
 import com.laigeoffer.pmhub.base.security.annotation.RequiresLogin;