timi/timi-spring
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: timi:6a57d22366398f545d85b0dcfde0e6c96468bdb5
Branches Tags
timi:master
...
compare: timi:f887079a62dad8cfaaf756776d8d2cb71ea6a399
Branches Tags
timi:master

3 Commits
6a57d22366 ... f887079a62

Author SHA1 Message Date
Timi
f887079a62 catch multilingualHeader exception 2025-11-07 16:56:40 +08:00
Timi
3283c678db fix TimiSpring.getLanguage fail on Chrome 2025-11-07 16:55:59 +08:00
Timi
3eb6bd7df5 log for not prod env 2025-11-07 15:15:41 +08:00
3 changed files with 17 additions and 8 deletions
Expand all files Collapse all files

12
src/main/java/com/imyeyu/spring/TimiSpring.java
View File

@ -20,6 +20,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.List;
import java.util.Locale; import java.util.Locale;
/** /**
@ -351,14 +352,17 @@ public class TimiSpring {
public static Language getLanguage() { public static Language getLanguage() {
String name = getRequestArg("lang"); String name = getRequestArg("lang");
if (TimiJava.isEmpty(name)) { if (TimiJava.isEmpty(name)) {
name = getHeader("Accept-Language"); List<Locale.LanguageRange> rangeList = Locale.LanguageRange.parse(getHeader("Accept-Language"));
for (Locale.LanguageRange item : rangeList) {
if (item.getRange().contains("-")) {
name = item.getRange();
break;
}
}
} }
if (TimiJava.isNotEmpty(name)) { if (TimiJava.isNotEmpty(name)) {
name = name.replace("-", "_"); name = name.replace("-", "_");
} }
if (TimiJava.isEmpty(name)) {
name = getLocale().toString();
}
if (TimiJava.isEmpty(name)) { // use for not support if (TimiJava.isEmpty(name)) { // use for not support
return Language.zh_CN; return Language.zh_CN;
} }

2
src/main/java/com/imyeyu/spring/util/GlobalExceptionHandler.java
View File

@ -89,7 +89,7 @@ public class GlobalExceptionHandler {
@ExceptionHandler(Throwable.class) @ExceptionHandler(Throwable.class)
public TimiResponse<?> error(Throwable e) { public TimiResponse<?> error(Throwable e) {
if (e instanceof TimiException timiE) { if (e instanceof TimiException timiE) {
if (env.startsWith("dev") || log.isDebugEnabled()) { if (!env.startsWith("prod") || log.isDebugEnabled()) {
log.error(timiE.getMessage(), e); log.error(timiE.getMessage(), e);
} }
// 一般异常 // 一般异常

11
src/main/java/com/imyeyu/spring/util/GlobalReturnHandler.java
View File

@ -55,9 +55,14 @@ public class GlobalReturnHandler implements ResponseBodyAdvice<Object> {
} else { } else {
result = new TimiResponse<>(TimiCode.SUCCESS, body); result = new TimiResponse<>(TimiCode.SUCCESS, body);
} }
if (multilingualHeader != null && TimiJava.isNotEmpty(result.getMsgKey())) { try {
result.setMsg(multilingualHeader.handler(result)); if (multilingualHeader != null && TimiJava.isNotEmpty(result.getMsgKey())) {
} else if (TimiJava.isEmpty(result.getMsg())) { result.setMsg(multilingualHeader.handler(result));
} else if (TimiJava.isEmpty(result.getMsg())) {
result.setMsg(TimiCode.fromCode(result.getCode()).toString());
}
} catch (Exception e) {
log.error("multilingual response error", e);
result.setMsg(TimiCode.fromCode(result.getCode()).toString()); result.setMsg(TimiCode.fromCode(result.getCode()).toString());
} }
if (30000 < result.getCode()) { if (30000 < result.getCode()) {