diff options
| author | tanghao <[email protected]> | 2022-12-27 14:06:42 +0800 |
|---|---|---|
| committer | tanghao <[email protected]> | 2022-12-27 14:06:42 +0800 |
| commit | 5dd5511b916417dc0ae1f539ca01f8c320ca6f69 (patch) | |
| tree | 997848528c66c3b68f524848992cdc5cd9b24980 | |
| parent | ea055eeacf7b030d6ad1c5b6a8198c2aec2dd11b (diff) | |
fix: CN-833 解决启动初始化过程依赖加载顺序错乱的问题22.10-rc3.1
| -rw-r--r-- | cn-admin/src/main/java/net/geedge/common/config/ShiroConfig.java | 6 | ||||
| -rw-r--r-- | cn-admin/src/main/java/net/geedge/modules/report/service/impl/ReportJobServiceImpl.java | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/cn-admin/src/main/java/net/geedge/common/config/ShiroConfig.java b/cn-admin/src/main/java/net/geedge/common/config/ShiroConfig.java index b362a9e..83f5e38 100644 --- a/cn-admin/src/main/java/net/geedge/common/config/ShiroConfig.java +++ b/cn-admin/src/main/java/net/geedge/common/config/ShiroConfig.java @@ -220,11 +220,11 @@ public class ShiroConfig { } private Integer getTimeOutData() { - String timeout = sysconfigService.getValue(Constant.SYSCONFIG_SESSION_TIMEOUT_KEY); + /*String timeout = sysconfigService.getValue(Constant.SYSCONFIG_SESSION_TIMEOUT_KEY); Integer loginExpiration = 30; if (StrUtil.isNotBlank(timeout)) { loginExpiration = Integer.valueOf(timeout); - } - return loginExpiration; + }*/ + return 360; } } diff --git a/cn-admin/src/main/java/net/geedge/modules/report/service/impl/ReportJobServiceImpl.java b/cn-admin/src/main/java/net/geedge/modules/report/service/impl/ReportJobServiceImpl.java index 0a4841c..8f0f027 100644 --- a/cn-admin/src/main/java/net/geedge/modules/report/service/impl/ReportJobServiceImpl.java +++ b/cn-admin/src/main/java/net/geedge/modules/report/service/impl/ReportJobServiceImpl.java @@ -222,9 +222,6 @@ public class ReportJobServiceImpl extends ServiceImpl<ReportJobDao, ReportJob> i if(file.exists()) { file.delete(); } - if(pdfFile.exists()) { - pdfFile.delete(); - } FileUtil.writeBytes(html.getBytes(), file); RuntimeUtil.exec("node "+Constant.CONFIG_PATH+File.separator+"report.js "+Constant.TEMP_PATH+File.separator+htmlName+Constant.TEMP_PATH+File.separator+fileName); }catch(Exception e) { |