0.0.8：增加了计算宠物的生日

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.bamanker</groupId>
     <artifactId>dailyLove</artifactId>
-    <version>0.0.7</version>
+    <version>0.0.8</version>
     <name>dailyLove</name>
     <description>dailyLove</description>
     <properties>

src/main/java/com/bamanker/dailylove/config/DailyLoveConfigure.java

@@ -5,13 +5,29 @@ import org.springframework.stereotype.Component;
 
 @Component
 public class DailyLoveConfigure {
+
+    //    public static String Access_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}";
+//    public static String Send_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={0}";
     public static String Color_quality;
     public static String Color_morning;
     public static String Color_chineseDate;
     public static String Color_festival;
     public static String Color_night;
-
     public static String Color_tomorrow;
+    public static String Color_Now;
+    public static String Color_city;
+    public static String Color_weather;
+    public static String Color_minTem;
+    public static String Color_maxTem;
+    public static String Color_tips;
+    public static String Color_dailyCn;
+    public static String Color_dailyEn;
+    public static String Color_gbir;
+    public static String Color_bbir;
+
+    public static String Color_cbir;
+    public static String Color_loveDay;
+    public static String Color_remark;
 
     @Value("${wechat.color.tomorrow:null}")
     public void setColor_tomorrow(String color_tomorrow) {
@@ -43,29 +59,11 @@ public class DailyLoveConfigure {
         Color_night = color_night;
     }
 
-
-//    public static String Access_URL = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={0}&secret={1}";
-//    public static String Send_URL = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token={0}";
-
-
     @Value("${wechat.color.city:null}")
     public void setColor_city(String color_city) {
         Color_city = color_city;
     }
 
-    public static String Color_Now;
-    public static String Color_city;
-    public static String Color_weather;
-    public static String Color_minTem;
-    public static String Color_maxTem;
-    public static String Color_tips;
-    public static String Color_dailyCn;
-    public static String Color_dailyEn;
-    public static String Color_gbir;
-    public static String Color_bbir;
-    public static String Color_loveDay;
-    public static String Color_remark;
-
     @Value("${wechat.color.weather:null}")
     public void setColor_weather(String color_weather) {
         Color_weather = color_weather;
@@ -106,6 +104,11 @@ public class DailyLoveConfigure {
         Color_bbir = color_bbir;
     }
 
+    @Value("${wechat.color.cbir:null}")
+    public void setColor_cbir(String color_cbir) {
+        Color_cbir = color_cbir;
+    }
+
     @Value("${wechat.color.loveDay:null}")
     public void setColor_loveDay(String color_loveDay) {
         Color_loveDay = color_loveDay;
@@ -156,7 +159,6 @@ public class DailyLoveConfigure {
         Template_ID_Night = templateIDNight;
     }
 
-
     public static String City_ID;
 
     @Value("${DL.city-id}")
@@ -164,7 +166,6 @@ public class DailyLoveConfigure {
         City_ID = city_ID;
     }
 
-
     public static String Color_Top = null;
 
     @Value("${wechat.color.top}")
@@ -179,7 +180,6 @@ public class DailyLoveConfigure {
         TianXin_Key = tianXin_Key;
     }
 
-
     public static String Boy_Birthday;
 
     @Value("${DL.boy-birthday}")
@@ -194,7 +194,13 @@ public class DailyLoveConfigure {
         Girl_Birthday = GirlBirthday;
     }
 
-    //
+    public static String Cat_Birthday;
+
+    @Value("${DL.cat-birthday}")
+    public void setCatBirthday(String CatBirthday) {
+        Cat_Birthday = CatBirthday;
+    }
+
     public static String Love_Day;
 
     @Value("${DL.love-day}")

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

@@ -2,7 +2,6 @@ package com.bamanker.dailylove.controller;
 
 import cn.hutool.core.date.ChineseDate;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.bamanker.dailylove.config.DailyLoveConfigure;
 import com.bamanker.dailylove.domain.*;
@@ -10,13 +9,11 @@ import com.bamanker.dailylove.service.DataRemoteClient;
 import com.bamanker.dailylove.service.WechatRequestClient;
 import com.bamanker.dailylove.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 
 @Slf4j
@@ -95,6 +92,10 @@ public class PushDailyController {
         log.debug("bbir_day:{}", boyBirthdays);
         resultVo.setAttribute("bbir_day", new DataItem(boyBirthdays - 1 + "", DailyLoveConfigure.Color_bbir));
 
+        int catBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Cat_Birthday);
+        log.debug("cbir_day:{}", catBirthdays);
+        resultVo.setAttribute("cbir_day", new DataItem(catBirthdays - 1 + "", DailyLoveConfigure.Color_cbir));
+
         if (DataUtils.getBirthdays(DailyLoveConfigure.Love_Day) == 1) {
             remark = "明天是恋爱周年纪念日！永远爱你~mua";
         } else if ((DataUtils.getLoveDays(DailyLoveConfigure.Love_Day)) % 100 == 1) {
@@ -103,6 +104,8 @@ public class PushDailyController {
             remark = "明天是lili大宝贝的生日啦";
         } else if (boyBirthdays == 1) {
             remark = "明天是songsong的生日！别忘了哦~";
+        } else if (catBirthdays == 1) {
+            remark = "明天是小离谱的生日！别忘了给她最爱的小鱼干！";
         }
 
         resultVo.setAttribute("remark", new DataItem(remark, DailyLoveConfigure.Color_remark));
@@ -188,6 +191,10 @@ public class PushDailyController {
         log.debug("bbir_day:{}", boyBirthdays);
         resultVo.setAttribute("bbir_day", new DataItem(boyBirthdays + "", DailyLoveConfigure.Color_bbir));
 
+        int catBirthdays = DataUtils.getBirthdays(DailyLoveConfigure.Cat_Birthday);
+        log.debug("cbir_day:{}", catBirthdays);
+        resultVo.setAttribute("cbir_day", new DataItem(catBirthdays + "", DailyLoveConfigure.Color_cbir));
+
         if (DataUtils.getBirthdays(DailyLoveConfigure.Love_Day) == 0) {
             remark = "今天是恋爱周年纪念日！永远爱你~mua";
         } else if ((DataUtils.getLoveDays(DailyLoveConfigure.Love_Day)) % 100 == 0) {
@@ -196,6 +203,8 @@ public class PushDailyController {
             remark = "今天是lili大宝贝的生日！生日快乐哟~";
         } else if (boyBirthdays == 0) {
             remark = "今天是songsong的生日！别忘了好好爱他~";
+        } else if (catBirthdays == 0) {
+            remark = "今天是小离谱的生日！别忘了给她最爱的小鱼干！";
         }
 
         resultVo.setAttribute("remark", new DataItem(remark, DailyLoveConfigure.Color_remark));

src/main/java/com/bamanker/dailylove/service/WechatRequestClient.java

@@ -1,6 +1,5 @@
 package com.bamanker.dailylove.service;
 
-import com.bamanker.dailylove.config.DailyLoveConfigure;
 import com.bamanker.dailylove.domain.ResultVo;
 import com.bamanker.dailylove.domain.WechatTokenParam;
 import org.springframework.cloud.openfeign.FeignClient;

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

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil;
 import com.bamanker.dailylove.config.DailyLoveConfigure;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.util.Strings;
-import org.springframework.util.unit.DataUnit;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/main/resources/bootstrap.yml

@@ -25,15 +25,16 @@ DL:
   girl-birthday: 1995-06-28
   boy-birthday: 1995-3-30
   love-day: 2022-07-16
+  cat-birthday: 2022-10-23
 
 wechat:
   app-id: wxba68702957f8b93e
   app-secret: 834078bb149409bfca4fe693ea7c4c1c
   #ME:  oo5bL6bK_4TC0tb-Wa5oiugTPVeQ
   #LILI:  oo5bL6QafHJa9zQNYKS0fIhFC0zM
-  open-id: oo5bL6QafHJa9zQNYKS0fIhFC0zM
-  template-id-morning: 0qVcDob-3INv8Jh_Odd5nl9gfgA0LYpvBMYcqqP03rA
-  template-id-night: TUL17fAJ4g69_7PjpgvrQwKxr8KC4fYQxMIAl0e3L9s
+  open-id: oo5bL6bK_4TC0tb-Wa5oiugTPVeQ
+  template-id-morning: rz4zRtw5hyJzfYkgQ_lj4xjZ3zYEcVFeGtqUe5MrGrE
+  template-id-night: cwOph75TS6PL1L0bi804qAHCZfJBDFsoDbGT4zG9T6k
 
   color:
     now: '#99CCCC'
@@ -47,6 +48,7 @@ wechat:
     dailyEn: '#CC99CC'
     gbir: '#FF3399'
     bbir: '#FF3399'
+    cbir: '#FF3399'
     loveDay: '#FF3399'
     remark: '#FF6666'
     city: ""

src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java

@@ -1,29 +1,21 @@
 package com.bamanker.dailylove;
 
 import cn.hutool.core.date.ChineseDate;
-import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.bamanker.dailylove.config.DailyLoveConfigure;
-import com.bamanker.dailylove.domain.DataItem;
-import com.bamanker.dailylove.domain.ResultVo;
 import com.bamanker.dailylove.domain.TianXinReqParam;
 import com.bamanker.dailylove.domain.Weather;
 import com.bamanker.dailylove.service.DataRemoteClient;
-import com.bamanker.dailylove.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.bouncycastle.util.Strings;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.util.unit.DataUnit;
 
 import javax.annotation.Resource;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;