Merge remote-tracking branch 'origin/2.7.x'

# Conflicts: # CHANGELOG.md # gradle.properties
lets-mica · Oct 29, 2023 · 5042a3d · 5042a3d
2 parents d884c0e + 4035bd2
commit 5042a3d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/mica-holidays/src/main/java/net/dreamlu/mica/holidays/impl/HolidaysApiImpl.java b/mica-holidays/src/main/java/net/dreamlu/mica/holidays/impl/HolidaysApiImpl.java
@@ -71,7 +71,7 @@ public DaysType getDaysType(LocalDate localDate) {
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
-		int[] years = new int[]{2019, 2020, 2021, 2022, 2023};
+		int[] years = new int[]{2019, 2020, 2021, 2022, 2023, 2024};
         for (int year : years) {
             Resource resource = resourceLoader.getResource("classpath:data/" + year + "_data.json");
             try (InputStream inputStream = resource.getInputStream()) {

diff --git a/mica-holidays/src/main/resources/data/2024_data.json b/mica-holidays/src/main/resources/data/2024_data.json
@@ -0,0 +1,40 @@
+{
+   "0101":2,
+   "0210":2,
+   "0211":2,
+   "0212":2,
+   "0213":1,
+   "0214":1,
+   "0215":1,
+   "0216":1,
+   "0217":1,
+   "0404":2,
+   "0405":1,
+   "0406":1,
+   "0501":2,
+   "0502":1,
+   "0503":1,
+   "0504":1,
+   "0505":1,
+   "0608":1,
+   "0609":1,
+   "0610":2,
+   "0915":1,
+   "0916":1,
+   "0917":2,
+   "1001":2,
+   "1002":2,
+   "1003":2,
+   "1004":1,
+   "1005":1,
+   "1006":1,
+   "1007":1,
+   "0204":0,
+   "0218":0,
+   "0407":0,
+   "0428":0,
+   "0511":0,
+   "0914":0,
+   "0929":0,
+   "1012":0
+}