Skip to content

Commit 48ca641

Browse files
committed
feat: log英文化,防止控制台乱码
1 parent 37e0aa9 commit 48ca641

5 files changed

Lines changed: 15 additions & 15 deletions

File tree

framework/src/main/java/top/cadecode/uniboot/framework/aspect/ApiLoggerAspect.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public Object around(ProceedingJoinPoint point) throws Throwable {
6767
}
6868
HttpServletRequest request = attributes.getRequest();
6969
ResponseLogInfo logInfo = generateLogInfo(point, result, request, startTime);
70-
log.info("接口调用日志:{}", JacksonUtil.toJson(logInfo));
70+
log.info("Api log:{}", JacksonUtil.toJson(logInfo));
7171
return result;
7272
}
7373

@@ -83,7 +83,7 @@ public static Map<String, Object> getRequestParams(JoinPoint joinPoint) {
8383
return Collections.emptyMap();
8484
}
8585
if (names.length != args.length) {
86-
log.warn("接口调用日志:方法 [{}] 参数和传值不匹配", methodSignature.getName());
86+
log.warn("Api log:method [{}] param and the pass value do not match", methodSignature.getName());
8787
return Collections.emptyMap();
8888
}
8989
Map<String, Object> map = new HashMap<>();

framework/src/main/java/top/cadecode/uniboot/framework/aspect/DynamicDSAspect.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ public void switchDataSource(JoinPoint point) {
3939
String dataSourceKey = getDataSourceKey(point);
4040
// 设置数据源
4141
if (!DynamicDSHolder.containDataSourceKey(dataSourceKey)) {
42-
log.info("切换数据源失败,{} 不存在", dataSourceKey);
42+
log.info("Switch datasource fail,{} not found", dataSourceKey);
4343
return;
4444
}
4545
DynamicDSHolder.setDataSourceKey(dataSourceKey);
4646
String methodName = point.getSignature().getDeclaringTypeName() + '.' + point.getSignature().getName();
47-
log.info("切换数据源到 {},执行方法 [{}]", dataSourceKey, methodName);
47+
log.info("Switch datasource to {},execute method [{}]", dataSourceKey, methodName);
4848
}
4949

5050
/**
@@ -54,7 +54,7 @@ public void switchDataSource(JoinPoint point) {
5454
public void resetDataSource(JoinPoint point) {
5555
// 将数据源恢复为之前的数据源
5656
DynamicDSHolder.clearDataSourceKey();
57-
log.info("恢复数据源到 {}", DynamicDSHolder.getDataSourceKey());
57+
log.info("Reset datasource to {}", DynamicDSHolder.getDataSourceKey());
5858
}
5959

6060
/**

framework/src/main/java/top/cadecode/uniboot/framework/config/DynamicDSConfig.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ public class DynamicDSConfig {
4343

4444
@Bean
4545
public DynamicDS dynamicDS() {
46-
log.info("检查动态数据源配置");
46+
log.info("Checking dynamic datasource config");
4747
checkDynamicDSConfig();
48-
log.info("开始创建动态数据源");
48+
log.info("Starting to create dynamic datasource");
4949
// 创建数据源
5050
Map<Object, Object> dataSourceMap;
5151
try {
5252
dataSourceMap = datasource.entrySet().stream()
5353
.collect(Collectors.toMap(Entry::getKey, e -> new HikariDataSource(e.getValue())));
5454
} catch (Exception e) {
55-
throw new RuntimeException("创建数据源失败", e);
55+
throw new RuntimeException("Create dynamic datasource fail", e);
5656
}
5757
DynamicDS dynamicDS = new DynamicDS();
5858
// 添加数据源
5959
dynamicDS.setTargetDataSources(dataSourceMap);
6060
// 设置默认数据源
6161
dynamicDS.setDefaultTargetDataSource(dataSourceMap.get(master));
6262
DynamicDSHolder.setDataSourceKey(master);
63-
log.info("创建动态数据源完成,默认数据源设置为 {}", master);
63+
log.info("Create dynamic datasource over,set default to {}", master);
6464
return dynamicDS;
6565
}
6666

@@ -70,11 +70,11 @@ public DynamicDS dynamicDS() {
7070
private void checkDynamicDSConfig() {
7171
// 检查是否配置了数据源
7272
if (Objects.isNull(datasource) || datasource.isEmpty()) {
73-
throw new RuntimeException("找不到数据源配置");
73+
throw new RuntimeException("Dynamic datasource config not found");
7474
}
7575
// 检查是否指定主数据源
7676
if (Objects.isNull(master) || !datasource.containsKey(master)) {
77-
throw new RuntimeException("没有指定主数据源或主数据源不在配置中");
77+
throw new RuntimeException("Not found default datasource config");
7878
}
7979
}
8080
}

framework/src/main/java/top/cadecode/uniboot/framework/config/SecurityConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ protected void configure(HttpSecurity http) throws Exception {
146146
.failureHandler(loginFailureHandler);
147147
// 配置 Token 校验过滤器
148148
http.addFilterBefore(tokenAuthFilter, UsernamePasswordAuthenticationFilter.class);
149-
log.info("完成 Security 配置,认证模式 {}", authModel);
149+
log.info("Config Security over,AuthModel:{}", authModel);
150150
}
151151

152152
@Override
@@ -157,7 +157,7 @@ public void configure(WebSecurity web) {
157157
ignoring.antMatchers("/doc.html", "/webjars/**", "/swagger-resources/**", "/v2/api-docs/**");
158158
// 设置忽略的路径
159159
if (CollUtil.isNotEmpty(ignoreUrls)) {
160-
log.info("配置 Security 放行 {}", ignoreUrls);
160+
log.info("Config Security ignore urls:{}", ignoreUrls);
161161
ignoring.antMatchers(ArrayUtil.toArray(ignoreUrls, String.class));
162162
}
163163
}

framework/src/main/java/top/cadecode/uniboot/framework/config/SwaggerConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ public class SwaggerConfig implements WebMvcConfigurer, ApplicationContextAware
7979
*/
8080
@PostConstruct
8181
public void init() {
82-
log.info("开始配置 Swagger dockets");
82+
log.info("Starting to config swagger dockets");
8383
if (Objects.isNull(module) || Objects.isNull(applicationContext)) {
84-
log.info("没有找到 Swagger dockets 相关配置");
84+
log.info("Swagger dockets config not found");
8585
return;
8686
}
8787
// 获取 BeanFactory,动态注册 Docket

0 commit comments

Comments
 (0)