管理员日志

src/main/java/xyz/playedu/api/annotation/Log.java

@@ -22,15 +22,10 @@ import java.lang.annotation.*;
 @Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface Log
+public @interface Log {
-{
+    /** 标题 */
-    /**
-     * 标题
-     */
     public String title() default "";
 
-    /**
+    /** 功能 */
-     * 功能
-     */
     public BusinessType businessType() default BusinessType.OTHER;
 }

src/main/java/xyz/playedu/api/aspectj/AdminLogAspect.java

@@ -17,14 +17,18 @@ package xyz.playedu.api.aspectj;
 
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
+
 import jakarta.servlet.http.HttpServletRequest;
+
 import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+
 import xyz.playedu.api.annotation.Log;
 import xyz.playedu.api.domain.AdminLog;
 import xyz.playedu.api.service.AdminLogService;
@@ -48,11 +52,11 @@ public class AdminLogAspect {
     @Autowired private AdminLogService adminLogService;
 
     /** 排除敏感属性字段 */
-    public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };
+    public static final String[] EXCLUDE_PROPERTIES = {
+        "password", "oldPassword", "newPassword", "confirmPassword"
+    };
 
-    /**
+    /** Controller层切点 注解拦截 */
-     * Controller层切点 注解拦截
-     */
     @Pointcut("@annotation(xyz.playedu.api.annotation.Log)")
     public void logPointCut() {}
 
@@ -138,9 +142,7 @@ public class AdminLogAspect {
         }
     }
 
-    /**
+    /** 是否存在注解，如果存在就获取 */
-     * 是否存在注解，如果存在就获取
-     */
     private Log getAnnotationLog(JoinPoint joinPoint) throws Exception {
         MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
         Method method = methodSignature.getMethod();

src/main/java/xyz/playedu/api/constant/BackendConstant.java

@@ -41,9 +41,19 @@ public class BackendConstant {
     public static final String RESOURCE_TYPE_TXT = "TXT";
 
     public static final String RESOURCE_TYPE_ATTACHMENT =
-            RESOURCE_TYPE_PDF +","+ RESOURCE_TYPE_TXT +","+
+            RESOURCE_TYPE_PDF
-            RESOURCE_TYPE_ZIP +","+ RESOURCE_TYPE_RAR +","+
+                    + ","
-            RESOURCE_TYPE_WORD +","+RESOURCE_TYPE_PPT +","+RESOURCE_TYPE_EXCEL;
+                    + RESOURCE_TYPE_TXT
+                    + ","
+                    + RESOURCE_TYPE_ZIP
+                    + ","
+                    + RESOURCE_TYPE_RAR
+                    + ","
+                    + RESOURCE_TYPE_WORD
+                    + ","
+                    + RESOURCE_TYPE_PPT
+                    + ","
+                    + RESOURCE_TYPE_EXCEL;
 
     public static final HashMap<String, String> RESOURCE_EXT_2_CONTENT_TYPE =
             new HashMap<>() {
@@ -55,11 +65,17 @@ public class BackendConstant {
                     put("pdf", "application/pdf");
                     put("mp4", "video/mp4");
                     put("doc", "application/msword");
-                    put("docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+                    put(
+                            "docx",
+                            "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
                     put("ppt", "application/vnd.ms-powerpoint");
-                    put("pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation");
+                    put(
+                            "pptx",
+                            "application/vnd.openxmlformats-officedocument.presentationml.presentation");
                     put("xls", "application/vnd.ms-excel");
-                    put("xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+                    put(
+                            "xlsx",
+                            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
                     put("txt", "text/plain");
                     put("zip", "application/zip");
                     put("rar", "application/x-rar");

src/main/java/xyz/playedu/api/constant/BusinessType.java

@@ -15,40 +15,25 @@
  */
 package xyz.playedu.api.constant;
 
-public enum BusinessType
+public enum BusinessType {
-{
+    /** 其它 */
-    /**
-     * 其它
-     */
     OTHER,
 
-    /**
+    /** 新增 */
-     * 新增
-     */
     INSERT,
 
-    /**
+    /** 修改 */
-     * 修改
-     */
     UPDATE,
 
-    /**
+    /** 删除 */
-     * 删除
-     */
     DELETE,
 
-    /**
+    /** 查询 */
-     * 查询
-     */
     GET,
 
-    /**
+    /** 登录 */
-     * 登录
-     */
     LOGIN,
 
-    /**
+    /** 退出登录 */
-     * 退出登录
-     */
     LOGOUT
 }

src/main/java/xyz/playedu/api/controller/backend/CourseController.java

@@ -209,8 +209,22 @@ public class CourseController {
         data.put("dep_ids", depIds); // 已关联的部门
         data.put("category_ids", categoryIds); // 已关联的分类
         data.put("chapters", chapters);
-        data.put("hours", hours.stream().filter(courseHour -> BackendConstant.RESOURCE_TYPE_VIDEO.equals(courseHour.getType())).collect(Collectors.groupingBy(CourseHour::getChapterId)));
+        data.put(
-        data.put("attachments", hours.stream().filter(courseHour -> BackendConstant.RESOURCE_TYPE_ATTACHMENT.contains(courseHour.getType())).collect(Collectors.groupingBy(CourseHour::getChapterId)));
+                "hours",
+                hours.stream()
+                        .filter(
+                                courseHour ->
+                                        BackendConstant.RESOURCE_TYPE_VIDEO.equals(
+                                                courseHour.getType()))
+                        .collect(Collectors.groupingBy(CourseHour::getChapterId)));
+        data.put(
+                "attachments",
+                hours.stream()
+                        .filter(
+                                courseHour ->
+                                        BackendConstant.RESOURCE_TYPE_ATTACHMENT.contains(
+                                                courseHour.getType()))
+                        .collect(Collectors.groupingBy(CourseHour::getChapterId)));
         return JsonResponse.data(data);
     }
 

src/main/java/xyz/playedu/api/controller/backend/LoginController.java

@@ -21,9 +21,11 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import xyz.playedu.api.BCtx;
+import xyz.playedu.api.annotation.Log;
 import xyz.playedu.api.bus.BackendBus;
 import xyz.playedu.api.config.PlayEduConfig;
 import xyz.playedu.api.constant.BPermissionConstant;
+import xyz.playedu.api.constant.BusinessType;
 import xyz.playedu.api.domain.AdminUser;
 import xyz.playedu.api.event.AdminUserLoginEvent;
 import xyz.playedu.api.middleware.BackendPermissionMiddleware;
@@ -57,6 +59,7 @@ public class LoginController {
     @Autowired private PlayEduConfig playEduConfig;
 
     @PostMapping("/login")
+    @Log(title = "管理员-登录", businessType = BusinessType.LOGIN)
     public JsonResponse login(@RequestBody @Validated LoginRequest loginRequest) {
         AdminUser adminUser = adminUserService.findByEmail(loginRequest.email);
         if (adminUser == null) {
@@ -100,12 +103,14 @@ public class LoginController {
     }
 
     @PostMapping("/logout")
+    @Log(title = "管理员-登出", businessType = BusinessType.LOGOUT)
     public JsonResponse logout() {
         authService.logout();
         return JsonResponse.success("success");
     }
 
     @GetMapping("/detail")
+    @Log(title = "管理员-详情", businessType = BusinessType.GET)
     public JsonResponse detail() {
         AdminUser user = BCtx.getAdminUser();
         HashMap<String, Boolean> permissions = backendBus.adminUserPermissions(user.getId());
@@ -119,6 +124,7 @@ public class LoginController {
 
     @BackendPermissionMiddleware(slug = BPermissionConstant.PASSWORD_CHANGE)
     @PutMapping("/password")
+    @Log(title = "管理员-密码修改", businessType = BusinessType.UPDATE)
     public JsonResponse changePassword(@RequestBody @Validated PasswordChangeRequest req) {
         AdminUser user = BCtx.getAdminUser();
         String password = HelperUtil.MD5(req.getOldPassword() + user.getSalt());

src/main/java/xyz/playedu/api/controller/backend/ResourceController.java

@@ -109,8 +109,8 @@ public class ResourceController {
             data.put("admin_users", adminUsers);
         }
 
-        if(!type.equals(BackendConstant.RESOURCE_TYPE_VIDEO) &&
+        if (!type.equals(BackendConstant.RESOURCE_TYPE_VIDEO)
-                !type.equals(BackendConstant.RESOURCE_TYPE_IMAGE)){
+                && !type.equals(BackendConstant.RESOURCE_TYPE_IMAGE)) {
             filter.setType(BackendConstant.RESOURCE_TYPE_ATTACHMENT);
             data.put("existing_types", resourceService.paginateType(filter));
         }

src/main/java/xyz/playedu/api/controller/backend/UploadController.java

@@ -122,11 +122,13 @@ public class UploadController {
         // 视频资源特殊处理--视频封面资源
         if (BackendConstant.RESOURCE_TYPE_VIDEO.equals(type)) {
             // 视频封面素材保存
-            Resource posterResource = uploadService.storeBase64Image(BCtx.getId(), req.getPoster(), null);
+            Resource posterResource =
+                    uploadService.storeBase64Image(BCtx.getId(), req.getPoster(), null);
             // 视频的封面素材改为[隐藏 && 属于视频的子素材]
             resourceService.changeParentId(posterResource.getId(), videoResource.getId());
             // 视频信息
-            resourceService.storeResourceVideo(videoResource.getId(), req.getDuration(), posterResource.getUrl());
+            resourceService.storeResourceVideo(
+                    videoResource.getId(), req.getDuration(), posterResource.getUrl());
         }
 
         HashMap<String, Object> data = new HashMap<>();

src/main/java/xyz/playedu/api/controller/frontend/CourseController.java

@@ -82,7 +82,10 @@ public class CourseController {
         data.put(
                 "hours",
                 courseHours.stream()
-                        .filter(courseHour -> BackendConstant.RESOURCE_TYPE_VIDEO.equals(courseHour.getType()))
+                        .filter(
+                                courseHour ->
+                                        BackendConstant.RESOURCE_TYPE_VIDEO.equals(
+                                                courseHour.getType()))
                         .collect(Collectors.groupingBy(CourseHour::getChapterId)));
         data.put("learn_record", userCourseRecordService.find(FCtx.getId(), course.getId()));
         data.put(
@@ -92,7 +95,10 @@ public class CourseController {
         data.put(
                 "attachments",
                 courseHours.stream()
-                        .filter(courseHour -> BackendConstant.RESOURCE_TYPE_ATTACHMENT.contains(courseHour.getType()))
+                        .filter(
+                                courseHour ->
+                                        BackendConstant.RESOURCE_TYPE_ATTACHMENT.contains(
+                                                courseHour.getType()))
                         .collect(Collectors.groupingBy(CourseHour::getChapterId)));
         return JsonResponse.data(data);
     }

src/main/java/xyz/playedu/api/domain/AdminLog.java

@@ -146,7 +146,8 @@ public class AdminLog implements Serializable {
         result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode());
         result = prime * result + ((getOpt() == null) ? 0 : getOpt().hashCode());
         result = prime * result + ((getMethod() == null) ? 0 : getMethod().hashCode());
-        result = prime * result + ((getRequestMethod() == null) ? 0 : getRequestMethod().hashCode());
+        result =
+                prime * result + ((getRequestMethod() == null) ? 0 : getRequestMethod().hashCode());
         result = prime * result + ((getUrl() == null) ? 0 : getUrl().hashCode());
         result = prime * result + ((getParam() == null) ? 0 : getParam().hashCode());
         result = prime * result + ((getResult() == null) ? 0 : getResult().hashCode());

src/main/java/xyz/playedu/api/util/StringUtil.java

@@ -16,6 +16,7 @@
 package xyz.playedu.api.util;
 
 import cn.hutool.json.JSONUtil;
+
 import org.springframework.util.AntPathMatcher;
 
 import java.util.*;
@@ -537,8 +538,8 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils {
                     try {
                         Object jsonObj = JSONUtil.toJsonStr(o);
                         result.append(jsonObj.toString());
+                    } catch (Exception e) {
                     }
-                    catch (Exception e) {}
                 }
             }
         }