diff --git a/pom.xml b/pom.xml index a5fc475..6d6e4a0 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.bamanker dailyLove - 0.0.5 + 0.0.6 dailyLove dailyLove diff --git a/src/main/java/com/bamanker/dailylove/controller/PushDailyController.java b/src/main/java/com/bamanker/dailylove/controller/PushDailyController.java index 8fcb88c..6dcf5dd 100644 --- a/src/main/java/com/bamanker/dailylove/controller/PushDailyController.java +++ b/src/main/java/com/bamanker/dailylove/controller/PushDailyController.java @@ -48,7 +48,7 @@ public class PushDailyController { param1.setCity(DailyLoveConfigure.City_ID); param1.setType("7"); String weatherResp = dataRemoteClient.getWeather(param1); - JSONObject weatherJson = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(2); + JSONObject weatherJson = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(1); String city = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getString("area"); Weather weather = weatherJson.toJavaObject(Weather.class); diff --git a/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java b/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java index 664fa96..c3975f3 100644 --- a/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java +++ b/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java @@ -53,7 +53,7 @@ class DailyLoveApplicationTests { Calendar dateToday = Calendar.getInstance(); int todayYear = dateToday.get(Calendar.YEAR); //把生日的年改为今年,方便计算 - ChineseDate chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay); + ChineseDate chineseDate = new ChineseDate(todayYear, chineseMonth, chineseDay,false); //农历日期对应的阳历日期 int gregorianDay = chineseDate.getGregorianDay(); //计算时间差