Merge branch 'feature' into 'release'

热点库新增小红书+详情

See merge request !470

src/main/java/com/zhiwei/brandkbs2/controller/app/AppSearchController.java

@@ -50,7 +50,7 @@ public class AppSearchController extends BaseController {
     @Autowired
     private RestTemplate restTemplate;
 
-    @Value("${trends.findHotSearchESDataInTimeByInner.url}")
+    @Value("${trends.findAllPlatformHotSearchESDataInTime.url}")
     private String trendsSearchUrl;
 
     @Value("${crisis.search.url}")
@@ -88,9 +88,12 @@ public class AppSearchController extends BaseController {
     @GetMapping("/hot/list")
     public ResponseResult searchHotList(@RequestParam(value = "pageSize", defaultValue = "10") Integer limit,
                                         @RequestParam(value = "page", defaultValue = "1") Integer page,
-                                        @RequestParam(value = "type", defaultValue = "weibo") String type,
-                                        @RequestParam(value = "keyword") String keyword) {
-        ResponseEntity<JSONObject> jsonObjectResponseEntity = restTemplate.getForEntity(trendsSearchUrl, JSONObject.class, limit, page, type, keyword);
+                                        @RequestParam(value = "type", defaultValue = "all") String type,
+                                        @RequestParam(value = "keyword") String keyword,
+                                        @RequestParam(value = "sort") String sort,
+                                        @RequestParam(value = "startTime", required = false) Long startTime,
+                                        @RequestParam(value = "endTime", required = false) Long endTime) {
+        ResponseEntity<JSONObject> jsonObjectResponseEntity = restTemplate.getForEntity(trendsSearchUrl, JSONObject.class, limit, page, type, keyword, sort, startTime, endTime);
         JSONObject result = jsonObjectResponseEntity.getBody();
         if (Objects.nonNull(result)) {
             return ResponseResult.success(result);

src/main/java/com/zhiwei/brandkbs2/enmus/HotPlatformEnum.java

@@ -20,10 +20,12 @@ public enum HotPlatformEnum {
     ZHIHU("知乎", "zhihu", "知乎热搜"),
     JINRITOUTIAO("今日头条", "toutiao", "今日头条热搜"),
     DOUYIN("抖音", "douyin", "抖音热搜"),
+    DOUYIN_RISE("抖音", "douyin-rise", "抖音预热榜"),
     BILIBILI("B站", "bilibili", "B站热搜"),
     BILIBILI_RANKING("B站", "bilibili-ranking", "B站排行榜"),
     KUAISHOU("快手", "kuaishou", "快手热榜"),
-    BAIDU("百度", "baidu", "百度热搜");
+    BAIDU("百度", "baidu", "百度热搜"),
+    XIAOHONGSHU("小红书", "little-red-book", "小红书热榜");
 
     private final String platform;
     private final String engName;

src/main/resources/application-dev.properties

@@ -88,7 +88,7 @@ crisis.share.url=https://crisis.zhiweidata.com/app/brandkbs/share/{1}
 crisis.event.url=https://crisis.zhiweidata.com/share/crisisDetails?id={1}&share={2}
 #\u70ED\u70B9\u5E93\u5916\u90E8\u63A5\u53E3
 trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/longTimeInListSearchByInner?sortType={1}&type={2}&day={3}
-trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
+trends.findAllPlatformHotSearchESDataInTime.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findAllPlatformHotSearchESDataInTime?limit={1}&page={2}&type={3}&word={4}&sort={5}&startTime={6}&endTime={7}
 trends.longTimeInListSearch.url=https://trends.zhiweidata.com/hotSearchTrend/search/longTimeInListSearch?type={1}&sortType=realTime
 trends.getHotSearchFromEsInTimeAndTypeOrWord.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/getHotSearchFromEsInTimeAndTypeOrWord?limit={1}&page={2}&type={3}&word={4}&sort={5}&accurateWord={6}&maskWord={7}
 trends.queryHotSearchTrendInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/queryHotSearchTrendInner

src/main/resources/application-local.properties

@@ -17,10 +17,14 @@ brandkbs.image.url=https://brandkbs.zhiweidata.com/brandkbs/images/
 #\u56FE\u7247\u8D44\u6E90\u8DEF\u5F84
 cbs.imagesPath=file:${brandkbs.img.url},file:${brandkbs.head.url}
 
-#redis
+#redis \u6D4B\u8BD5
 spring.redis.host=192.168.0.24
 spring.redis.database=2
 spring.redis.port=6379
+#redis \u7EBF\u4E0A
+#spring.redis.host=115.236.59.91
+#spring.redis.database=0
+#spring.redis.port=7376
 
 
 #mongo\u914D\u7F6E
@@ -93,7 +97,7 @@ crisis.share.url=https://crisis.zhiweidata.com/app/brandkbs/share/{1}
 crisis.event.url=https://crisis.zhiweidata.com/share/crisisDetails?id={1}&share={2}
 #\u70ED\u70B9\u5E93\u5916\u90E8\u63A5\u53E3
 trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/longTimeInListSearchByInner?sortType={1}&type={2}&day={3}
-trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
+trends.findAllPlatformHotSearchESDataInTime.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findAllPlatformHotSearchESDataInTime?limit={1}&page={2}&type={3}&word={4}&sort={5}&startTime={6}&endTime={7}
 trends.longTimeInListSearch.url=https://trends.zhiweidata.com/hotSearchTrend/search/longTimeInListSearch?type={1}&sortType=realTime
 trends.getHotSearchFromEsInTimeAndTypeOrWord.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/getHotSearchFromEsInTimeAndTypeOrWord?limit={1}&page={2}&type={3}&word={4}&sort={5}&accurateWord={6}&maskWord={7}
 trends.queryHotSearchTrendInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/queryHotSearchTrendInner

src/main/resources/application-prod.properties

@@ -88,7 +88,7 @@ crisis.share.url=https://crisis.zhiweidata.com/app/brandkbs/share/{1}
 crisis.event.url=https://crisis.zhiweidata.com/share/crisisDetails?id={1}&share={2}
 #\u70ED\u70B9\u5E93\u5916\u90E8\u63A5\u53E3
 trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/longTimeInListSearchByInner?sortType={1}&type={2}&day={3}
-trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
+trends.findAllPlatformHotSearchESDataInTime.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findAllPlatformHotSearchESDataInTime?limit={1}&page={2}&type={3}&word={4}&sort={5}&startTime={6}&endTime={7}
 trends.longTimeInListSearch.url=https://trends.zhiweidata.com/hotSearchTrend/search/longTimeInListSearch?type={1}&sortType=realTime
 trends.getHotSearchFromEsInTimeAndTypeOrWord.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/getHotSearchFromEsInTimeAndTypeOrWord?limit={1}&page={2}&type={3}&word={4}&sort={5}&accurateWord={6}&maskWord={7}
 trends.queryHotSearchTrendInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/queryHotSearchTrendInner