Преглед изворни кода

更新日志配置;更新消息国际化配置;

woody пре 1 година
родитељ
комит
71fe426ff9

+ 1 - 3
src/main/java/com/chelvc/cloud/maintain/controller/FileController.java

@@ -45,9 +45,7 @@ public class FileController {
         try {
             type = StringUtils.ifEmpty(file.getContentType(), MediaType::parseMediaType);
         } catch (Exception e) {
-            if (log.isDebugEnabled()) {
-                log.debug("Media type parse failed: {}", e.getMessage());
-            }
+            log.debug("Media type parse failed: {}", e.getMessage());
         }
         String value = StringUtils.ifEmpty(StringUtils.ifEmpty(type, MediaType::getType), String::toUpperCase);
         return ObjectUtils.ifNull(StringUtils.ifEmpty(value, Media::parse), Media.NORMAL);

+ 2 - 0
src/main/resources/application.yml

@@ -12,6 +12,8 @@ spring:
     time-zone: GMT+8
     serialization:
       write-dates-as-timestamps: true
+  messages:
+    basename: i18n/messages
   cloud:
     nacos:
       discovery:

+ 9 - 0
src/main/resources/i18n/messages.properties

@@ -0,0 +1,9 @@
+ADMIN=管理端
+CUSTOMER=顾客端
+MERCHANT=商家端
+Time.Deviated=请校准系统时间
+Token.Expired=当前会话已失效,请重新登陆
+Token.Changed=您的账号已在其他设备登陆
+Scope.Changed=您的应用已切换到【{0}】
+SMS.Count.Limit=短信发送次数已达上限
+SMS.Frequency.Limit=短信发送过于频繁,请稍后再试

+ 2 - 2
src/main/resources/logback-spring.xml

@@ -4,8 +4,9 @@
 
 	<springProperty name="LOG_PATH" source="logging.path" defaultValue="./"/>
 
+	<turboFilter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
+
 	<appender name="CONSOLE_APPENDER" class="ch.qos.logback.core.ConsoleAppender">
-		<filter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n</pattern>
 			<charset>UTF-8</charset>
@@ -14,7 +15,6 @@
 
 	<appender name="FILE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${LOG_PATH}/maintain.log</file>
-		<filter class="com.chelvc.framework.base.interceptor.DynamicLoggingInterceptor"/>
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger: %msg%n</pattern>
 			<charset>UTF-8</charset>