bamanker/dailyLove
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

0.0.5：修改了若干错误

Browse Source
This commit is contained in:
bamanker
2022-12-28 00:39:31 +08:00
parent 050103261f
commit 092c289cf5
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

2
src/main/java/com/bamanker/dailylove/config/PushTask.java
View File

@@ -11,7 +11,7 @@ public class PushTask {
@Autowired @Autowired
PushDailyController pushDailyController; PushDailyController pushDailyController;
//每日 早上8,12,22点 定时推送 //每日 早上7.30,晚上22点 定时推送
@Scheduled(cron = "0 30 7 * * ?") @Scheduled(cron = "0 30 7 * * ?")
public void scheduledPushMorning(){ public void scheduledPushMorning(){
pushDailyController.pushMorning(); pushDailyController.pushMorning();

14
src/main/java/com/bamanker/dailylove/controller/PushDailyController.java
View File

@@ -48,7 +48,7 @@ public class PushDailyController {
param1.setCity(DailyLoveConfigure.City_ID); param1.setCity(DailyLoveConfigure.City_ID);
param1.setType("7"); param1.setType("7");
String weatherResp = dataRemoteClient.getWeather(param1); 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"); String city = JSONObject.parseObject(weatherResp).getJSONArray("result").getJSONObject(0).getString("area");
Weather weather = weatherJson.toJavaObject(Weather.class); Weather weather = weatherJson.toJavaObject(Weather.class);
@@ -75,9 +75,9 @@ public class PushDailyController {
String rainbow = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content"); String rainbow = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content");
resultVo.setAttribute("daily_english_cn", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn)); resultVo.setAttribute("daily_english_cn", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn));
String englishResp = dataRemoteClient.getDailyEnglish(param2); // String englishResp = dataRemoteClient.getDailyEnglish(param2);
String english = JSONObject.parseObject(englishResp).getJSONArray("result").getJSONObject(0).getString("en"); // String english = JSONObject.parseObject(englishResp).getJSONArray("result").getJSONObject(0).getString("en");
resultVo.setAttribute("daily_english_en", new DataItem(english, DailyLoveConfigure.Color_dailyEn)); // resultVo.setAttribute("daily_english_en", new DataItem(english, DailyLoveConfigure.Color_dailyEn));
ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate(weather.getDate())); 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"); String rainbow = JSONObject.parseObject(rainbowResp).getJSONArray("result").getJSONObject(0).getString("content");
resultVo.setAttribute("daily_english_cn", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn)); resultVo.setAttribute("daily_english_cn", new DataItem(rainbow, DailyLoveConfigure.Color_dailyCn));
String englishResp = dataRemoteClient.getDailyEnglish(param2); // String englishResp = dataRemoteClient.getDailyEnglish(param2);
String english = JSONObject.parseObject(englishResp).getJSONArray("result").getJSONObject(0).getString("en"); // String english = JSONObject.parseObject(englishResp).getJSONArray("result").getJSONObject(0).getString("en");
resultVo.setAttribute("daily_english_en", new DataItem(english, DailyLoveConfigure.Color_dailyEn)); // resultVo.setAttribute("daily_english_en", new DataItem(english, DailyLoveConfigure.Color_dailyEn));
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Date date = new Date(); Date date = new Date();

5
src/test/java/com/bamanker/dailylove/DailyLoveApplicationTests.java
View File

@@ -115,10 +115,13 @@ class DailyLoveApplicationTests {
String weatherJson = dataRemoteClient.getWeather(param1); String weatherJson = dataRemoteClient.getWeather(param1);
log.info("weather:{}", weatherJson); log.info("weather:{}", weatherJson);
JSONObject resWeather = JSONObject.parseObject(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); log.info("----result----:{}", result);
Weather weather = result.toJavaObject(Weather.class); Weather weather = result.toJavaObject(Weather.class);
log.info("weather:{}", weather); log.info("weather:{}", weather);
ChineseDate chineseDate = new ChineseDate(DateUtil.parseDate(weather.getDate()));
System.out.println("--------------55555----------"+weather.getDate());
System.out.println("------------------------"+chineseDate);
} }