feat(redis订阅模块): 改用hutool

src/main/java/com/macro/mall/tiny/modules/business/controller/FileController.java

@@ -20,6 +20,7 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.compress.parallel.InputStreamSupplier;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.validation.annotation.Validated;
@@ -214,7 +215,8 @@ public class FileController {
 
     @ApiOperation("文件删除接口")
     @PostMapping("/delete")
-    public CommonResult<String> delete(@RequestBody Map<String,String> params) throws IOException {
+    @RequiresPermissions(ShiroAuthUtil.EDIT)
+    public CommonResult<String> delete(@RequestBody Map<String, String> params) throws IOException {
         boolean deleteFile = fileService.deleteFile(params.get("path"));
         return deleteFile ? CommonResult.success("删除成功") : CommonResult.failed("删除失败");
     }

src/main/java/com/macro/mall/tiny/modules/business/service/RedisSubscribeListener.java

@@ -1,17 +1,13 @@
 package com.macro.mall.tiny.modules.business.service;
 
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
 import org.springframework.stereotype.Component;
 
 import javax.websocket.Session;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Set;
 
 /**
@@ -35,9 +31,9 @@ public class RedisSubscribeListener implements MessageListener {
      */
     @Override
     public void onMessage(Message message, byte[] bytes) {
-        String msg = JSON.parseObject(message.getBody(), String.class);
+        String msg = new String(message.getBody());
         log.debug("[{}]主题发布：{}", new String(bytes), msg);
-        String deviceMac = JSON.parseObject(msg).getString("deviceMac");
+        String deviceMac = JSONUtil.parseObj(msg).getStr("deviceMac");
         if (session != null && session.isOpen()) {
             if (!sensorMacSet.contains(deviceMac)) {
                 return;

src/main/java/com/macro/mall/tiny/modules/business/service/impl/FileServiceImpl.java

@@ -128,11 +128,11 @@ public class FileServiceImpl implements FileService {
 
     @Override
     public boolean deleteFile(String path) throws IOException {
-        boolean delete = ShiroAuthUtil.checkAccess(ShiroAuthUtil.EDIT);
+//        boolean delete = ShiroAuthUtil.checkAccess(ShiroAuthUtil.EDIT);
+//        if (!delete) {
+//            Asserts.fail("您没有删除权限");
+//        }
         Path filePath = Paths.get(path);
-        if (!delete) {
-            Asserts.fail("您没有删除权限");
-        }
         if (!Files.exists(filePath)) {
             Asserts.fail("该文件不存在");
         }

src/main/resources/config/bootstrap.yml

@@ -16,4 +16,19 @@ spring:
 
 keystar:
   eprdms:
-    url: http://120.237.146.228:18060
+    url: http://120.237.146.228:18060
+
+com:
+  keystar:
+    shiro:
+      anon-urls:
+        - /swagger-ui.html
+        - /swagger-resources/**
+        - /swagger/**
+        - /**/v2/api-docs
+        - /webjars/springfox-swagger-ui/**
+        - /actuator/**
+        - /druid/**
+        - /line/findByKeySimple
+        - /line/detail/**
+        - /device/**