合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/aspect/LogAspect.java

@@ -80,8 +80,9 @@ public class LogAspect {
                 // 如果已有 SecurityUtils 可替换此处；当前用 AuthUtils 解析 token
                 String token = AuthUtils.getToken();
                 if (StringUtils.isNotBlank(token)) {
-                    String userId = AuthUtils.getUserId(token);
-                    operLog.setOperName(userId);
+                    String userName = AuthUtils.getUserName(token);
+
+                    operLog.setOperName(userName);
                 }
             } catch (Exception ex) {
                 log.debug("获取用户名失败: {}", ex.getMessage());

src/main/java/com/wangxiaolu/promotion/utils/AuthUtils.java

@@ -53,4 +53,7 @@ public class AuthUtils {
     public static String getUserId(String token) {
         return JwtTokenUtils.getUserId(parseToken(token));
     }
+    public static String getUserName(String token) {
+        return JwtTokenUtils.getUserName(parseToken(token));
+    }
 }