diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java b/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java index 4d799df..3920508 100644 --- a/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java +++ b/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java @@ -8,6 +8,7 @@ import org.springframework.data.domain.Pageable; import java.util.Collections; import java.util.List; import java.util.Optional; +import java.util.function.Consumer; import java.util.function.Function; /** @@ -53,6 +54,11 @@ public class Result { return new Result<>(SUCCESS, MSG_SUCCESS, data); } + public Result end(Runnable runnable) { + runnable.run(); + return this; + } + /** * 单个元素,附带分页信息,分页数据写死 * diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogManager.java b/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogManager.java index d48486a..c30ff6e 100644 --- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogManager.java +++ b/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogManager.java @@ -17,8 +17,8 @@ import org.aspectj.lang.reflect.MethodSignature; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.data.util.CastUtils; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.RequestMapping; +import javax.annotation.Resource; import java.util.Optional; /** @@ -30,6 +30,9 @@ import java.util.Optional; @Slf4j public class LogManager { + @Resource + private LogService logService; + /** * 尝试记录日志 * @@ -67,13 +70,10 @@ public class LogManager { log.setResponse(Optional.ofNullable(result).map(JSON::toJSONString).orElse(null)); log.setOperator(UserContext.sharedContext().map(UserContext::currentUser).map(Domain::getName).orElse("未知")); log.setSignature(joinPoint.getSignature().getName()); - log.setUri(Optional.ofNullable(AnnotationUtils.findAnnotation(targetClass, RequestMapping.class)) - .map(mapping -> mapping.value()) - .filter(ArrayUtils::isNotEmpty) - .map(array -> array[0]) - ); + // 先不拼接 + log.setUri(null); // 写入日志 - logService.create() + logService.create(log); } } } diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/BaseController.java b/flyfish-web/src/main/java/com/flyfish/framework/controller/BaseController.java index eeec1e6..3315301 100644 --- a/flyfish-web/src/main/java/com/flyfish/framework/controller/BaseController.java +++ b/flyfish-web/src/main/java/com/flyfish/framework/controller/BaseController.java @@ -84,7 +84,8 @@ public abstract class BaseController> implemen @DeleteMapping("{id}") @Operation.Delete - public Result remove(@PathVariable String id) { + public Result remove(@PathVariable String id, @CurrentUser User user) { + userContext.setUser(user); service.deleteById(id); return Result.ok(); }