diff --git a/das/src/main/java/com/das/modules/admin/controller/LoggerController.java b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java index 32edcfa6..cf41ce9a 100644 --- a/das/src/main/java/com/das/modules/admin/controller/LoggerController.java +++ b/das/src/main/java/com/das/modules/admin/controller/LoggerController.java @@ -1,5 +1,6 @@ package com.das.modules.admin.controller; +import com.das.common.result.R; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.LoggerContext; @@ -21,13 +22,13 @@ public class LoggerController { * @return 当前所有日志级别 */ @GetMapping("/list") - public Map listLogLevels() { + public R> listLogLevels() { LoggerContext context = (LoggerContext) LogManager.getContext(false); - return context.getConfiguration().getLoggers().values().stream() + return R.success(context.getConfiguration().getLoggers().values().stream() .collect(Collectors.toMap( LoggerConfig::getName, loggerConfig -> loggerConfig.getLevel().toString() - )); + ))); } /** @@ -38,14 +39,14 @@ public class LoggerController { * @return 更新结果 */ @PostMapping("/update") - public String updateLogLevel(String loggerName, String level) { + public R updateLogLevel(String loggerName, String level) { try { Configurator.setLevel(loggerName, org.apache.logging.log4j.Level.valueOf(level.toUpperCase())); logger.info("Updated logger [{}] to level [{}]", loggerName, level); - return String.format("Logger [%s] updated to level [%s]", loggerName, level); + return R.success( String.format("Logger [%s] updated to level [%s]", loggerName, level)); } catch (IllegalArgumentException e) { logger.error("Invalid log level [{}]", level, e); - return String.format("Invalid log level [%s]. Valid levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL.", level); + return R.fail(String.format("Invalid log level [%s]. Valid levels: TRACE, DEBUG, INFO, WARN, ERROR, FATAL.", level)); } } } \ No newline at end of file