feat(i18n): i18n 支持

Author: svnlab

easyfile-example/easyfile-example-local/src/main/java/com/openquartz/easyfile/example/model/Address.java

@@ -10,10 +10,11 @@
 @Data
 public class Address {
 
-    @ExcelProperty(value = "地址", width = 8 * 512)
+    @ExcelProperty(value = "${student.addr.addressName}", width = 8 * 512)
     private String addressName;
 
-    @ExcelProperty(value = "过期时间", width = 8 * 1024)
+    // 过期时间
+    @ExcelProperty(value = "${student.addr.expireTime}", width = 8 * 1024)
     private Date expireTime;
 
     public Address() {

easyfile-example/easyfile-example-local/src/main/java/com/openquartz/easyfile/example/model/Feature.java

@@ -9,13 +9,13 @@
 @Data
 public class Feature {
 
-    @ExcelProperty("ID")
+    @ExcelProperty("${school.feature.id}")
     private Integer id;
-    @ExcelProperty("编码")
+    @ExcelProperty("${school.feature.code}")
     private String code;
-    @ExcelProperty("名字")
+    @ExcelProperty("${school.feature.name}")
     private String name;
-    @ExcelProperty(value = "描述", width = 8 * 512)
+    @ExcelProperty(value = "${school.feature.desc}", width = 8 * 512)
     private String desc;
 
 }

easyfile-example/easyfile-example-local/src/main/java/com/openquartz/easyfile/example/model/Student.java

@@ -23,29 +23,31 @@ public class Student {
     @com.alibaba.excel.annotation.ExcelProperty("姓名")
     private String name;
 
-    @ExcelProperty("年龄")
+    @ExcelProperty(value = "${student.age}")
     @com.alibaba.excel.annotation.ExcelProperty("年龄")
     private Integer age;
 
-    @ExcelProperty(value = "学校", width = 8 * 1024)
+    @ExcelProperty(value = "${student.school}", width = 8 * 1024)
     @com.alibaba.excel.annotation.ExcelProperty("学校")
     private String school;
 
     private Long schoolId;
 
-    @ExcelProperty(value = "地址", width = 8 * 1024)
+    @ExcelProperty(value = "${student.address}", width = 8 * 1024)
     @com.alibaba.excel.annotation.ExcelProperty("地址")
     private String address;
 
-    @ExcelProperty("特征")
+    @ExcelProperty("${student.facture}")
     //    @com.alibaba.excel.annotation.ExcelProperty("特征")
     private List<Feature> featureList;
 
-    @ExcelProperty("新地址信息")
+    //新地址信息
+    @ExcelProperty("${student.addr}")
     //    @com.alibaba.excel.annotation.ExcelProperty("")
     private Address addr;
 
-    @ExcelProperty("學校等級")
+    // 學校等級
+    @ExcelProperty("${student.schoolGrade}")
     @com.alibaba.excel.annotation.ExcelProperty("学校等级")
     private String schoolGrade;
 

easyfile-example/easyfile-example-local/src/main/resources/i18n/messages_en.properties

@@ -1 +1,14 @@
-student.name=name
+student.name=name
+student.age=age
+student.school=school
+student.address=address
+student.facture=facture
+student.addr=addr
+student.schoolGrade=schoolGrade
+student.addr.addressName=addressName
+student.addr.expireTime=expireTime
+
+school.feature.id=ID
+school.feature.name=Name
+school.feature.code=Code
+school.feature.desc=Desc

easyfile-example/easyfile-example-local/src/main/resources/i18n/messages_zh.properties

@@ -1 +1,13 @@
-student.name=姓名
+student.name=姓名
+student.age=年龄
+student.school=学校
+student.address=地址
+student.facture=特征
+student.addr=学校地址
+student.schoolGrade=学校等级
+student.addr.addressName=地址名
+student.addr.expireTime=过期时间
+school.feature.id=ID
+school.feature.name=特征名
+school.feature.code=编码
+school.feature.desc=描述

easyfile-spring-boot-starter/easyfile-spring-boot-starter-parent/src/main/java/com/openquartz/easyfile/starter/trigger/handler/ScheduleTriggerAsyncFileHandler.java

@@ -1,9 +1,11 @@
 package com.openquartz.easyfile.starter.trigger.handler;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.InitializingBean;
 import com.openquartz.easyfile.common.response.DownloadTriggerEntry;
@@ -31,45 +33,45 @@ public class ScheduleTriggerAsyncFileHandler extends DatabaseAsyncFileHandlerAda
     private final ScheduledThreadPoolExecutor reaperScheduleExecutorService;
 
     private ScheduledThreadPoolExecutor init(ScheduleAsyncHandlerProperties handlerProperties,
-        BaseDefaultDownloadRejectExecutionHandler rejectHandler) {
+                                             BaseDefaultDownloadRejectExecutionHandler rejectHandler) {
         return new ScheduledThreadPoolExecutor(handlerProperties.getThreadPoolCoreSize(),
-            new ThreadFactoryBuilder()
-                .setNameFormat(handlerProperties.getThreadPoolThreadPrefix() + "-thread-%d")
-                .build(),
-            rejectHandler);
+                new ThreadFactoryBuilder()
+                        .setNameFormat(handlerProperties.getThreadPoolThreadPrefix() + "-thread-%d")
+                        .build(),
+                rejectHandler);
     }
 
     public ScheduleTriggerAsyncFileHandler(
-        EasyFileDownloadProperties downloadProperties,
-        UploadService uploadService,
-        DownloadStorageService storageService,
-        DownloadTriggerService triggerService,
-        ScheduleAsyncHandlerProperties scheduleAsyncHandlerProperties,
-        BaseDefaultDownloadRejectExecutionHandler rejectExecutionHandler) {
+            EasyFileDownloadProperties downloadProperties,
+            UploadService uploadService,
+            DownloadStorageService storageService,
+            DownloadTriggerService triggerService,
+            ScheduleAsyncHandlerProperties scheduleAsyncHandlerProperties,
+            BaseDefaultDownloadRejectExecutionHandler rejectExecutionHandler) {
         super(downloadProperties, uploadService, storageService, triggerService, scheduleAsyncHandlerProperties);
         this.triggerService = triggerService;
         this.handlerProperties = scheduleAsyncHandlerProperties;
         this.scheduleExecutorService = init(scheduleAsyncHandlerProperties, rejectExecutionHandler);
         // reaper
         this.reaperScheduleExecutorService = new ScheduledThreadPoolExecutor(
-            handlerProperties.getReaperTheadPoolCoreSize(),
-            new ThreadFactoryBuilder()
-                .setNameFormat(handlerProperties.getReaperThreadPoolThreadPrefix() + "-thread-%d")
-                .build(),
-            rejectExecutionHandler);
+                handlerProperties.getReaperTheadPoolCoreSize(),
+                new ThreadFactoryBuilder()
+                        .setNameFormat(handlerProperties.getReaperThreadPoolThreadPrefix() + "-thread-%d")
+                        .build(),
+                rejectExecutionHandler);
     }
 
     public void doTrigger() {
         List<DownloadTriggerEntry> registerIdList = triggerService
-            .getTriggerRegisterId(handlerProperties.getLookBackHours(), handlerProperties.getMaxTriggerCount(),
-                handlerProperties.getTriggerOffset());
+                .getTriggerRegisterId(handlerProperties.getLookBackHours(), handlerProperties.getMaxTriggerCount(),
+                        handlerProperties.getTriggerOffset());
         doActualTrigger(registerIdList);
     }
 
     public void doReaperTrigger() {
         List<DownloadTriggerEntry> registerIdList = triggerService
-            .getTriggerRegisterId(handlerProperties.getLookBackHours(), handlerProperties.getMaxTriggerCount(),
-                handlerProperties.getMinReaperSeconds(), handlerProperties.getTriggerOffset());
+                .getTriggerRegisterId(handlerProperties.getLookBackHours(), handlerProperties.getMaxTriggerCount(),
+                        handlerProperties.getMinReaperSeconds(), handlerProperties.getTriggerOffset());
         doActualTrigger(registerIdList);
     }
 
@@ -81,7 +83,10 @@ private void doActualTrigger(List<DownloadTriggerEntry> registerIdList) {
                 log.info("[ScheduleTriggerAsyncFileHandler#doTrigger] end.....");
                 return;
             }
-            registerIdList.stream().sorted().forEach(this::doTrigger);
+            registerIdList
+                    .stream()
+                    .sorted(Comparator.comparing(DownloadTriggerEntry::getRegisterId))
+                    .forEach(this::doTrigger);
         } catch (Exception ex) {
             log.error("[ScheduleTriggerAsyncFileHandler#doTrigger] error!", ex);
         }
@@ -94,12 +99,12 @@ public void afterPropertiesSet() {
         super.afterPropertiesSet();
         double initDelaySeconds = new Random(1).nextDouble() * handlerProperties.getSchedulePeriod();
         scheduleExecutorService
-            .scheduleAtFixedRate(this::doTrigger, (int) initDelaySeconds, handlerProperties.getSchedulePeriod(),
-                TimeUnit.SECONDS);
+                .scheduleAtFixedRate(this::doTrigger, (int) initDelaySeconds, handlerProperties.getSchedulePeriod(),
+                        TimeUnit.SECONDS);
         // do reaper
         reaperScheduleExecutorService
-            .scheduleAtFixedRate(this::doReaperTrigger, (int) initDelaySeconds, handlerProperties.getSchedulePeriod(),
-                TimeUnit.SECONDS);
+                .scheduleAtFixedRate(this::doReaperTrigger, (int) initDelaySeconds, handlerProperties.getSchedulePeriod(),
+                        TimeUnit.SECONDS);
     }
 
 }