Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

报表服务新增入参/枚举/错误码i18n国际化整理

Browse Source
This commit is contained in:
gaoqr
2025-12-04 15:20:47 +08:00
parent 24e192a895
commit 4240b1ca1f
37 changed files with 320 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/constants/ResourceBundleConstants.java
+5
View File
@@ -7,6 +7,11 @@ package com.cf.imes.framework.common.constants;
* @since 2025/11/21 11:33
*/
public final class ResourceBundleConstants {
/**
* 错误码资源包
*/
public static final String MESSAGE_ERROR_PATH = "message_errorcode";
/**
* 枚举资源包
*/
cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/i18n/core/util/I18nUtils.java
+14
View File
@@ -6,6 +6,8 @@ import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.stereotype.Component;
import java.util.Locale;
/**
* 国际化工具类
*
@@ -29,4 +31,16 @@ public class I18nUtils {
public String getMessage(String code, Object... args) {
return messageSource.getMessage(code, args, code, LocaleContextHolder.getLocale());
}
/**
* 获取国际化描述
*
* @param locale
* @param code
* @param args
* @return
*/
public String getMessage(Locale locale, String code, Object... args) {
return messageSource.getMessage(code, args, code, locale);
}
}
cf-framework/cf-common/src/main/java/com/cf/imes/framework/common/util/i18n/core/util/ResourceBundleUtils.java
+1 -1
View File
@@ -25,7 +25,7 @@ public class ResourceBundleUtils {
* @param args 占位符数组
* @return
*/
public static String getMessage(String baseName, String key, String defaultMessage, Locale locale, Object args) {
public static String getMessage(String baseName, String key, String defaultMessage, Locale locale, Object... args) {
try {
ResourceBundle messageEnum = ResourceBundle.getBundle(baseName, locale);
if (messageEnum != null) {
cf-framework/cf-spring-boot-starter-web/src/main/java/com/cf/imes/framework/web/core/filter/DataSourceFilter.java
+5 -3
View File
@@ -2,8 +2,8 @@ package com.cf.imes.framework.web.core.filter;
import cn.hutool.core.text.CharSequenceUtil;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants;
import com.cf.imes.framework.common.pojo.CommonResult;
import com.cf.imes.framework.common.util.i18n.core.util.ResourceBundleUtils;
import com.cf.imes.framework.common.util.servlet.ServletUtils;
import com.cf.imes.framework.web.config.WebProperties;
import lombok.extern.slf4j.Slf4j;
@@ -14,6 +14,9 @@ import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import static com.cf.imes.framework.common.constants.ResourceBundleConstants.MESSAGE_ERROR_PATH;
import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.UNAUTHORIZED;
/**
* @author there
* 多数据源过滤器
@@ -27,7 +30,6 @@ public class DataSourceFilter extends OncePerRequestFilter {
*/
public static final String AUTHORIZATION_BEARER = "Bearer";
private WebProperties webProperties;
public DataSourceFilter (WebProperties webProperties) {
@@ -46,7 +48,7 @@ public class DataSourceFilter extends OncePerRequestFilter {
String dataCode = request.getHeader(DATA_SOURCE_CODE);
if(CharSequenceUtil.isEmpty(dataCode)) {
//TODO 如果要严谨一点，应该再去校验一下token
ServletUtils.writeJSON(response, CommonResult.error(GlobalErrorCodeConstants.UNAUTHORIZED.getCode(), "访问令牌已过期"));
ServletUtils.writeJSON(response, CommonResult.error(UNAUTHORIZED.getCode(), ResourceBundleUtils.getMessage(MESSAGE_ERROR_PATH, UNAUTHORIZED.getMsg(), UNAUTHORIZED.getMsg(), request.getLocale())));
log.info("Let the user log in because there is no data-code! requestURI==>{}", request.getRequestURI());
return;
}