From f15105d8277e3365b15a33f1ec918e9bc477ca7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 20 Aug 2024 16:17:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9git=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/config/shiro/ShiroRealm.java | 3 +++ .../documenttool/service/impl/DocumentSplitServiceImpl.java | 2 +- .../src/main/resources/application-dev-chery.yml | 2 ++ laws-single-startup/src/main/resources/application-dev.yml | 2 ++ laws-single-startup/src/main/resources/application-test.yml | 2 ++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java index 30e93973..a39e77ad 100644 --- a/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java +++ b/laws-base/laws-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java @@ -160,6 +160,9 @@ public class ShiroRealm extends AuthorizingRealm { redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, newAuthorization); redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME); log.debug("——————————用户在线操作，更新token保证不掉线—————————jwtTokenRefresh——————— "+ token); + }else{ + redisUtil.set(CommonConstant.PREFIX_USER_TOKEN + token, cacheToken); + redisUtil.expire(CommonConstant.PREFIX_USER_TOKEN + token, JwtUtil.EXPIRE_TIME / 1000); } return true; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 6baf12eb..a605941e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -1073,7 +1073,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { try (InputStream in = resource.getInputStream()) { // 导出文件 filePath = exportExcelTempPath + File.separator + "条款导入模板"; - String excelFilePath = filePath + File.separator + "clauseImport.xlsx"; + String excelFilePath = filePath + File.separator + "条款导入模板.xlsx"; writeToLocal(excelFilePath, in); ZipUtil.toZip(filePath, response.getOutputStream(), response, true); } catch (IOException e) { diff --git a/laws-single-startup/src/main/resources/application-dev-chery.yml b/laws-single-startup/src/main/resources/application-dev-chery.yml index 92584b4a..942b6058 100644 --- a/laws-single-startup/src/main/resources/application-dev-chery.yml +++ b/laws-single-startup/src/main/resources/application-dev-chery.yml @@ -70,6 +70,8 @@ spring: jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 + serialization: + fail-on-empty-beans: false jpa: open-in-view: false activiti: diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml index e7bc2aca..9bba1b7c 100644 --- a/laws-single-startup/src/main/resources/application-dev.yml +++ b/laws-single-startup/src/main/resources/application-dev.yml @@ -70,6 +70,8 @@ spring: jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 + serialization: + fail-on-empty-beans: false jpa: open-in-view: false activiti: diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml index a69f6b06..db8ea6fd 100644 --- a/laws-single-startup/src/main/resources/application-test.yml +++ b/laws-single-startup/src/main/resources/application-test.yml @@ -70,6 +70,8 @@ spring: jackson: date-format: yyyy-MM-dd HH:mm:ss time-zone: GMT+8 + serialization: + fail-on-empty-beans: false jpa: open-in-view: false activiti: