yuhaiming/water
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备心跳调整 app新增增设备时绑定联网设备

Browse Source
This commit is contained in:
yuhaiming
2026-06-13 10:51:45 +08:00
parent c7f9df980a
commit c74363afa4
65 changed files with 1622 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
water-common/water-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java
View File

@@ -1,9 +1,10 @@
package org.dromara.common.web.core;
import org.springframework.web.servlet.LocaleResolver;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.dromara.common.core.utils.StringUtils;
import org.springframework.web.servlet.LocaleResolver;
import java.util.Locale;
/**
@@ -16,12 +17,24 @@ public class I18nLocaleResolver implements LocaleResolver {
@Override
public Locale resolveLocale(HttpServletRequest httpServletRequest) {
String language = httpServletRequest.getHeader("content-language");
Locale locale = Locale.getDefault();
if (language != null && language.length() > 0) {
String[] split = language.split("_");
locale = new Locale(split[0], split[1]);
if (StringUtils.isBlank(language)) {
language = httpServletRequest.getParameter("lang");
}
return locale;
if (StringUtils.isBlank(language)) {
language = httpServletRequest.getHeader("Accept-Language");
}
if (StringUtils.isBlank(language)) {
return Locale.SIMPLIFIED_CHINESE;
}
String languageTag = language.split(",")[0].trim().replace('_', '-');
if ("zh".equalsIgnoreCase(languageTag)) {
return Locale.SIMPLIFIED_CHINESE;
}
if ("en".equalsIgnoreCase(languageTag)) {
return Locale.US;
}
Locale locale = Locale.forLanguageTag(languageTag);
return StringUtils.isBlank(locale.getLanguage()) ? Locale.SIMPLIFIED_CHINESE : locale;
}
@Override

8
water-common/water-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
View File

@@ -51,16 +51,16 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
jsonParam = rootNode.toString();
}
}
log.info("[PLUS]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
log.info("[请求]开始请求 => URL[{}],参数类型[JSON],参数:[{}]", url, jsonParam);
} else {
Map<String, String[]> parameterMap = request.getParameterMap();
if (MapUtil.isNotEmpty(parameterMap)) {
Map<String, String[]> map = new LinkedHashMap<>(parameterMap);
MapUtil.removeAny(map, SystemConstants.EXCLUDE_PROPERTIES);
String parameters = JsonUtils.toJsonString(map);
log.info("[PLUS]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
log.info("[请求]开始请求 => URL[{}],参数类型[表单参数],参数:[{}]", url, parameters);
} else {
log.info("[PLUS]开始请求 => URL[{}],无参数", url);
log.info("[请求]开始请求 => URL[{}],无参数", url);
}
}
@@ -105,7 +105,7 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
StopWatch stopWatch = KEY_CACHE.get();
if (ObjectUtil.isNotNull(stopWatch)) {
stopWatch.stop();
log.info("[PLUS]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getDuration().toMillis());
log.info("[请求]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getDuration().toMillis());
KEY_CACHE.remove();
}
}