From db0b9dbdf636a65aef544de0cfc30b3b9b9f164c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 25 Jun 2024 10:13:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E7=9A=84=E8=A7=86=E5=9B=BE=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=20Excel=20=E4=BB=BB=E5=8A=A1=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4de=20=E6=97=A0=E6=B3=95=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/exportCenter/ExportCenterService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java index dfdf62e4ec..4e456f9c2e 100644 --- a/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java +++ b/core/backend/src/main/java/io/dataease/service/exportCenter/ExportCenterService.java @@ -3,6 +3,7 @@ package io.dataease.service.exportCenter; import com.google.gson.Gson; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.service.AuthUserService; +import io.dataease.auth.service.ProxyAuthService; import io.dataease.commons.constants.ParamConstants; import io.dataease.commons.constants.SysLogConstants; import io.dataease.commons.utils.*; @@ -126,7 +127,7 @@ public class ExportCenterService { private int keepAliveSeconds = 600; private Map Running_Task = new HashMap<>(); @Resource - private AuthUserService authUserService; + private ProxyAuthService proxyAuthService; @Autowired private WsService wsService; @@ -399,9 +400,9 @@ public class ExportCenterService { String dataPath = exportData_path + exportTask.getId(); File directory = new File(dataPath); boolean isCreated = directory.mkdir(); - CurrentUserDto currentUserDto = (CurrentUserDto) authUserService.getUserById(exportTask.getUserId()); + CurrentUserDto user = proxyAuthService.queryCacheUserDto(exportTask.getUserId()); Future future = scheduledThreadPoolExecutor.submit(() -> { - AuthUtils.setUser(currentUserDto); + AuthUtils.setUser(user); try { exportTask.setExportStatus("IN_PROGRESS"); exportTaskMapper.updateByPrimaryKey(exportTask); @@ -555,7 +556,7 @@ public class ExportCenterService { } wb.close(); - if (ObjectUtils.isNotEmpty(currentUserDto)) { + if (ObjectUtils.isNotEmpty(user)) { String viewId = request.getViewId(); ChartViewWithBLOBs chartViewWithBLOBs = chartViewService.get(viewId); String pid = chartViewWithBLOBs.getSceneId(); @@ -598,7 +599,8 @@ public class ExportCenterService { String dataPath = exportData_path + exportTask.getId(); File directory = new File(dataPath); boolean isCreated = directory.mkdir(); - CurrentUserDto user = (CurrentUserDto) authUserService.getUserById(exportTask.getUserId()); + CurrentUserDto user = proxyAuthService.queryCacheUserDto(exportTask.getUserId()); + Future future = scheduledThreadPoolExecutor.submit(() -> { AuthUtils.setUser(user); try {