修改了日期错误和日志不显示问题

pom.xml

@@ -23,7 +23,7 @@
     </scm>
     <groupId>com.bamanker</groupId>
     <artifactId>dailylove</artifactId>
-    <version>v3.1.2-native</version>
+    <version>v3.1.4-native</version>
     <name>dailylove</name>
     <description>dailylove-forK8S</description>
     <properties>

src/main/java/com/bamanker/dailylove/controller/PushDailyController.java

@@ -68,11 +68,11 @@ public class PushDailyController {
         String term = chineseDate.getTerm();
 
         // 计算各种日期
-        int girlBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Girl_Birthday);
+        int girlBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Girl_Birthday) - 1;
-        int boyBirthdays = DataUtils.getChineseBirthdays(DailyLoveConfigure.Boy_Birthday);
+        int boyBirthdays = DataUtils.getChineseBirthdays(DailyLoveConfigure.Boy_Birthday) - 1;
-        int catBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Cat_Birthday);
+        int catBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Cat_Birthday) - 1;
-        int loveDays = DataUtils.getDayDiff(DailyLoveConfigure.Love_Day);
+        int loveDays = DataUtils.getDayDiff(DailyLoveConfigure.Love_Day) + 1;
-        int weddingDays = DataUtils.getDayDiff(DailyLoveConfigure.Wedding_Day);
+        int weddingDays = DataUtils.getDayDiff(DailyLoveConfigure.Wedding_Day) + 1;
 
         log.info("gbir_days:{}, bbir_days:{}, cbir_days:{}, love_days:{}, wedding_days:{}",
                 girlBirthdays, boyBirthdays, catBirthdays, loveDays, weddingDays);
@@ -138,12 +138,14 @@ public class PushDailyController {
                         resultVo.setAttribute("rainbow", new DataItem(rainbowContent, DailyLoveConfigure.Color_dailyCn));
                         resultVo.setAttribute("lunar", new DataItem(chineseDate.toString(), DailyLoveConfigure.Color_chineseDate));
                         resultVo.setAttribute("festival", new DataItem(festival + " " + term, DailyLoveConfigure.Color_festival));
-                        resultVo.setAttribute("gbir_day", new DataItem((girlBirthdays - 1) + "", DailyLoveConfigure.Color_gbir));
+                        resultVo.setAttribute("gbir_day", new DataItem(girlBirthdays + "", DailyLoveConfigure.Color_gbir));
-                        resultVo.setAttribute("bbir_day", new DataItem((boyBirthdays - 1) + "", DailyLoveConfigure.Color_bbir));
+                        resultVo.setAttribute("bbir_day", new DataItem(boyBirthdays + "", DailyLoveConfigure.Color_bbir));
-                        resultVo.setAttribute("cbir_day", new DataItem((catBirthdays - 1) + "", DailyLoveConfigure.Color_cbir));
+                        resultVo.setAttribute("cbir_day", new DataItem(catBirthdays + "", DailyLoveConfigure.Color_cbir));
                         resultVo.setAttribute("words", new DataItem(words, DailyLoveConfigure.Color_remark));
-                        resultVo.setAttribute("love_day", new DataItem((loveDays + 1) + "", DailyLoveConfigure.Color_loveDay));
+                        resultVo.setAttribute("love_day", new DataItem(loveDays + "", DailyLoveConfigure.Color_loveDay));
-                        resultVo.setAttribute("wedding_day", new DataItem((weddingDays + 1) + "", DailyLoveConfigure.Color_weddingDay));
+                        resultVo.setAttribute("wedding_day", new DataItem(weddingDays + "", DailyLoveConfigure.Color_weddingDay));
+
+                        log.info("推送消息: {}", resultVo);
 
                         // 获取微信访问令牌并发送消息
                         return wechatRequestService.getAccessToken("client_credential", DailyLoveConfigure.App_ID, DailyLoveConfigure.App_Secret)
@@ -152,7 +154,7 @@ public class PushDailyController {
                                 .flatMap(accessToken -> wechatRequestService.sendMsg(accessToken, resultVo)
                                         .doOnNext(this::printPushLog)
                                         .onErrorMap(throwable -> new PushException("发送微信消息失败: " + throwable.getMessage(), throwable)))
-                                .log();
+                                .doOnSuccess(response -> log.info("推送结果: {}", response));
                     } catch (Exception e) {
                         log.error("处理晚安推送数据时发生错误", e);
                         return Mono.error(new PushException("处理晚安推送数据时发生错误", e));
@@ -255,6 +257,7 @@ public class PushDailyController {
                         resultVo.setAttribute("love_day", new DataItem(loveDays + "", DailyLoveConfigure.Color_loveDay));
                         resultVo.setAttribute("wedding_day", new DataItem(weddingDays + "", DailyLoveConfigure.Color_weddingDay));
 
+                        log.info("推送消息: {}", resultVo);
                         // 获取微信访问令牌并发送消息
                         return wechatRequestService.getAccessToken("client_credential", DailyLoveConfigure.App_ID, DailyLoveConfigure.App_Secret)
                                 .onErrorMap(throwable -> new PushException("获取微信访问令牌失败: " + throwable.getMessage(), throwable))
@@ -262,7 +265,7 @@ public class PushDailyController {
                                 .flatMap(accessToken -> wechatRequestService.sendMsg(accessToken, resultVo)
                                         .doOnNext(PushDailyController.this::printPushLog)
                                         .onErrorMap(throwable -> new PushException("发送微信消息失败: " + throwable.getMessage(), throwable)))
-                                .log();
+                                .doOnSuccess(response -> log.info("推送结果: {}", response));
                     } catch (Exception e) {
                         log.error("处理早安推送数据时发生错误", e);
                         return Mono.error(new PushException("处理早安推送数据时发生错误", e));

src/main/java/com/bamanker/dailylove/utils/DataUtils.java

@@ -47,7 +47,7 @@ public class DataUtils {
         int gregorianDay = chineseDate.getGregorianDay();
         //计算时间差
         long days = haveThisDay(chineseMonth, chineseDay, dateToday, todayYear, chineseDate, gregorianDay);
-        log.info("days:{}", days);
+//        log.info("days:{}", days);
         return (int) days;
     }
 

src/main/resources/application.yml

@@ -15,7 +15,7 @@ daily-love:
     app-secret: ${WECHAT_APP_SECRET:834078bb149409bfca4fe693ea7c4c1c}
     #  ME:  oo5bL6bK_4TC0tb-Wa5oiugTPVeQ
     #LILI:  oo5bL6QafHJa9zQNYKS0fIhFC0zM
-    open-id: ${WECHAT_OPEN_ID:oo5bL6QafHJa9zQNYKS0fIhFC0zM}
+    open-id: ${WECHAT_OPEN_ID:oo5bL6bK_4TC0tb-Wa5oiugTPVeQ}
     template-id-morning: ${WECHAT_TEMPLATE_ID_MORNING:dWNAL-ZOzpBhnByFoTamt9DlJQYLB5z3ldKLvQstyU4}
     template-id-night: ${WECHAT_TEMPLATE_ID_NIGHT:oraLiXC-8740stYc1a7mpzUFHiAIRaM3JikqibZ2grE}
     colors: