diff --git a/README.md b/README.md index f7d592f9..26a795e4 100644 --- a/README.md +++ b/README.md @@ -84,26 +84,6 @@ - eladmin-tools 系统第三方工具模块 - eladmin-generator 系统代码生成模块 ``` - -#### 系统预览 - - - - - - - - - - - - - - - - - -
image.pngimage1fdb6befae2368c8.png
image80b090dc27faea86.pngimagec7e0a6b8701cd890.png
imageff0d9e4ab8d3674c.pngimage923ef574ace41404.png
imagef37b559927af1a10.pngimageabafc6a7f0522967.png
#### 特别鸣谢 diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java index 05bf2bb4..10ccd712 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java @@ -20,15 +20,11 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.poi.excel.BigExcelWriter; import cn.hutool.poi.excel.ExcelUtil; import me.zhengjie.exception.BadRequestException; -import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.util.IOUtils; -import org.apache.poi.xssf.streaming.SXSSFCell; -import org.apache.poi.xssf.streaming.SXSSFRow; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; - import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -217,8 +213,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { sheet.trackAllColumnsForAutoSizing(); //列宽自适应 writer.autoSizeColumnAll(); - //列宽自适应支持中文单元格 - sizeChineseColumn(sheet, writer); //response为HttpServletResponse对象 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8"); //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码 @@ -231,33 +225,6 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { IoUtil.close(out); } - /** - * 自适应宽度(中文支持) - */ - private static void sizeChineseColumn(SXSSFSheet sheet, BigExcelWriter writer) { - for (int columnNum = 0; columnNum < writer.getColumnCount(); columnNum++) { - int columnWidth = sheet.getColumnWidth(columnNum) / 256; - for (int rowNum = 0; rowNum < sheet.getLastRowNum(); rowNum++) { - SXSSFRow currentRow; - if (sheet.getRow(rowNum) == null) { - currentRow = sheet.createRow(rowNum); - } else { - currentRow = sheet.getRow(rowNum); - } - if (currentRow.getCell(columnNum) != null) { - SXSSFCell currentCell = currentRow.getCell(columnNum); - if (currentCell.getCellTypeEnum() == CellType.STRING) { - int length = currentCell.getStringCellValue().getBytes().length; - if (columnWidth < length) { - columnWidth = length; - } - } - } - } - sheet.setColumnWidth(columnNum, columnWidth * 256); - } - } - public static String getFileType(String type) { String documents = "txt doc pdf ppt pps xlsx xls docx"; String music = "mp3 wav wma mpa ram ra aac aif m4a"; diff --git a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java index 962a9932..3a338d71 100644 --- a/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java +++ b/eladmin-system/src/main/java/me/zhengjie/config/ConfigurerAdapter.java @@ -15,14 +15,22 @@ */ package me.zhengjie.config; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.alibaba.fastjson.support.config.FastJsonConfig; +import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.MediaType; +import org.springframework.http.converter.HttpMessageConverter; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; /** * WebMvcConfigurer @@ -62,4 +70,18 @@ public class ConfigurerAdapter implements WebMvcConfigurer { registry.addResourceHandler("/file/**").addResourceLocations(pathUtl).setCachePeriod(0); registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/").setCachePeriod(0); } + + @Override + public void configureMessageConverters(List> converters) { + FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter(); + List supportMediaTypeList = new ArrayList<>(); + supportMediaTypeList.add(MediaType.APPLICATION_JSON_UTF8); + FastJsonConfig config = new FastJsonConfig(); + config.setDateFormat("yyyy-MM-dd HH:mm:ss"); + config.setSerializerFeatures(SerializerFeature.DisableCircularReferenceDetect); + converter.setFastJsonConfig(config); + converter.setSupportedMediaTypes(supportMediaTypeList); + converter.setDefaultCharset(StandardCharsets.UTF_8); + converters.add(converter); + } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java index e13491bc..db98fba4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/security/TokenProvider.java @@ -43,7 +43,7 @@ public class TokenProvider implements InitializingBean { private final SecurityProperties properties; private final RedisUtils redisUtils; - public static final String AUTHORITIES_KEY = "auth"; + public static final String AUTHORITIES_KEY = "user"; private JwtParser jwtParser; private JwtBuilder jwtBuilder; @@ -74,6 +74,7 @@ public class TokenProvider implements InitializingBean { return jwtBuilder // 加入ID确保生成的 Token 都不一致 .setId(IdUtil.simpleUUID()) + .claim(AUTHORITIES_KEY, authentication.getName()) .setSubject(authentication.getName()) .compact(); } diff --git a/eladmin-system/src/main/resources/template/generator/front/index.ftl b/eladmin-system/src/main/resources/template/generator/front/index.ftl index 9307821a..4b9111a9 100644 --- a/eladmin-system/src/main/resources/template/generator/front/index.ftl +++ b/eladmin-system/src/main/resources/template/generator/front/index.ftl @@ -70,7 +70,7 @@
取消 - 确认 + 确认
@@ -85,19 +85,13 @@ {{ dict.label.${column.dictName}[scope.row.${column.changeColumnName}] }} - <#elseif column.columnType != 'Timestamp'> - <#else> - - - + - +