From f33ecdedbfbb940ba5a3f4177701b09fc5402049 Mon Sep 17 00:00:00 2001 From: George Date: Sun, 4 Jan 2026 21:01:43 +0800 Subject: [PATCH] =?UTF-8?q?20260104:=201=E3=80=81=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/monitor/ServerController.java | 2 +- .../monitor/SysLogininforController.java | 2 +- .../controller/system/SysUserController.java | 2 +- .../src/main/resources/application-prod.yml | 2 +- fastbee-admin/src/main/resources/logback.xml | 50 +++++++++++-------- .../controller/device/DeviceController.java | 4 +- .../deviceConfig/GroupController.java | 2 +- .../deviceConfig/ThingsModelController.java | 2 +- .../deviceLog/AlertLogController.java | 2 +- .../sceneModel/SceneModelController.java | 2 +- 10 files changed, 40 insertions(+), 30 deletions(-) diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java index 86c90345..acb33dcc 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/ServerController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/monitor/server") public class ServerController { @ApiOperation("获取服务器信息") - @PreAuthorize("@ss.hasPermi('monitor:server:list')") + @PreAuthorize("@ss.hasAnyPermi('monitor:server:list,iot:device:list')") @GetMapping() public AjaxResult getInfo() throws Exception { Server server = new Server(); diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java index 72999978..6033c8c7 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/monitor/SysLogininforController.java @@ -79,7 +79,7 @@ public class SysLogininforController extends BaseController { } @ApiOperation("获取一周内每天用户统计") - @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')") + @PreAuthorize("@ss.hasAnyPermi('monitor:logininfor:list,iot:device:list')") @GetMapping("/userCount") public AjaxResult userCount() { return toAjax(logininforService.getUserCount()); diff --git a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java index 1e89183f..cd653c42 100644 --- a/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java +++ b/fastbee-admin/src/main/java/com/fastbee/web/controller/system/SysUserController.java @@ -245,7 +245,7 @@ public class SysUserController extends BaseController { * 获取部门树列表 */ @ApiOperation("获取部门树列表") - @PreAuthorize("@ss.hasPermi('system:user:list')") + @PreAuthorize("@ss.hasAnyPermi('system:user:list,iot:device:list')") @GetMapping("/deptTree") public AjaxResult deptTree(SysDept dept) { return success(deptService.selectDeptTreeList(dept)); diff --git a/fastbee-admin/src/main/resources/application-prod.yml b/fastbee-admin/src/main/resources/application-prod.yml index e831169c..e85c8171 100644 --- a/fastbee-admin/src/main/resources/application-prod.yml +++ b/fastbee-admin/src/main/resources/application-prod.yml @@ -141,7 +141,7 @@ sip: # 日志配置 logging: level: - com.fastbee: info + com.fastbee: debug com.yomahub: warn org.dromara: warn org.springframework: warn diff --git a/fastbee-admin/src/main/resources/logback.xml b/fastbee-admin/src/main/resources/logback.xml index ef1ca00e..3489f2bb 100644 --- a/fastbee-admin/src/main/resources/logback.xml +++ b/fastbee-admin/src/main/resources/logback.xml @@ -13,73 +13,75 @@ - + + - ${log.path}/sys-debug.%d{yyyy-MM-dd}.log - 10 ${log.pattern} - DEBUG - ACCEPT - DENY - ${log.path}/sys-info.log - - ${log.path}/sys-info.%d{yyyy-MM-dd}.log - 10 ${log.pattern} - INFO - ACCEPT - DENY ${log.path}/sys-error.log - - ${log.path}/sys-error.%d{yyyy-MM-dd}.log - 10 ${log.pattern} - ERROR - ACCEPT - DENY + --> + + + + ${log.path}/sys-all.log + + + + ${log.path}/sys-all.%d{yyyy-MM-dd}.log + + 10 + + + ${log.pattern} + + + + DEBUG + + @@ -138,11 +140,19 @@ + + + + + + + diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java index 456ed634..adbb89d0 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/device/DeviceController.java @@ -468,8 +468,8 @@ public class DeviceController extends BaseController { try { Long userId = getUserId(); String cacheKey = CacheConstants.DEVICE_DEBUG_USER_KEY + userId; - // 设置标志，过期时间30分钟（防止页面异常关闭导致标志未清除） - redisCache.setCacheObject(cacheKey, "1", 30, TimeUnit.MINUTES); + // 设置标志，过期时间7天（防止页面异常关闭导致标志未清除） + redisCache.setCacheObject(cacheKey, "1", 7, TimeUnit.DAYS); return AjaxResult.success("已开启调试日志记录"); } catch (Exception e) { return AjaxResult.error("开启调试日志记录失败：" + e.getMessage()); diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/GroupController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/GroupController.java index e018402e..a7b1f06e 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/GroupController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/GroupController.java @@ -34,7 +34,7 @@ public class GroupController extends BaseController { /** * 查询设备分组列表 */ - @PreAuthorize("@ss.hasPermi('iot:group:list')") + @PreAuthorize("@ss.hasAnyPermi('iot:group:list,iot:device:list')") @GetMapping("/list") @ApiOperation("分组分页列表") public TableDataInfo list(Group group) { diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelController.java index 43986be4..565a5850 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceConfig/ThingsModelController.java @@ -136,7 +136,7 @@ public class ThingsModelController extends BaseController { /** * 获取缓存的JSON物模型 */ - @PreAuthorize("@ss.hasPermi('iot:model:query')") + @PreAuthorize("@ss.hasAnyPermi('iot:model:query,iot:device:list')") @GetMapping(value = "/cache/{productId}") @ApiOperation("获取缓存的JSON物模型") public AjaxResult getCacheThingsModelByProductId(@PathVariable("productId") Long productId) { diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/AlertLogController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/AlertLogController.java index 7583238e..61851045 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/AlertLogController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/deviceLog/AlertLogController.java @@ -34,7 +34,7 @@ public class AlertLogController extends BaseController { * 查询设备告警列表 */ @ApiOperation("查询设备告警列表") - @PreAuthorize("@ss.hasPermi('iot:alertLog:list')") + @PreAuthorize("@ss.hasAnyPermi('iot:alertLog:list,iot:device:list')") @GetMapping("/list") public TableDataInfo list(AlertLog alertLog) { startPage(); diff --git a/fastbee-open-api/src/main/java/com/fastbee/controller/sceneModel/SceneModelController.java b/fastbee-open-api/src/main/java/com/fastbee/controller/sceneModel/SceneModelController.java index 962a30c6..a02c680c 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/controller/sceneModel/SceneModelController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/controller/sceneModel/SceneModelController.java @@ -33,7 +33,7 @@ public class SceneModelController extends BaseController { /** * 查询场景管理列表 */ - @PreAuthorize("@ss.hasPermi('scene:model:list')") + @PreAuthorize("@ss.hasAnyPermi('scene:model:list,iot:device:list')") @GetMapping("/list") @ApiOperation("查询场景管理列表") public TableDataInfo list(SceneModel sceneModel) {