cloud-server-management/src/main/java/com/dsh/guns/core/aop/LogAop.java
@@ -86,8 +86,10 @@ // 审计表字段为 varchar，必须在调用审计服务前序列化；直接传 Map 会导致 // Spring 无法绑定到 SysAccountAuditLog.requestParams(String)，从而整条日志写入失败。 audit.put("requestParams", AuditDataFormatter.format(maskedParameters(HttpKit.getRequestParameters()), User.class)); audit.put("beforeData", beforeData); audit.put("afterData", afterData(beforeData)); String afterData = afterData(beforeData); AuditDataFormatter.ChangeSet changes = AuditDataFormatter.changes(beforeData, afterData); audit.put("beforeData", changes.getBefore()); audit.put("afterData", changes.getAfter()); audit.put("userId", user.getId()); audit.put("userAccount", user.getAccount()); audit.put("clientIp", HttpKit.getIp()); cloud-server-management/src/main/java/com/dsh/guns/core/aop/ManagementOperationAuditAspect.java
@@ -70,8 +70,10 @@ audit.put("requestMethod", request.getMethod()); audit.put("requestUri", uri); audit.put("requestParams", requestData(request)); audit.put("beforeData", beforeData); audit.put("afterData", afterData(request, beforeData)); String afterData = afterData(request, beforeData); AuditDataFormatter.ChangeSet changes = AuditDataFormatter.changes(beforeData, afterData); audit.put("beforeData", changes.getBefore()); audit.put("afterData", changes.getAfter()); audit.put("userId", user.getId()); audit.put("userAccount", user.getAccount()); audit.put("clientIp", request.getRemoteAddr()); cloud-server-management/src/main/java/com/dsh/guns/modular/system/audit/AuditDataFormatter.java
@@ -8,6 +8,7 @@ import java.lang.reflect.Field; import java.util.LinkedHashMap; import java.util.Objects; import java.util.Map; /** 审计数据统一脱敏并将常用字段名转换为中文，供日志页面直接展示。 */ @@ -43,6 +44,45 @@ return mask(JSON.toJSONString(localize(json, entityType))); } /** 返回前后快照中实际发生改变的字段；未变化字段不会写入审计记录。 */ public static ChangeSet changes(String before, String after) { JSONObject beforeObject = object(before); JSONObject afterObject = object(after); JSONObject changedBefore = new JSONObject(true); JSONObject changedAfter = new JSONObject(true); Map<String, Object> all = new LinkedHashMap<String, Object>(); all.putAll(beforeObject); all.putAll(afterObject); for (String field : all.keySet()) { Object oldValue = beforeObject.get(field); Object newValue = afterObject.get(field); if (!Objects.equals(JSON.toJSONString(oldValue), JSON.toJSONString(newValue))) { changedBefore.put(field, oldValue); changedAfter.put(field, newValue); } } return new ChangeSet(changedBefore.isEmpty() ? null : mask(changedBefore.toJSONString()), changedAfter.isEmpty() ? null : mask(changedAfter.toJSONString())); } private static JSONObject object(String value) { if (value == null || value.trim().isEmpty()) return new JSONObject(true); try { JSONObject object = JSON.parseObject(value); return object == null ? new JSONObject(true) : object; } catch (Exception ignored) { return new JSONObject(true); } } public static final class ChangeSet { private final String before; private final String after; private ChangeSet(String before, String after) { this.before = before; this.after = after; } public String getBefore() { return before; } public String getAfter() { return after; } } private static Object parse(String value) { try { return JSON.parse(value); } catch (Exception ignored) { return value; } } cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -160,7 +160,9 @@ } user.setPhone(maskPhone(user.getPhone())); user.setIdCard(maskIdCard(user.getIdCard())); model.addAttribute(user); // 显式指定模型名称和身份证回显字段，避免模板按隐式参数名解析失败。 model.addAttribute("user", user); model.addAttribute("idCard", user.getIdCard()); if(role==null){ model.addAttribute("roleName", ""); }else { cloud-server-management/src/main/webapp/WEB-INF/view/system/user/user_edit.html
@@ -17,7 +17,7 @@ <option value="1" selected>男</option> <option value="2">女</option> </#select> <#input id="idCard" name="身份证号" type="text" underline="true" value="${user.idCard}"/> <#input id="idCard" name="身份证号" type="text" underline="true" value="${idCard}"/> <#select id="roleid" name="角色" underline="true" > @for(l in list){ <option value="${l.id}" ${l.id == user.roleid ? 'selected=selected' : ''}>${l.name}</option>
