diff --git a/src/main/java/com/imyeyu/spring/util/GlobalReturnHandler.java b/src/main/java/com/imyeyu/spring/util/GlobalReturnHandler.java index 19aa52d..d18f411 100644 --- a/src/main/java/com/imyeyu/spring/util/GlobalReturnHandler.java +++ b/src/main/java/com/imyeyu/spring/util/GlobalReturnHandler.java @@ -2,6 +2,7 @@ package com.imyeyu.spring.util; import com.imyeyu.java.TimiJava; import com.imyeyu.java.bean.CallbackArgReturn; +import com.imyeyu.java.bean.LanguageMsgMapping; import com.imyeyu.java.bean.timi.TimiCode; import com.imyeyu.java.bean.timi.TimiResponse; import com.imyeyu.spring.TimiSpring; @@ -31,7 +32,7 @@ public class GlobalReturnHandler implements ResponseBodyAdvice { private static final Logger log = LoggerFactory.getLogger(GlobalReturnHandler.class); - private CallbackArgReturn multilingualHeader; + private CallbackArgReturn, String> multilingualHeader; @Override public boolean supports(@NonNull MethodParameter returnType, @NonNull Class> converterType) { @@ -55,7 +56,7 @@ public class GlobalReturnHandler implements ResponseBodyAdvice { result = new TimiResponse<>(TimiCode.SUCCESS, body); } if (multilingualHeader != null && TimiJava.isNotEmpty(result.getMsgKey())) { - result.setMsg(multilingualHeader.handler(result.getMsgKey())); + result.setMsg(multilingualHeader.handler(result)); } else if (TimiJava.isEmpty(result.getMsg())) { result.setMsg(TimiCode.fromCode(result.getCode()).toString()); } @@ -65,11 +66,11 @@ public class GlobalReturnHandler implements ResponseBodyAdvice { return result; } - public CallbackArgReturn getMultilingualHeader() { + public CallbackArgReturn, String> getMultilingualHeader() { return multilingualHeader; } - public void setMultilingualHeader(CallbackArgReturn multilingualHeader) { + public void setMultilingualHeader(CallbackArgReturn, String> multilingualHeader) { this.multilingualHeader = multilingualHeader; } }