wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期

Browse Source
This commit is contained in:
wulin 2023-09-28 17:05:54 +08:00
commit c62c38f5ad
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
iot-common/iot-third/src/main/java/com/qiuguo/iot/third/service/MusicService.java
View File

@ -52,13 +52,11 @@ public class MusicService {
.defaultHeader("Access-Control-Allow-Methods", "PUT,POST,GET,DELETE,OPTIONS")
.defaultHeader("Access-Control-Allow-Headers", "X-Requested-With,Content-Type")
.defaultHeader("Accept", "*")
.defaultHeader("Access-Control-Allow-Methods:", "PUT,POST,GET,DELETE,OPTIONS")
.defaultHeader("Access-Control-Allow-Methods:", "PUT,POST,GET,DELETE,OPTIONS")
.defaultHeader(HttpHeaders.CONTENT_TYPE, APPLICATION_JSON_VALUE)
.defaultHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36")
.build();
String baseUrl = "http://121.40.172.241:8031";
if (type == 1) {
return build.get().uri(baseUrl.concat("/search?keywords=").concat(keyword).concat("&limit=10")).retrieve()
return build.get().uri(baseUrl+"/search?keywords="+keyword+"&limit=10"+"&timestamp="+System.currentTimeMillis()).retrieve()
.bodyToMono(SearchResponse.class).flatMap(res -> {
if (!Objects.equals(res.getCode(), 200)) {
return Mono.empty();
@ -68,7 +66,7 @@ public class MusicService {
Map<String,SearchResponse.Song > songMap = res.getResult().getSongs().stream()
.collect(Collectors.toMap(SearchResponse.Song::getId, Function.identity()));
return build.get().uri(baseUrl.concat("/song/url?id=").concat(ids)).retrieve()
return build.get().uri(baseUrl+"/song/url?id="+ids+"&timestamp="+System.currentTimeMillis()).retrieve()
.bodyToMono(SongInfoResponse.class).flatMap(song -> {
if (Objects.equals(200, song.getCode()) && song.getData().size() > 0) {
List<SongInfoResponse.ResultSong> data = song.getData();
@ -84,13 +82,13 @@ public class MusicService {
});
});
} else {
return build.get().uri(baseUrl.concat("/search?keywords=").concat(keyword).concat("&type=100")).retrieve()
return build.get().uri(baseUrl+"/search?keywords="+keyword+"&type=100"+"&timestamp="+System.currentTimeMillis()).retrieve()
.bodyToMono(SingerResponse.class).flatMap(res -> {
if (!Objects.equals(res.getCode(), 200) && res.getResult().getArtists().size() == 0) {
return Mono.empty();
}
String id = res.getResult().getArtists().get(0).getId();
return build.get().uri(baseUrl.concat("/artist/top/song?id=").concat(id)).retrieve()
return build.get().uri(baseUrl+"/artist/top/song?id="+id+"&timestamp="+System.currentTimeMillis()).retrieve()
.bodyToMono(SingerSongsResponse.class).flatMap(song -> {
if (Objects.equals(200, song.getCode()) && song.getSongs().size() > 0) {
String ids = song.getSongs().stream().limit(10)
@ -98,7 +96,7 @@ public class MusicService {
Map<String, SingerSongsResponse.Song> songMap = song.getSongs().stream()
.collect(Collectors.toMap(SingerSongsResponse.Song::getId,
Function.identity()));
return build.get().uri(baseUrl.concat("/song/url?id=").concat(ids)).retrieve()
return build.get().uri(baseUrl+"/song/url?id="+ids+"&timestamp="+System.currentTimeMillis()).retrieve()
.bodyToMono(SongInfoResponse.class).flatMap(so -> {
if (Objects.equals(200, song.getCode())
&& so.getData().size() > 0) {