diff --git a/pom.xml b/pom.xml index 8a3b068..a5fc475 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.bamanker dailyLove - 0.0.4 + 0.0.5 dailyLove dailyLove diff --git a/src/main/java/com/bamanker/dailylove/config/PushTask.java b/src/main/java/com/bamanker/dailylove/config/PushTask.java index 39e4a02..eb7877c 100644 --- a/src/main/java/com/bamanker/dailylove/config/PushTask.java +++ b/src/main/java/com/bamanker/dailylove/config/PushTask.java @@ -11,7 +11,7 @@ public class PushTask { @Autowired PushDailyController pushDailyController; - //每日 早上8,12,22点 定时推送 + //每日 早上7.30,晚上22点 定时推送 @Scheduled(cron = "0 30 7 * * ?") public void scheduledPushMorning(){ pushDailyController.pushMorning(); diff --git a/src/main/java/com/bamanker/dailylove/controller/PushDailyController.java b/src/main/java/com/bamanker/dailylove/controller/PushDailyController.java index 0358c28..8fcb88c 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(1); + JSONObject weatherJson = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(2); String city = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getString("area"); Weather weather = weatherJson.toJavaObject(Weather.class); @@ -75,9 +75,9 @@ public class PushDailyController { String rainbow = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content"); resultVo.setAttribute("daily_english_cn", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn)); - String englishResp = dataRemoteClient.getDailyEnglish(param2); - String english = JSONObject.parseObject(englishResp).getJSONArray("result").getJSONObject(0).getString("en"); - resultVo.setAttribute("daily_english_en", new DataItem(english, DailyLoveConfigure.Color_dailyEn)); +// String englishResp = dataRemoteClient.getDailyEnglish(param2); +// String english = JSONObject.parseObject(englishResp).getJSONArray("result").getJSONObject(0).getString("en"); +// resultVo.setAttribute("daily_english_en", new DataItem(english, DailyLoveConfigure.Color_dailyEn)); ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate(weather.getDate())); @@ -166,9 +166,9 @@ public class PushDailyController { String rainbow = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content"); resultVo.setAttribute("daily_english_cn", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn)); - String englishResp = dataRemoteClient.getDailyEnglish(param2); - String english = JSONObject.parseObject(englishResp).getJSONArray("result").getJSONObject(0).getString("en"); - resultVo.setAttribute("daily_english_en", new DataItem(english, DailyLoveConfigure.Color_dailyEn)); +// String englishResp = dataRemoteClient.getDailyEnglish(param2); +// String english = JSONObject.parseObject(englishResp).getJSONArray("result").getJSONObject(0).getString("en"); +// resultVo.setAttribute("daily_english_en", new DataItem(english, DailyLoveConfigure.Color_dailyEn)); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); Date date = new Date(); diff --git a/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java b/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java index fd1b22e..664fa96 100644 --- a/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java +++ b/src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java @@ -115,10 +115,13 @@ class DailyLoveApplicationTests { String weatherJson = dataRemoteClient.getWeather(param1); log.info("weather:{}", weatherJson); JSONObject resWeather = JSONObject.parseObject(weatherJson); - JSONObject result = resWeather.getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(1); + JSONObject result = resWeather.getJSONArray("result").getJSONObject(0).getJSONArray("list").getJSONObject(2); log.info("----result----:{}", result); Weather weather = result.toJavaObject(Weather.class); log.info("weather:{}", weather); + ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate(weather.getDate())); + System.out.println("--------------55555----------"+weather.getDate()); + System.out.println("------------------------"+chineseDate); }