From eec15a3b5ebf42b54021ee3568a548f03f62cf78 Mon Sep 17 00:00:00 2001 From: liao Date: Fri, 5 May 2023 15:15:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=2068471=20=E6=B6=88=E6=81=AF=E4=B8=AD?= =?UTF-8?q?=E5=BF=83-=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86-=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/common/system/base/controller/JeroController.java | 4 ++-- .../src/main/java/com/jero/common/system/util/JwtUtil.java | 3 ++- .../com/jero/modules/message/entity/SysMessageTemplate.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java index 4c38ea8f..92a6da77 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java @@ -172,8 +172,8 @@ public class JeroController> { // 获取上传文件对象 MultipartFile file = entity.getValue(); ImportParams params = new ImportParams(); - params.setTitleRows(2); - params.setHeadRows(1); + /*params.setTitleRows(2); + params.setHeadRows(1);*/ params.setNeedSave(true); try { List list = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params); diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java index fbfa2f0c..a46d8eca 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/util/JwtUtil.java @@ -79,7 +79,8 @@ public class JwtUtil { * @return 加密的token */ public static String sign(String username, String secret) { - Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME); + // 24小时后过期 + Date date = new Date(System.currentTimeMillis() + EXPIRE_TIME * 48); Algorithm algorithm = Algorithm.HMAC256(secret); // 附带username信息 return JWT.create().withClaim(USERNAME_FIELD, username).withExpiresAt(date).sign(algorithm); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java index 9e531b7f..314f22e5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/entity/SysMessageTemplate.java @@ -30,8 +30,8 @@ public class SysMessageTemplate extends JeroEntity { @Excel(name = "模板内容", width = 50) private java.lang.String templateContent; /**模板测试json*/ - @Excel(name = "模板测试json", width = 15) - private java.lang.String templateTestJson; + /*@Excel(name = "模板测试json", width = 15) + private java.lang.String templateTestJson;*/ /**模板类型*/ @Excel(name = "模板类型", width = 15) private java.lang.String templateType;