From 41fc3d69e920ca286591352f7f6d03ccaad1e794 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 26 九月 2025 15:42:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java
index be7c7fc..a585afc 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemMonitorCloudController.java
@@ -1,14 +1,14 @@
package com.doumee.api.cloud;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
+import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Monitor;
import com.doumee.core.utils.Utils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,12 +21,12 @@
@Api(tags = "绯荤粺鐩戝惉")
@Trace(exclude = true)
@RestController
-@RequestMapping("/cloudService/system/monitor")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/monitor")
public class SystemMonitorCloudController extends BaseController {
@ApiOperation("鑾峰彇绯荤粺淇℃伅")
@GetMapping("/getSystemInfo")
- @RequiresPermissions("system:monitor:query")
+ @CloudRequiredPermission("system:monitor:query")
public ApiResponse<Monitor> getSystemInfo (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(Utils.Monitor.current());
}
--
Gitblit v1.9.3