diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/SysCommonController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/SysCommonController.java index 9d97100f..8dd7fcdd 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/SysCommonController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/SysCommonController.java @@ -3,11 +3,9 @@ package com.jero.modules.sys.controller; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.common.util.IntekeyUtils; import com.jero.common.util.MinioUtil; -import com.jero.common.util.RedisUtil; import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; @@ -54,9 +52,6 @@ public class SysCommonController { @Resource private EnterpriseStandardAuthUserService authUserService; - @Resource - private RedisUtil redisUtil; - /** * 下载文件 @@ -103,28 +98,9 @@ public class SysCommonController { */ @GetMapping(value = "/view/{id}") public void view(@PathVariable String id, HttpServletRequest request, HttpServletResponse response) { - if (!this.viewAuth(request)) { - noAuthFile(response, "预览无权限.pdf"); - return; - } downloadAndViewWithWaterMark(id, response); } - - private boolean viewAuth(HttpServletRequest request) { - String token = request.getHeader(CommonConstant.X_ACCESS_TOKEN); - String at = request.getParameter(CommonConstant.AT); - if (StrUtil.isBlank(at)) { - return false; - } - if (StrUtil.isBlank(token)) { - // 判断是否是外部系统对接的账户 - Object o = redisUtil.get(at + "-X"); - return null != o; - } - return at.equals(token); - } - private void downloadAndViewWithWaterMark(@PathVariable String id, HttpServletResponse response) { // 查询数据表数据是否存在 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -141,8 +117,21 @@ public class SysCommonController { String userId = UserUtils.getUserId(); boolean auth = authUserService.detailPermissionByUser(standardId, null, userId); if (!auth) { - noAuthFile(response, "暂无该文件查看权限.pdf"); - return; + // 返回固定无权限pdf模板 + try (InputStream inputStream = new ClassPathResource("pdfTemplate/暂无该文件查看权限.pdf").getInputStream(); + OutputStream outputStream = response.getOutputStream() + ) { + byte[] buf = new byte[1024]; + int len; + while ((len = inputStream.read(buf)) > 0) { + outputStream.write(buf, 0, len); + } + response.flushBuffer(); + return; + } catch (Exception e) { + log.error(e.getMessage()); + response.setStatus(404); + } } } } @@ -210,21 +199,4 @@ public class SysCommonController { } - private static void noAuthFile(HttpServletResponse response, String fileName) { - // 返回固定无权限pdf模板 - try (InputStream inputStream = new ClassPathResource("pdfTemplate/" + fileName).getInputStream(); - OutputStream outputStream = response.getOutputStream() - ) { - byte[] buf = new byte[1024]; - int len; - while ((len = inputStream.read(buf)) > 0) { - outputStream.write(buf, 0, len); - } - response.flushBuffer(); - } catch (Exception e) { - log.error(e.getMessage()); - response.setStatus(404); - } - } - } diff --git a/laws-modules/src/main/resources/pdfTemplate/预览无权限.pdf b/laws-modules/src/main/resources/pdfTemplate/预览无权限.pdf deleted file mode 100644 index 5f5392e1..00000000 Binary files a/laws-modules/src/main/resources/pdfTemplate/预览无权限.pdf and /dev/null differ