tsurumure пре 2 месеци
родитељ
комит
15d75d2ffa

+ 0 - 3
src/main/java/com/backendsys/config/Mybatis/handler/timezone/LocalDateTimeHandler.java

@@ -48,9 +48,6 @@ public class LocalDateTimeHandler extends BaseTypeHandler<LocalDateTime> {
         return convertToLocalDateTime(timestamp);
     }
 
-    /**
-     * 设置时区(如果为空则默认使用上海时区)
-     */
     private LocalDateTime convertToLocalDateTime(java.sql.Timestamp timestamp) {
         if (timestamp == null) return null;
         return timestamp.toInstant()

+ 1 - 4
src/main/java/com/backendsys/modules/cms/article/entity/Article.java

@@ -2,10 +2,7 @@ package com.backendsys.modules.cms.article.entity;
 
 import com.backendsys.config.Mybatis.handler.timezone.LocalDateTimeAdapter;
 import com.backendsys.entity.validator.RangeArray;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.google.gson.annotations.JsonAdapter;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;

+ 7 - 2
src/main/java/com/backendsys/modules/common/interceptor/TimezoneInterceptor.java

@@ -1,5 +1,7 @@
 package com.backendsys.modules.common.interceptor;
 import com.backendsys.config.Mybatis.handler.timezone.TimezoneContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 
@@ -10,13 +12,16 @@ import java.util.Optional;
 @Component
 public class TimezoneInterceptor implements HandlerInterceptor {
 
+    @Value("${DEFAULT_TIME_ZONE}")
+    private String DEFAULT_TIME_ZONE;
+
     /**
-     * 如果没有传递 timezone,则默认使用 Asia/Shanghai (默认时区)
+     * 如果没有传递 timezone,则默认使用 (默认时区)
      */
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         String timezone = request.getHeader("timezone");
-        String finalTimezone = Optional.ofNullable(timezone).orElse("Asia/Shanghai");
+        String finalTimezone = Optional.ofNullable(timezone).orElse(DEFAULT_TIME_ZONE);
         // 将 timezone 存储在 ThreadLocal 中
         TimezoneContextHolder.setTimeZone(finalTimezone);
         return true;

+ 4 - 0
src/main/java/com/backendsys/modules/sdk/volcengine/service/impl/VolcengineServiceImpl.java

@@ -12,6 +12,10 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 
+/**
+ * 通用返回字段及错误码
+ * https://www.volcengine.com/docs/6444/69728
+ */
 @Service
 public class VolcengineServiceImpl implements VolcengineService {
 

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

@@ -28,8 +28,6 @@ spring:
 #          max-idle: 8       # 最大空闲连接,默认8
 #          min-idle: 0       # 最小空闲连接,默认0
 
-
-
   web:
     resources:
       static-locations: classpath:/static/
@@ -148,6 +146,9 @@ whitelist:
 # [语言]
 DEFAULT_LANGUAGE: zh
 
+# [时区]
+DEFAULT_TIME_ZONE: Asia/Shanghai
+
 # [安全] 图形验证码 过期时间 60 秒
 CAPTCHA_DURATION: 60000