From 9d0b4a63c52688f8b8a7bcf86dc3155fe203013e Mon Sep 17 00:00:00 2001 From: bynt Date: Wed, 17 Aug 2022 11:06:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../me/zhengjie/modules/buildrecord/task/SendBigDataTask.java | 4 +++- .../zhengjie/modules/system/service/impl/MenuServiceImpl.java | 2 +- eladmin-system/src/main/resources/config/application-dev.yml | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java index 71dee05..7a71910 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/buildrecord/task/SendBigDataTask.java @@ -64,8 +64,10 @@ public class SendBigDataTask { /** * 每次发送条数限制 + * @change Enzo 2022-8-17 + * 大坝修改单次发送条数1000 */ - private static final int SEND_LIMIT = 5000; + private static final int SEND_LIMIT = 1000; /** * 完成发送任务标识 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java index 386d06c..0984778 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/MenuServiceImpl.java @@ -140,7 +140,7 @@ public class MenuServiceImpl implements MenuService { Menu menu = menuRepository.findById(resources.getId()).orElseGet(Menu::new); ValidationUtil.isNull(menu.getId(),"Permission","id",resources.getId()); - if(resources.getIFrame()){ + if(Boolean.TRUE.equals(resources.getIFrame())){ String http = "http://", https = "https://"; if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) { throw new BadRequestException("外链必须以http://或者https://开头"); diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml index 366d851..330165c 100644 --- a/eladmin-system/src/main/resources/config/application-dev.yml +++ b/eladmin-system/src/main/resources/config/application-dev.yml @@ -244,3 +244,6 @@ remote: file-base-path-linux: /home/eladmin/file/temp/ file-base-path-windows: C:\eladmin\file\temp\ file-base-path-mac: ~/file/eladmin/temp/ +tempFileRecord: + link: + address: 'http://116.62.197.152:8000/api/tempFileRecord/downloadFile'