Skip to content

Commit a60661e

Browse files
committed
[代码优化](v2.6):bug修复,代码优化,日期格式化后返回
close elunez#514
1 parent eb35190 commit a60661e

File tree

2 files changed

+36
-7
lines changed

2 files changed

+36
-7
lines changed

eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,25 @@
1515
*/
1616
package me.zhengjie.config;
1717

18+
import com.alibaba.fastjson.serializer.SerializerFeature;
19+
import com.alibaba.fastjson.support.config.FastJsonConfig;
20+
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
1821
import org.springframework.context.annotation.Bean;
1922
import org.springframework.context.annotation.Configuration;
23+
import org.springframework.http.MediaType;
24+
import org.springframework.http.converter.HttpMessageConverter;
2025
import org.springframework.web.cors.CorsConfiguration;
2126
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
2227
import org.springframework.web.filter.CorsFilter;
2328
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
2429
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
2530
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
2631

32+
import java.nio.charset.Charset;
33+
import java.nio.charset.StandardCharsets;
34+
import java.util.ArrayList;
35+
import java.util.List;
36+
2737
/**
2838
* WebMvcConfigurer
2939
*
@@ -62,4 +72,29 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
6272
registry.addResourceHandler("/file/**").addResourceLocations(pathUtl).setCachePeriod(0);
6373
registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/").setCachePeriod(0);
6474
}
75+
76+
@Override
77+
public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
78+
FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
79+
List<MediaType> supportMediaTypeList = new ArrayList<>();
80+
supportMediaTypeList.add(MediaType.APPLICATION_JSON_UTF8);
81+
FastJsonConfig config = new FastJsonConfig();
82+
config.setDateFormat("yyyy-MM-dd HH:mm:ss");
83+
config.setSerializerFeatures(
84+
SerializerFeature.DisableCircularReferenceDetect,
85+
//保留空的字段
86+
SerializerFeature.WriteMapNullValue,
87+
//String null -> ""
88+
SerializerFeature.WriteNullStringAsEmpty,
89+
//Number null -> 0
90+
SerializerFeature.WriteNullNumberAsZero,
91+
//List null-> []
92+
SerializerFeature.WriteNullListAsEmpty,
93+
//Boolean null -> false
94+
SerializerFeature.WriteNullBooleanAsFalse);
95+
converter.setFastJsonConfig(config);
96+
converter.setSupportedMediaTypes(supportMediaTypeList);
97+
converter.setDefaultCharset(StandardCharsets.UTF_8);
98+
converters.add(converter);
99+
}
65100
}

eladmin-system/src/main/resources/template/generator/front/index.ftl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,8 @@
8585
{{ dict.label.${column.dictName}[scope.row.${column.changeColumnName}] }}
8686
</template>
8787
</el-table-column>
88-
<#elseif column.columnType != 'Timestamp'>
89-
<el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" />
9088
<#else>
91-
<el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>">
92-
<template slot-scope="scope">
93-
<span>{{ parseTime(scope.row.${column.changeColumnName}) }}</span>
94-
</template>
95-
</el-table-column>
89+
<el-table-column prop="${column.changeColumnName}" label="<#if column.remark != ''>${column.remark}<#else>${column.changeColumnName}</#if>" />
9690
</#if>
9791
</#if>
9892
</#list>

0 commit comments

Comments
 (0)