瀏覽代碼

update 增加 jackson 配置 默认序列化时间格式

疯狂的狮子li 3 年之前
父節點
當前提交
5311937b69

+ 11 - 0
ruoyi-admin/src/main/resources/application.yml

@@ -86,6 +86,17 @@ spring:
   thymeleaf:
     # 将系统模板放置到最前面 否则会与 springboot-admin 页面冲突
     template-resolver-order: 1
+  jackson:
+    # 日期格式化
+    date-format: yyyy-MM-dd HH:mm:ss
+    serialization:
+      # 格式化输出
+      indent_output: false
+      # 忽略无法转换的对象
+      fail_on_empty_beans: false
+    deserialization:
+      # 允许对象忽略json中不存在的属性
+      fail_on_unknown_properties: false
 
 # token配置
 token:

+ 0 - 23
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -2,14 +2,8 @@ package com.ruoyi.common.core.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.DateUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.InitBinder;
-
-import java.beans.PropertyEditorSupport;
-import java.util.Date;
 
 /**
  * web层通用数据处理
@@ -20,23 +14,6 @@ public class BaseController
 {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-    /**
-     * 将前台传递过来的日期格式的字符串,自动转化为Date类型
-     */
-    @InitBinder
-    public void initBinder(WebDataBinder binder)
-    {
-        // Date 类型转换
-        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
-        {
-            @Override
-            public void setAsText(String text)
-            {
-                setValue(DateUtils.parseDate(text));
-            }
-        });
-    }
-
     /**
      * 响应返回结果
      *

+ 1 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -1,6 +1,5 @@
 package com.ruoyi.common.core.domain;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
@@ -12,7 +11,7 @@ import java.util.Map;
 
 /**
  * Entity基类
- * 
+ *
  * @author ruoyi
  */
 
@@ -30,14 +29,12 @@ public class BaseEntity implements Serializable
     private String createBy;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /** 更新者 */
     private String updateBy;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /** 备注 */

+ 5 - 1
ruoyi-demo/src/main/java/com/ruoyi/demo/bo/TestDemoAddBo.java

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-
+import java.util.Date;
 
 
 /**
@@ -40,4 +40,8 @@ public class TestDemoAddBo {
     @NotBlank(message = "值不能为空")
     private String value;
 
+	/** 创建时间 */
+	@ApiModelProperty("创建时间")
+	private Date createTime;
+
 }

+ 3 - 3
ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestDemoVo.java

@@ -1,10 +1,10 @@
 package com.ruoyi.demo.vo;
 
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 
@@ -52,7 +52,7 @@ public class TestDemoVo {
 
 	/** 创建时间 */
 	@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty("创建时间")
 	private Date createTime;
 
@@ -63,7 +63,7 @@ public class TestDemoVo {
 
 	/** 更新时间 */
 	@Excel(name = "更新时间" , width = 30, dateFormat = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty("更新时间")
 	private Date updateTime;
 

+ 0 - 4
ruoyi-generator/src/main/resources/vm/java/addBo.java.vm

@@ -2,7 +2,6 @@ package ${packageName}.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
 import javax.validation.constraints.*;
@@ -27,9 +26,6 @@ public class ${ClassName}AddBo {
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
-#if($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#end
 #if($column.isRequired==1)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment不能为空")

+ 0 - 1
ruoyi-generator/src/main/resources/vm/java/domain.java.vm

@@ -7,7 +7,6 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.ruoyi.common.annotation.Excel;
 
 /**
  * ${functionName}对象 ${tableName}

+ 0 - 4
ruoyi-generator/src/main/resources/vm/java/editBo.java.vm

@@ -2,7 +2,6 @@ package ${packageName}.bo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
 import javax.validation.constraints.*;
@@ -26,9 +25,6 @@ public class ${ClassName}EditBo {
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
-#if($column.javaType == 'Date')
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#end
 #if($column.isRequired==1)
 #if($column.javaType == 'String')
     @NotBlank(message = "$column.columnComment不能为空")

+ 0 - 3
ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm

@@ -50,9 +50,6 @@ public class ${ClassName}QueryBo extends ${Entity} {
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField) && $column.query)
 	/** $column.columnComment */
-#if($column.javaType == 'Date')
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-#end
 	@ApiModelProperty("$column.columnComment")
 	private $column.javaType $column.javaField;
 #end

+ 0 - 2
ruoyi-generator/src/main/resources/vm/java/vo.java.vm

@@ -1,7 +1,6 @@
 package ${packageName}.vo;
 
 import com.ruoyi.common.annotation.Excel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 #foreach ($import in $importList)
 import ${import};
 #end
@@ -41,7 +40,6 @@ public class ${ClassName}Vo {
 	@Excel(name = "${comment}" , readConverterExp = "$column.readConverterExp()")
 #elseif($column.javaType == 'Date')
 	@Excel(name = "${comment}" , width = 30, dateFormat = "yyyy-MM-dd")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 #else
 	@Excel(name = "${comment}")
 #end

+ 8 - 0
ruoyi-ui/src/views/demo/demo/index.vue

@@ -150,6 +150,14 @@
         <el-form-item label="值" prop="value">
           <el-input v-model="form.value" placeholder="请输入值" />
         </el-form-item>
+        <el-form-item label="创建时间" prop="createTime">
+          <el-date-picker clearable size="small"
+                          v-model="form.createTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择创建时间">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>