diff --git a/src/main/java/com/muyu/common/core/text/Convert.java b/src/main/java/com/muyu/common/core/text/Convert.java index fb57cb9..20a62b4 100644 --- a/src/main/java/com/muyu/common/core/text/Convert.java +++ b/src/main/java/com/muyu/common/core/text/Convert.java @@ -1,6 +1,7 @@ package com.muyu.common.core.text; import com.muyu.common.core.utils.StringUtils; +import lombok.extern.log4j.Log4j2; import java.math.BigDecimal; import java.math.BigInteger; @@ -15,6 +16,7 @@ import java.util.Set; * * @author muyu */ +@Log4j2 public class Convert { /** * 转换为字符串
@@ -687,7 +689,13 @@ public class Convert { * @return 字符串 */ public static String str (Object obj, String charsetName) { - return str(obj, Charset.forName(charsetName)); + try { + return str(obj, Charset.forName(charsetName)); + }catch (Exception exception){ + log.error("字符转换异常:[{}-{}]",obj,charsetName); + throw new RuntimeException(); + } + } /** diff --git a/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java b/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java index add8e3e..28c4927 100644 --- a/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java +++ b/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java @@ -1,5 +1,6 @@ package com.muyu.common.core.web.domain; +import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -36,22 +37,26 @@ public class BaseEntity implements Serializable { /** * 创建者 */ + @TableField(fill = FieldFill.INSERT) private String createBy; /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; /** * 更新者 */ + @TableField(fill = FieldFill.UPDATE) private String updateBy; /** * 更新时间 */ + @TableField(fill = FieldFill.UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime;