修改日志

eladmin-logging/src/main/java/me/zhengjie/aspect/LogRequestParam.java

@@ -65,30 +65,13 @@ public class LogRequestParam {
 			Map<Object, Object> params = new HashMap<>(4);
 			for (int i = 0; i < parameterNames.length; i++) {
 				Object param = parameterNames[i];
-			
-				if (param == null || param instanceof HttpServletRequest || param instanceof HttpServletResponse) {
-					continue;
-				}
-				if (param instanceof MultipartFile) {
-					MultipartFile part = (MultipartFile) param;
-					param = part.getOriginalFilename();
-				}
-				if (param instanceof MultipartFile[]) {
-					MultipartFile[] part = (MultipartFile[]) param;
-					StringBuffer sb = new StringBuffer();
-					for (MultipartFile file : part) {
-						sb.append(file.getOriginalFilename() + ",");
-					}
-					param = sb.toString();
-				}
-				// o instanceof MultipartFile || o instanceof MultipartFile[]
 
 				Object value = parameterValues[i];
 				if (value == null || value instanceof HttpServletRequest || value instanceof HttpServletResponse) {
 					continue;
 				}
 				if (value instanceof MultipartFile) {
-					MultipartFile part = (MultipartFile)value;
+					MultipartFile part = (MultipartFile) value;
 					value = part.getOriginalFilename();
 				}
 				if (value instanceof MultipartFile[]) {
@@ -99,10 +82,20 @@ public class LogRequestParam {
 					}
 					value = sb.toString();
 				}
-				//记录上传的参数
+				if (value instanceof String) {
+					String str = (String) value;
+					if (str.length() > 1000) {
+						//去掉特别长的参数，保留1000个值
+						value = str.substring(0, 1000);
+					}
+				}
+				// 记录上传的参数
 				params.put(param, value);
 			}
-			Object[] obj = { ip, uri, JSON.toJSONString(params, SerializerFeature.WriteMapNullValue) };
+			String json = JSON.toJSONString(params, SerializerFeature.WriteMapNullValue);
+
+			// 这里判断
+			Object[] obj = { ip, uri, json };
 			log.info("[request] - ip: {} , requestUrl: {} ,param: {} ", obj);
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -136,4 +129,5 @@ public class LogRequestParam {
 			e.printStackTrace();
 		}
 	}
+
 }

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/User.java

@@ -25,6 +25,9 @@ import javax.persistence.*;
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+
+import org.apache.commons.lang3.StringUtils;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.Objects;
@@ -37,141 +40,146 @@ import java.util.Set;
 @Entity
 @Getter
 @Setter
-@Table(name="sys_user")
+@Table(name = "sys_user")
 public class User extends BaseEntity implements Serializable {
 
-    @Id
-    @Column(name = "user_id")
-    @NotNull(groups = Update.class)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value = "ID", hidden = true)
-    private Long id;
-
-    @ManyToMany(fetch = FetchType.EAGER)
-    @ApiModelProperty(value = "用户角色")
-    @JoinTable(name = "sys_users_roles",
-            joinColumns = {@JoinColumn(name = "user_id",referencedColumnName = "user_id")},
-            inverseJoinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "role_id")})
-    private Set<Role> roles;
-
-    @ManyToMany(fetch = FetchType.EAGER)
-    @ApiModelProperty(value = "用户岗位")
-    @JoinTable(name = "sys_users_jobs",
-            joinColumns = {@JoinColumn(name = "user_id",referencedColumnName = "user_id")},
-            inverseJoinColumns = {@JoinColumn(name = "job_id",referencedColumnName = "job_id")})
-    private Set<Job> jobs;
-
-    @OneToOne
-    @JoinColumn(name = "dept_id")
-    @ApiModelProperty(value = "用户部门")
-    private Dept dept;
-
-    @NotBlank
-    @Column(unique = true)
-    @ApiModelProperty(value = "用户名称")
-    private String username;
-
-    @NotBlank
-    @ApiModelProperty(value = "用户昵称")
-    private String nickName;
-
-    @Email
+	@Id
+	@Column(name = "user_id")
+	@NotNull(groups = Update.class)
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@ApiModelProperty(value = "ID", hidden = true)
+	private Long id;
+
+	@ManyToMany(fetch = FetchType.EAGER)
+	@ApiModelProperty(value = "用户角色")
+	@JoinTable(name = "sys_users_roles", joinColumns = {
+			@JoinColumn(name = "user_id", referencedColumnName = "user_id") }, inverseJoinColumns = {
+					@JoinColumn(name = "role_id", referencedColumnName = "role_id") })
+	private Set<Role> roles;
+
+	@ManyToMany(fetch = FetchType.EAGER)
+	@ApiModelProperty(value = "用户岗位")
+	@JoinTable(name = "sys_users_jobs", joinColumns = {
+			@JoinColumn(name = "user_id", referencedColumnName = "user_id") }, inverseJoinColumns = {
+					@JoinColumn(name = "job_id", referencedColumnName = "job_id") })
+	private Set<Job> jobs;
+
+	@OneToOne
+	@JoinColumn(name = "dept_id")
+	@ApiModelProperty(value = "用户部门")
+	private Dept dept;
+
+	@NotBlank
+	@Column(unique = true)
+	@ApiModelProperty(value = "用户名称")
+	private String username;
+
+	@NotBlank
+	@ApiModelProperty(value = "用户昵称")
+	private String nickName;
+
+	@Email
 //    @NotBlank
-    @ApiModelProperty(value = "邮箱")
-    private String email;
-
-    @NotBlank
-    @ApiModelProperty(value = "电话号码")
-    private String phone;
-
-    @ApiModelProperty(value = "用户性别")
-    private String gender;
-
-    @ApiModelProperty(value = "头像真实名称",hidden = true)
-    private String avatarName;
-
-    @ApiModelProperty(value = "头像存储的路径", hidden = true)
-    private String avatarPath;
-
-    @ApiModelProperty(value = "密码")
-    private String password;
-
-    @NotNull
-    @ApiModelProperty(value = "是否启用")
-    private Boolean enabled;
-
-    @ApiModelProperty(value = "是否为admin账号", hidden = true)
-    private Boolean isAdmin = false;
-
-    @Column(name = "pwd_reset_time")
-    @ApiModelProperty(value = "最后修改密码的时间", hidden = true)
-    private Date pwdResetTime;
-
-    @Column(name = "org_id")
-    @ApiModelProperty(value = "机构的id") // 银行或者公证处
-    private String orgId;
-
-    @Column(name = "id_card")
-    @ApiModelProperty(value = "身份证") // 用户身份证
-    private String idCard;
-
-    @Column(name = "sign_img_id")
-    @ApiModelProperty(value = "签名图片id")
-    private String signImgId;
-
-    @Column(name = "axq_user_id")
-    @ApiModelProperty(value = "安心签用户ID")
-    private String axqUserId;
-
-    @Column(name = "axq_seal_id")
-    @ApiModelProperty(value = "安心签签名图片ID")
-    private String axqSealId;
-
-    @Column(name = "axq_is_auth")
-    @ApiModelProperty(value = "安心签签名授权标记")
-    private String axqIsAuth;
-
-    @Transient
-    @TableField(exist = false)
-    @ApiModelProperty(value = "安心签签名授权验证码")
-    private String checkCode;
-    
-    @Transient
-    @TableField(exist = false)
-    @ApiModelProperty(value = "图片的id的值")
-    private String imageId;
-    /**
-     * 获取用户类型
-     * @return
-     */
-    public String getUserType(){
-        return orgId.split("_")[0];
-    }
-
-    /**
-     * 获取公司ID
-     * @return
-     */
-    public String getComId(){
-        return orgId.split("_")[1];
-    }
-
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        User user = (User) o;
-        return Objects.equals(id, user.id) &&
-                Objects.equals(username, user.username);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(id, username);
-    }
+	@ApiModelProperty(value = "邮箱")
+	private String email;
+
+	@NotBlank
+	@ApiModelProperty(value = "电话号码")
+	private String phone;
+
+	@ApiModelProperty(value = "用户性别")
+	private String gender;
+
+	@ApiModelProperty(value = "头像真实名称", hidden = true)
+	private String avatarName;
+
+	@ApiModelProperty(value = "头像存储的路径", hidden = true)
+	private String avatarPath;
+
+	@ApiModelProperty(value = "密码")
+	private String password;
+
+	@NotNull
+	@ApiModelProperty(value = "是否启用")
+	private Boolean enabled;
+
+	@ApiModelProperty(value = "是否为admin账号", hidden = true)
+	private Boolean isAdmin = false;
+
+	@Column(name = "pwd_reset_time")
+	@ApiModelProperty(value = "最后修改密码的时间", hidden = true)
+	private Date pwdResetTime;
+
+	@Column(name = "org_id")
+	@ApiModelProperty(value = "机构的id") // 银行或者公证处
+	private String orgId;
+
+	@Column(name = "id_card")
+	@ApiModelProperty(value = "身份证") // 用户身份证
+	private String idCard;
+
+	@Column(name = "sign_img_id")
+	@ApiModelProperty(value = "签名图片id")
+	private String signImgId;
+
+	@Column(name = "axq_user_id")
+	@ApiModelProperty(value = "安心签用户ID")
+	private String axqUserId;
+
+	@Column(name = "axq_seal_id")
+	@ApiModelProperty(value = "安心签签名图片ID")
+	private String axqSealId;
+
+	@Column(name = "axq_is_auth")
+	@ApiModelProperty(value = "安心签签名授权标记")
+	private String axqIsAuth;
+
+	@Transient
+	@TableField(exist = false)
+	@ApiModelProperty(value = "安心签签名授权验证码")
+	private String checkCode;
+
+	@Transient
+	@TableField(exist = false)
+	@ApiModelProperty(value = "图片的id的值")
+	private String imageId;
+
+	/**
+	 * 获取用户类型
+	 * 
+	 * @return
+	 */
+	public String getUserType() {
+		return orgId.split("_")[0];
+	}
+
+	/**
+	 * 获取公司ID
+	 * 
+	 * @return
+	 */
+	public String getComId() {
+		// 增加非空判断
+		if (StringUtils.isNotBlank(orgId) && orgId.contains("_")) {
+			return orgId.split("_")[1];
+		}
+		return "";
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		User user = (User) o;
+		return Objects.equals(id, user.id) && Objects.equals(username, user.username);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, username);
+	}
 }