代码规范化

common/src/main/java/com/koobietech/eas/common/utils/FileManager.java

@@ -7,6 +7,7 @@ import java.io.*;
 import java.nio.channels.FileChannel;
 import java.nio.file.*;
 import java.text.DecimalFormat;
+import java.util.Objects;
 
 @Component
 public class FileManager {
@@ -35,7 +36,8 @@ public class FileManager {
             }
         } catch (IOException e) {}finally {
             try {
-                stream.close();
+                if (Objects.nonNull(stream))
+                    stream.close();
             } catch (IOException e) {}
         }
         if ( size > 0  ) {
@@ -78,8 +80,10 @@ public class FileManager {
                             file.delete();
                         } catch (IOException e) {}finally {
                             try {
-                                sourceChannel.close();
-                                destChannel.close();
+                                if (Objects.nonNull(sourceChannel))
+                                    sourceChannel.close();
+                                if (Objects.nonNull(destChannel))
+                                    destChannel.close();
                             } catch (IOException e) {}
                         }
                     } else {
@@ -191,8 +195,10 @@ public class FileManager {
             ret = false;
         } finally {
             try {
-                fileOutputStream.close();
-                document.close();
+                if (Objects.nonNull(fileOutputStream))
+                    fileOutputStream.close();
+                if (Objects.nonNull(document))
+                    document.close();
             } catch (IOException e) {}
         }
         return ret;
@@ -273,6 +279,7 @@ public class FileManager {
             return  false;
         } finally {
             try {
+                if (Objects.nonNull(fileOutputStream))
                 fileOutputStream.close();
             }catch (IOException e){}
         }

dao/src/main/java/com/koobietech/eas/dao/dto/TestDto.java

@@ -1,12 +0,0 @@
-package com.koobietech.eas.dao.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-@Data
-public class TestDto {
-    @Schema(description = "学员ID")
-    int id;
-    @Schema(description = "学员名字")
-    String name;
-}

security/src/main/java/com/koobietech/eas/security/filter/EasSecurityFilter.java

@@ -80,7 +80,7 @@ public class EasSecurityFilter extends OncePerRequestFilter {
                     }
 
                     // 使用用户的用户名、空凭证参数和权限对象集合创建一个 UsernamePasswordAuthenticationToken 身份验证令牌
-                    UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userDetail.getUsername(), null, objects);
+                    UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(userDetail, null, objects);
 
                     // 将身份验证令牌设置到当前的 SecurityContext 中
                     context.setAuthentication(authenticationToken);

security/src/main/java/com/koobietech/eas/security/utils/SecurityUtils.java

@@ -1,19 +1,41 @@
 package com.koobietech.eas.security.utils;
+import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
 import org.springframework.security.core.context.SecurityContextHolder;
+
+import java.util.Objects;
+
 public class SecurityUtils {
 
     public static String getLoginUserName(){
-        Object principal = getPrincipal();
-        return principal.toString().equals("anonymousUser") ? "" : principal.toString();
+        UserDetail principal = getPrincipal();
+        if ( Objects.nonNull(principal) ) {
+            return principal.getUsername();
+        }
+        return "anonymousUser";
     }
 
-    public static boolean isLogged(){
-        Object principal = getPrincipal();
-        return principal.toString().equals("anonymousUser");
+    public static Long getLoginUid(){
+        UserDetail principal = getPrincipal();
+        if ( Objects.nonNull(principal) ) {
+            return principal.getId();
+        }
+        return 0L;
     }
 
-    private static Object getPrincipal(){
-        return SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+    public static boolean isLogged(){
+        UserDetail principal = getPrincipal();
+        return Objects.nonNull(principal);
     }
 
+    private static UserDetail getPrincipal(){
+        Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+        if (Objects.nonNull(principal) ) {
+            if ( principal instanceof UserDetail ) {
+                return (UserDetail) principal;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
 }