fix: 更新用户头像时报错问题

Author: majianzheng

jarboot-server/src/main/java/io/github/majianzheng/jarboot/audit/UpdateUserFormat.java

@@ -0,0 +1,36 @@
+package io.github.majianzheng.jarboot.audit;
+
+import io.github.majianzheng.jarboot.common.AuditArgsFormat;
+import io.github.majianzheng.jarboot.common.utils.JsonUtils;
+import io.github.majianzheng.jarboot.common.utils.StringUtils;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户更新日志格式化
+ * @author majianzheng
+ */
+public class UpdateUserFormat implements AuditArgsFormat {
+    @Override
+    public String format(Object[] args) {
+        if (null != args && args.length > 0) {
+            List<String> argList = new ArrayList<>();
+            for (int i = 0; i < args.length-1; i++) {
+                Object arg = args[i];
+                Class<?> cls = arg.getClass();
+                if (cls.isPrimitive() || cls.isArray() || arg instanceof String || arg instanceof Collection || cls.getName().startsWith("io.github.majianzheng.jarboot.")) {
+                    argList.add(JsonUtils.toJsonString(arg));
+                }
+            }
+            String arg = String.join(",", argList);
+            final int maxLength = 2000;
+            if (arg.length() > maxLength) {
+                arg = arg.substring(0, maxLength);
+            }
+            return arg;
+        }
+        return StringUtils.EMPTY;
+    }
+}

jarboot-server/src/main/java/io/github/majianzheng/jarboot/controller/UserController.java

@@ -1,6 +1,7 @@
 package io.github.majianzheng.jarboot.controller;
 
 import io.github.majianzheng.jarboot.api.constant.CommonConst;
+import io.github.majianzheng.jarboot.audit.UpdateUserFormat;
 import io.github.majianzheng.jarboot.common.annotation.EnableAuditLog;
 import io.github.majianzheng.jarboot.common.annotation.PrivilegeCheck;
 import io.github.majianzheng.jarboot.common.pojo.PagedList;
@@ -51,7 +52,7 @@ public class UserController {
      */
     @PostMapping
     @PrivilegeCheck(value = "USER_LIST")
-    @EnableAuditLog("创建用户")
+    @EnableAuditLog(value = "创建用户", argsFormat = UpdateUserFormat.class)
     public ResponseSimple createUser(String username, String fullName, String password, String roles, @RequestParam(required = false) String userDir, @RequestParam(required = false) String avatar) {
         userService.createUser(username, fullName, password, roles, userDir, avatar);
         return HttpResponseUtils.success();
@@ -67,7 +68,7 @@ public ResponseSimple createUser(String username, String fullName, String passwo
      * @return 执行结果
      */
     @PostMapping("/update")
-    @EnableAuditLog("修改用户")
+    @EnableAuditLog(value = "修改用户", argsFormat = UpdateUserFormat.class)
     public ResponseSimple updateUser(String username, String fullName, String roles, @RequestParam(required = false) String userDir, @RequestParam(required = false) String avatar) {
         userService.updateUser(username, fullName, roles, userDir, avatar);
         return HttpResponseUtils.success();

jarboot-server/src/main/java/io/github/majianzheng/jarboot/entity/AuditLog.java

@@ -1,5 +1,6 @@
 package io.github.majianzheng.jarboot.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
@@ -45,6 +46,7 @@ public void setMethod(String method) {
         this.method = method;
     }
 
+    @Column(length = 4000)
     public String getArgument() {
         return argument;
     }

jarboot-ui2/src/components/modify-user-dialog.vue

@@ -162,7 +162,7 @@ const submitForm = async () => {
     if (props.resetPassword) {
       await UserService.updateUserPassword(props.username, modifyUserForm.password, modifyUserForm.oldPassword);
     } else {
-      await UserService.updateUser(props.username, state.form.fullName, null, null, state.form.avatar);
+      await UserService.updateUser(props.username, state.form.fullName, state.form.roles.join(','), state.form.userDir, state.form.avatar);
       if (state.form.avatar) {
         userStore.avatar = state.form.avatar;
       }