فهرست منبع

fix: 人员导出-上传oss文件路径问题

lixuesong 1 هفته پیش
والد
کامیت
b0869673a3

+ 6 - 5
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/SysUserExportServiceImpl.java

@@ -137,7 +137,7 @@ public class SysUserExportServiceImpl implements SysUserExportService {
 		// 临时文件路径
 		String tempPath = OsEnvUtils.getEachEnvPaths().get(OsEnvUtils.TargetFile.TEMP.getName());
 		// 缓存文件名
-		String fileName = tempPath + "人员_" + DateTimeFormatter.ofPattern(DatePattern.PURE_DATE_PATTERN)
+		String fileName = "人员_" + DateTimeFormatter.ofPattern(DatePattern.PURE_DATE_PATTERN)
 				.format(LocalDateTime.now()) + RandomStringUtils.randomNumeric(6) + ".xlsx";
 
 		// 查询用户列表
@@ -215,12 +215,13 @@ public class SysUserExportServiceImpl implements SysUserExportService {
 				return excelModel;
 			}).collect(Collectors.toList());
 
+			String fullPath = tempPath + fileName;
 			// 写入excel文件
-			EasyExcel.write(fileName, SysUserExcelModel.class).sheet("人员")
+			EasyExcel.write(fullPath, SysUserExcelModel.class).sheet("人员")
 					.doWrite(excelModels);
-			log.info("人员导出生成缓存文件:{}", fileName);
+			log.info("人员导出生成缓存文件:{}", fullPath);
 
-			FileInputStream inputStream = new FileInputStream(fileName);
+			FileInputStream inputStream = new FileInputStream(fullPath);
 			// 上传oss
 			Map<String, String> uploadResult = fileService.upload(inputStream, fileName, fileName, user.getUsername());
 			inputStream.close();
@@ -407,7 +408,7 @@ public class SysUserExportServiceImpl implements SysUserExportService {
 				opt.setErrorMsg(o.split(StrUtil.UNDERLINE)[1]);
 			}
 			// 生成失败的2
-			else if (!o.startsWith("http")) {
+			else if (!o.startsWith("/admin/sys-file")) {
 				opt.setStatus(WmReportOpt.WmReportOptStatus.ERROR);
 				opt.setErrorMsg(o);
 			}