Merge branch 'feature' into 'release'

Feature

See merge request !85

src/main/java/com/zhiwei/brandkbs2/common/RedisKeyPrefix.java

 package com.zhiwei.brandkbs2.common;
 
 import com.zhiwei.brandkbs2.auth.UserThreadLocal;
+import com.zhiwei.brandkbs2.util.Tools;
 
 import java.util.Objects;
 
@@ -82,6 +83,22 @@ public class RedisKeyPrefix {
      */
     private static final String EVENT_ANALYZE_PROGRESS = "BRANDKBS:EVENT:ANALYZE:PROGRESS:";
 
+    /**
+     * 项目预警相关缓存
+     */
+    public static final String PROJECT_WARN_HOT_TOP = "BRANDKBS:HOT_TOP:";
+
+    public static final String PROJECT_WARN_NEW_CASE_LIST = "BRANDKBS:NEW_CASE:LIST_";
+    public static final String PROJECT_WARN_NEW_CASE_CURSOR = "BRANDKBS:NEW_CASE:CURSOR:";
+
+    public static String projectWarnHotTopKeyAll(String projectId, String type) {
+        return RedisKeyPrefix.generateRedisKey(RedisKeyPrefix.PROJECT_WARN_HOT_TOP, projectId, Tools.concat(type, "*"));
+    }
+
+    public static String projectWarnHotTopKey(String projectId, String type, String name) {
+        return RedisKeyPrefix.generateRedisKey(RedisKeyPrefix.PROJECT_WARN_HOT_TOP, projectId, Tools.concat(type, name));
+    }
+
     public static String eventAnalysisProgress(String eventId, String projectId) {
         return RedisKeyPrefix.generateRedisKey(RedisKeyPrefix.EVENT_ANALYZE_PROGRESS, projectId, eventId);
     }
@@ -104,9 +121,14 @@ public class RedisKeyPrefix {
 
     private static String generateRedisKey(String... keys) {
         Objects.requireNonNull(keys);
+        boolean contains = keys[0].endsWith(":");
         StringBuilder sb = new StringBuilder(keys[0]);
         for (int i = 1; i < keys.length; i++) {
-            sb.append(SEPARATOR).append(keys[i]);
+            if (1 == i && contains) {
+                sb.append(keys[i]);
+            } else {
+                sb.append(SEPARATOR).append(keys[i]);
+            }
         }
         return sb.toString();
     }

src/main/java/com/zhiwei/brandkbs2/controller/InterfaceController.java

@@ -6,6 +6,7 @@ import com.zhiwei.brandkbs2.pojo.external.BrandkbsChannelConfig;
 import com.zhiwei.brandkbs2.pojo.external.BrandkbsHotEventConfig;
 import com.zhiwei.brandkbs2.pojo.external.BrandkbsHotTopConfig;
 import com.zhiwei.brandkbs2.pojo.external.BrandkbsYuQingConfig;
+import com.zhiwei.brandkbs2.pojo.vo.CrisisCaseWarnVO;
 import com.zhiwei.brandkbs2.service.ProjectService;
 import com.zhiwei.brandkbs2.service.ProjectWarnService;
 import io.swagger.annotations.Api;
@@ -73,7 +74,7 @@ public class InterfaceController {
         return projectWarnService.getHotEventWaring(projectId, config);
     }
 
-    @ApiOperation("获取热点事件-预警结果")
+    @ApiOperation("获取上榜热搜-预警结果")
     @PostMapping("/warn/hotTop")
     public ResponseResult getHotTopWaring(@RequestBody JSONObject json) {
         String projectId = json.getString("projectId");
@@ -81,11 +82,17 @@ public class InterfaceController {
         return projectWarnService.getHotTopWaring(projectId, config);
     }
 
-    @ApiOperation("获取热点事件-预警结果")
+    @ApiOperation("获取案例上新-预警结果")
     @PostMapping("/warn/newCase")
     public ResponseResult getNewCaseWaring(@RequestBody JSONObject json) {
         String projectId = json.getString("projectId");
         return projectWarnService.getNewCaseWaring(projectId);
     }
 
+    @ApiOperation("案例上新预警(案例库项目调用)")
+    @PostMapping("/newCrisisCaseWarn")
+    public void newCrisisCaseWarn(@RequestBody CrisisCaseWarnVO caseWarnVO) {
+        projectWarnService.newCrisisCaseWarn(caseWarnVO);
+    }
+
 }

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

@@ -42,7 +42,7 @@ import java.util.Map;
 public class AppWarnController extends BaseController {
     private static final Logger log = LogManager.getLogger(AppWarnController.class);
 
-    private static final String taskType = "brandkbs";
+    private static final String TASK_TYPE = "brandkbs";
 
     @Value("${jwt.key}")
     private String jwtKey;
@@ -127,7 +127,7 @@ public class AppWarnController extends BaseController {
         headers.add("token", token);
         HttpEntity<Object> request = new HttpEntity<>(headers);
 
-        JSONObject data = restTemplate.exchange(warnTicketUrl, HttpMethod.GET, request, JSONObject.class, pushTaskId, taskType).getBody().getJSONObject("data");
+        JSONObject data = restTemplate.exchange(warnTicketUrl, HttpMethod.GET, request, JSONObject.class, pushTaskId, TASK_TYPE).getBody().getJSONObject("data");
         return ResponseResult.success(data);
     }
 
@@ -139,7 +139,7 @@ public class AppWarnController extends BaseController {
         headers.add("token", token);
         HttpEntity<Object> request = new HttpEntity<>(headers);
 
-        JSONArray data = restTemplate.exchange(warnPushRecipientsUrl, HttpMethod.GET, request, JSONObject.class, pushTaskId, taskType).getBody().getJSONArray("data");
+        JSONArray data = restTemplate.exchange(warnPushRecipientsUrl, HttpMethod.GET, request, JSONObject.class, pushTaskId, TASK_TYPE).getBody().getJSONArray("data");
         return ResponseResult.success(data);
     }
 
@@ -152,7 +152,7 @@ public class AppWarnController extends BaseController {
         headers.add("token", token);
         HttpEntity<Object> request = new HttpEntity<>(headers);
 
-        JSONObject data = restTemplate.exchange(deletePushRecipientsUrl, HttpMethod.GET, request, JSONObject.class, pushTaskId, recipientsId, taskType).getBody().getJSONObject("data");
+        JSONObject data = restTemplate.exchange(deletePushRecipientsUrl, HttpMethod.GET, request, JSONObject.class, pushTaskId, recipientsId, TASK_TYPE).getBody().getJSONObject("data");
         return ResponseResult.success(data);
     }
 

src/main/java/com/zhiwei/brandkbs2/es/EsQueryTools.java

@@ -98,7 +98,7 @@ public class EsQueryTools {
     public static BoolQueryBuilder assembleCacheMapsQuery(String projectId, String linkedGroupId, String contendId, List<String> mediaTypes) {
         BoolQueryBuilder nestedBoolQueryBuilder = QueryBuilders.boolQuery();
         // must key
-        nestedBoolQueryBuilder.must(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.key.keyword", concat(projectId, linkedGroupId, contendId))));
+        nestedBoolQueryBuilder.must(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.key.keyword", concat(projectId, contendId))));
         // mediaType
         if (CollectionUtils.isNotEmpty(mediaTypes)) {
             BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
@@ -188,9 +188,16 @@ public class EsQueryTools {
     }
 
     public static void assembleContendsQuery(BoolQueryBuilder query, Collection<String> contends) {
+        if (CollectionUtils.isEmpty(contends)) {
+            return;
+        }
+        for (String contendId : contends) {
+            query.should(cacheMapsNestedQuery(QueryBuilders.termQuery("brandkbs_cache_maps.contend_id.keyword", contendId)));
+        }
+    }
+
+    public static void assembleContendsQuery4Channel(BoolQueryBuilder query, Collection<String> contends) {
         BoolQueryBuilder contendQuery = QueryBuilders.boolQuery();
-        // 主品牌一定参与
-//        contendQuery.should(QueryBuilders.termQuery("contend_id.keyword", "0"));
         if (CollectionUtils.isEmpty(contends)) {
             return;
         }

src/main/java/com/zhiwei/brandkbs2/pojo/external/BaseMapCompound.java

@@ -31,7 +31,7 @@ public class BaseMapCompound {
     public static BaseMapCompound createFromBaseMap(BaseMap baseMap, String projectId) {
         List<String> tagList = new ArrayList<>();
         // 情感倾向
-        tagList.add(baseMap.getEmotion());
+//        tagList.add(baseMap.getEmotion());
         // 媒体类型
         String mediaType = GlobalPojo.getMediaType(projectId, baseMap.getPlatform(), baseMap.getSource());
         if (null != mediaType) {

src/main/java/com/zhiwei/brandkbs2/pojo/external/BrandkbsHotTopWarn.java

 package com.zhiwei.brandkbs2.pojo.external;
 
+import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.List;
 
 /**
@@ -51,6 +54,17 @@ public class BrandkbsHotTopWarn {
          * 上榜时间
          */
         private Long time;
+
+        public static HotTop createFromJSON(JSONObject json, String topReason, String topName) {
+            HotTop hotTop = new HotTop();
+            hotTop.setTitle(json.getString("name"));
+            hotTop.setTopReason(topReason);
+            hotTop.setRank(json.getString("lastRank") + "名");
+            hotTop.setHot(BigDecimal.valueOf(json.getLongValue("lastCount") / 10000.00).setScale(2, RoundingMode.UP) + "w");
+            hotTop.setTopName(topName);
+            hotTop.setTime(json.getLong("endTime"));
+            return hotTop;
+        }
     }
 
 }

src/main/java/com/zhiwei/brandkbs2/pojo/external/BrandkbsNewCaseWarn.java

 package com.zhiwei.brandkbs2.pojo.external;
 
+import com.zhiwei.brandkbs2.pojo.vo.CrisisCaseWarnVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -39,6 +41,26 @@ public class BrandkbsNewCaseWarn {
          * 案例类别
          */
         private String caseType;
+
+        /**
+         * 分享链接
+         */
+        private String url;
+
+        public static NewCase createFromCrisisCaseWarnVO(CrisisCaseWarnVO vo, String url) {
+            NewCase newCase = new NewCase();
+            newCase.setTitle(vo.getEventName());
+            List<String> tagList = new ArrayList<>();
+            tagList.add(vo.getPriBrand());
+            tagList.addAll(vo.getPriCrisisTags());
+            newCase.setTagList(tagList);
+            newCase.setContent(vo.getIntroduction());
+            newCase.setSpreadIndex(vo.getInterveneScore());
+            newCase.setCaseType(vo.getCategory());
+            newCase.setUrl(url);
+            return newCase;
+        }
+
     }
 
 }

src/main/java/com/zhiwei/brandkbs2/pojo/vo/CrisisCaseWarnVO.java

+package com.zhiwei.brandkbs2.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.ToString;
+
+import java.util.List;
+
+@Data
+@ToString
+@ApiModel("危机案例预警展示")
+public class CrisisCaseWarnVO {
+
+    /**
+     * id
+     */
+    private int id;
+
+    /**
+     * 事件名
+     */
+    private String eventName;
+
+    /**
+     * 简介
+     */
+    private String introduction;
+
+
+    /**
+     * 主品牌名
+     */
+    private String priBrand;
+
+    /**
+     * 主品牌危机标签
+     */
+    private List<String> priCrisisTags;
+
+
+    /**
+     * 公关传播效果指数
+     */
+    private Double interveneScore;
+
+    /**
+     * 案例类别
+     */
+    private String category;
+
+}

src/main/java/com/zhiwei/brandkbs2/service/ProjectWarnService.java

@@ -5,6 +5,7 @@ import com.zhiwei.brandkbs2.pojo.external.BrandkbsChannelConfig;
 import com.zhiwei.brandkbs2.pojo.external.BrandkbsHotEventConfig;
 import com.zhiwei.brandkbs2.pojo.external.BrandkbsHotTopConfig;
 import com.zhiwei.brandkbs2.pojo.external.BrandkbsYuQingConfig;
+import com.zhiwei.brandkbs2.pojo.vo.CrisisCaseWarnVO;
 
 public interface ProjectWarnService {
 
@@ -16,16 +17,56 @@ public interface ProjectWarnService {
      */
     ResponseResult getProjectWarnCriteria(String projectId, String type);
 
+    /**
+     * 获取项目预警条件默认值
+     * @param projectId
+     * @param type
+     * @return
+     */
     ResponseResult getProjectWarnCriteriaDefault(String projectId, String type);
 
+    /**
+     * 获取舆情动态预警
+     * @param projectId
+     * @param brandkbsYuQingConfig
+     * @return
+     */
     ResponseResult getYuqingWaring(String projectId, BrandkbsYuQingConfig brandkbsYuQingConfig);
 
+    /**
+     * 获取渠道参与预警
+     * @param projectId
+     * @param brandkbsChannelConfig
+     * @return
+     */
     ResponseResult getChannelWaring(String projectId, BrandkbsChannelConfig brandkbsChannelConfig);
 
+    /**
+     * 获取热点事件预警
+     * @param projectId
+     * @param brandkbsHotEventConfig
+     * @return
+     */
     ResponseResult getHotEventWaring(String projectId, BrandkbsHotEventConfig brandkbsHotEventConfig);
 
+    /**
+     * 获取上榜热搜预警
+     * @param projectId
+     * @param config
+     * @return
+     */
     ResponseResult getHotTopWaring(String projectId, BrandkbsHotTopConfig config);
 
+    /**
+     * 获取案例上新预警
+     * @param projectId
+     * @return
+     */
     ResponseResult getNewCaseWaring(String projectId);
 
+    /**
+     * 案例上新主动调用
+     * @param caseWarnVO
+     */
+    void newCrisisCaseWarn(CrisisCaseWarnVO caseWarnVO);
 }

src/main/java/com/zhiwei/brandkbs2/service/impl/ChannelServiceImpl.java

@@ -1407,7 +1407,7 @@ public class ChannelServiceImpl implements ChannelService {
         query.must(QueryBuilders.termQuery("project_id.keyword", projectId));
         // 添加contends集合 查询
         if (null != contendIds) {
-            EsQueryTools.assembleContendsQuery(query, contendIds);
+            EsQueryTools.assembleContendsQuery4Channel(query, contendIds);
         }
         // 添加渠道限制
         if (null != channelId) {

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkFlowServiceImpl.java

@@ -142,6 +142,7 @@ public class MarkFlowServiceImpl implements MarkFlowService {
         }
         double channelValue = tJson.getDoubleValue(GenericAttribute.ES_CHANNEL_INFLUENCE);
         if (channelValue > 0) {
+            // 保留两位小数
             sourceDetails.put("channelInfluence", new BigDecimal(channelValue).setScale(2, RoundingMode.UP));
         }
         return sourceDetails;

src/main/java/com/zhiwei/brandkbs2/util/RedisUtil.java

@@ -5,6 +5,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -55,6 +57,18 @@ public class RedisUtil {
         return RedisKeyPrefix.CHANNEL_RECORD_LIST + Tools.concat(projectId, startTime, endTime);
     }
 
+    public static String getNewCrisisCaseListAllKey() {
+        return RedisKeyPrefix.PROJECT_WARN_NEW_CASE_LIST + "*";
+    }
+
+    public static String getNewCrisisCaseListKey(String id) {
+        return RedisKeyPrefix.PROJECT_WARN_NEW_CASE_LIST + id;
+    }
+
+    public static String getNewCrisisCaseCursor(String projectId) {
+        return RedisKeyPrefix.PROJECT_WARN_NEW_CASE_CURSOR + projectId;
+    }
+
     public void setExpire(String key, String value, long timeout, TimeUnit unit) {
         stringRedisTemplate.opsForValue().set(key, value, timeout, unit);
     }
@@ -74,6 +88,21 @@ public class RedisUtil {
         return stringRedisTemplate.opsForValue().get(key);
     }
 
+    public Set<String> keys(String key) {
+        return stringRedisTemplate.keys(key);
+    }
+
+    public void setListLeft(String key, String value) {
+        if (null == key) {
+            return;
+        }
+        stringRedisTemplate.opsForList().leftPush(key, value);
+    }
+
+    public List<String> getListAll(String key) {
+        return stringRedisTemplate.opsForList().range(key, 0, -1);
+    }
+
     public void remove(String key) {
         setExpire(key, "-1", 1, TimeUnit.SECONDS);
     }

src/main/java/com/zhiwei/brandkbs2/util/Tools.java

@@ -852,6 +852,9 @@ public class Tools {
     }
 
     public static boolean isContains(String keyword, String content) {
+        if (null == keyword) {
+            return true;
+        }
         return isContains(Arrays.asList(keyword.split("\\|")), content);
     }
 
@@ -884,6 +887,37 @@ public class Tools {
         return false;
     }
 
+    public static boolean isExclusive(String keyword, String content) {
+        if (null == keyword) {
+            return true;
+        }
+        return isExclusive(Arrays.asList(keyword.split("\\|")), content);
+    }
+
+    /**
+     * 是否排除关键字 只有或逻辑
+     *
+     * @param filterKeywords 排除关键词
+     * @param data     字符串标题+内容
+     * @return 是否包含关键字
+     */
+    public static boolean isExclusive(List<String> filterKeywords, String data) {
+        boolean exclusive = true;
+        for (String key : filterKeywords) {
+            if(StringUtils.isBlank(key)){
+                continue;
+            }
+            if (data.contains(key.toLowerCase())) {
+                exclusive=false;
+            }
+            if (!exclusive) {
+                //已经满足条件，视为有效数据，结束循环
+                break;
+            }
+        }
+        return exclusive;
+    }
+
     public static JSONObject getBrandkbsHitMap(Map<String, Object> esMap, String hitKey) {
         List<Map<String, Object>> cacheMaps = (List<Map<String, Object>>) esMap.get(GenericAttribute.ES_BRANDKBS_CACHE_MAPS);
         for (Map<String, Object> cacheMap : cacheMaps) {

src/main/resources/application-dev.properties

@@ -64,6 +64,7 @@ crisis.top3.url=https://crisis.zhiweidata.com/app/brandkbs/event/online-top3
 crisis.searchCriteria.url=https://crisis.zhiweidata.com/app/brandkbs/condition
 crisis.list.url=https://crisis.zhiweidata.com/app/brandkbs/crisisList?page={1}&size={2}&startTime={3}&endTime={4}&category={5}
 crisis.share.url=https://crisis.zhiweidata.com/app/brandkbs/share/{1}
+crisis.event.url =https://crisis.zhiweidata.com/event/{1}/general?share={2}
 #\u70ED\u70B9\u5E93\u5916\u90E8\u63A5\u53E3
 trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/longTimeInListSearchByInner?sortType={1}&type={2}
 trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
@@ -82,14 +83,15 @@ whole.searchCriteria.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface
 whole.extraParam.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/extra/param
 #\u60C5\u62A5\u9884\u8B66\u5916\u90E8\u63A5\u53E3
 warn.pushTask.token=AoJ0ooy3H2BpHmuaviYObTKw/Xfw/oA5aKccNYhYnoJFJQ/BgeW/
-warn.project.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/project?projectId={1}&projectName={2}
-warn.ticket.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/code?pushId={1}&taskType={2}
-warn.pushRecipientsList.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/pushRecipients/{1}?taskType={2}
-warn.deletePushRecipients.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/pushRecipients/?pushId={1}&recipientsId={2}&taskType={3}
-warn.channel.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/config/channel/{1}
-warn.hotEvent.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/config/hotEvent/{1}
-warn.hotTop.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/config/hotTop/{1}
-warn.yuQing.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/config/yuQing/{1}
-warn.taskSwitch.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/enable/used
+warn.project.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/project?projectId={1}&projectName={2}
+warn.ticket.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/code?pushId={1}&taskType={2}
+warn.pushRecipientsList.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/pushRecipients/{1}?taskType={2}
+warn.deletePushRecipients.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/pushRecipients/?pushId={1}&recipientsId={2}&taskType={3}
+warn.channel.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/config/channel/{1}
+warn.hotEvent.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/config/hotEvent/{1}
+warn.hotTop.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/config/hotTop/{1}
+warn.yuQing.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/config/yuQing/{1}
+warn.taskSwitch.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/enable/used
 #\u9884\u8B66\u5916\u90E8\u63A5\u53E3
-ef.external.filterNew.url=https://ef.zhiweidata.com/external/filterNew.do?firstTypes={1}&start={2}&end={3}
\ No newline at end of file
+ef.external.filterNew.url=https://ef.zhiweidata.com/external/filterNew.do?firstTypes={1}&start={2}&end={3}
+hot.search.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findNewHotSearch?type={1}
\ No newline at end of file

src/main/resources/application-local.properties

@@ -66,6 +66,7 @@ crisis.top3.url=https://crisis.zhiweidata.com/app/brandkbs/event/online-top3
 crisis.searchCriteria.url=https://crisis.zhiweidata.com/app/brandkbs/condition
 crisis.list.url=https://crisis.zhiweidata.com/app/brandkbs/crisisList?page={1}&size={2}&startTime={3}&endTime={4}&category={5}
 crisis.share.url=https://crisis.zhiweidata.com/app/brandkbs/share/{1}
+crisis.event.url =https://crisis.zhiweidata.com/event/{1}/general?share={2}
 #\u70ED\u70B9\u5E93\u5916\u90E8\u63A5\u53E3
 trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/longTimeInListSearchByInner?sortType={1}&type={2}
 trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
@@ -84,14 +85,15 @@ whole.searchCriteria.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface
 whole.extraParam.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/extra/param
 #\u60C5\u62A5\u9884\u8B66\u5916\u90E8\u63A5\u53E3
 warn.pushTask.token=AoJ0ooy3H2BpHmuaviYObTKw/Xfw/oA5aKccNYhYnoJFJQ/BgeW/
-warn.project.url=http://192.168.0.225:11003/qbjc/pushTask/interface/brandkbs/project?projectId={1}&projectName={2}
-warn.ticket.url=http://192.168.0.225:11003/qbjc/pushTask/interface/code?pushId={1}&taskType={2}
-warn.pushRecipientsList.url=http://192.168.0.225:11003/qbjc/pushTask/interface/pushRecipients/{1}?taskType={2}
-warn.deletePushRecipients.url=http://192.168.0.225:11003/qbjc/pushTask/interface/pushRecipients/?pushId={1}&recipientsId={2}&taskType={3}
-warn.channel.url=http://192.168.0.225:11003/qbjc/pushTask/interface/brandkbs/config/channel/{1}
-warn.hotEvent.url=http://192.168.0.225:11003/qbjc/pushTask/interface/brandkbs/config/hotEvent/{1}
-warn.hotTop.url=http://192.168.0.225:11003/qbjc/pushTask/interface/brandkbs/config/hotTop/{1}
-warn.yuQing.url=http://192.168.0.225:11003/qbjc/pushTask/interface/brandkbs/config/yuQing/{1}
-warn.taskSwitch.url=http://192.168.0.225:11003/qbjc/pushTask/interface/brandkbs/enable/used
+warn.project.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/brandkbs/project?projectId={1}&projectName={2}
+warn.ticket.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/code?pushId={1}&taskType={2}
+warn.pushRecipientsList.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/pushRecipients/{1}?taskType={2}
+warn.deletePushRecipients.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/pushRecipients/?pushId={1}&recipientsId={2}&taskType={3}
+warn.channel.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/brandkbs/config/channel/{1}
+warn.hotEvent.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/brandkbs/config/hotEvent/{1}
+warn.hotTop.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/brandkbs/config/hotTop/{1}
+warn.yuQing.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/brandkbs/config/yuQing/{1}
+warn.taskSwitch.url=http://192.168.0.225:11003/qbjc/brandkbsPush/interface/brandkbs/enable/used
 #\u9884\u8B66\u5916\u90E8\u63A5\u53E3
-ef.external.filterNew.url=https://ef.zhiweidata.com/external/filterNew.do?firstTypes={1}&start={2}&end={3}
\ No newline at end of file
+ef.external.filterNew.url=https://ef.zhiweidata.com/external/filterNew.do?firstTypes={1}&start={2}&end={3}
+hot.search.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findNewHotSearch?type={1}
\ No newline at end of file

src/main/resources/application-prod.properties

@@ -64,6 +64,7 @@ crisis.top3.url=https://crisis.zhiweidata.com/app/brandkbs/event/online-top3
 crisis.searchCriteria.url=https://crisis.zhiweidata.com/app/brandkbs/condition
 crisis.list.url=https://crisis.zhiweidata.com/app/brandkbs/crisisList?page={1}&size={2}&startTime={3}&endTime={4}&category={5}
 crisis.share.url=https://crisis.zhiweidata.com/app/brandkbs/share/{1}
+crisis.event.url =https://crisis.zhiweidata.com/event/{1}/general?share={2}
 #\u70ED\u70B9\u5E93\u5916\u90E8\u63A5\u53E3
 trends.longTimeInListSearchByInner.url=https://trends.zhiweidata.com/hotSearchTrend/inner/longTimeInListSearchByInner?sortType={1}&type={2}
 trends.findHotSearchESDataInTimeByInner.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findHotSearchESDataInTimeByInner?limit={1}&page={2}&type={3}&word={4}
@@ -82,14 +83,15 @@ whole.searchCriteria.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface
 whole.extraParam.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/middleware/search/extra/param
 #\u60C5\u62A5\u9884\u8B66\u5916\u90E8\u63A5\u53E3
 warn.pushTask.token=AoJ0ooy3H2BpHmuaviYObTKw/Xfw/oA5aKccNYhYnoJFJQ/BgeW/
-warn.project.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/project?projectId={1}&projectName={2}
-warn.ticket.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/code?pushId={1}&taskType={2}
-warn.pushRecipientsList.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/pushRecipients/{1}?taskType={2}
-warn.deletePushRecipients.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/pushRecipients/?pushId={1}&recipientsId={2}&taskType={3}
-warn.channel.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/config/channel/{1}
-warn.hotEvent.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/config/hotEvent/{1}
-warn.hotTop.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/config/hotTop/{1}
-warn.yuQing.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/config/yuQing/{1}
-warn.taskSwitch.url=https://auto-push.zhiweidata.com/qbjc/pushTask/interface/brandkbs/enable/used
+warn.project.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/project?projectId={1}&projectName={2}
+warn.ticket.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/code?pushId={1}&taskType={2}
+warn.pushRecipientsList.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/pushRecipients/{1}?taskType={2}
+warn.deletePushRecipients.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/pushRecipients/?pushId={1}&recipientsId={2}&taskType={3}
+warn.channel.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/config/channel/{1}
+warn.hotEvent.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/config/hotEvent/{1}
+warn.hotTop.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/config/hotTop/{1}
+warn.yuQing.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/config/yuQing/{1}
+warn.taskSwitch.url=https://auto-push.zhiweidata.com/qbjc/brandkbsPush/interface/brandkbs/enable/used
 #\u9884\u8B66\u5916\u90E8\u63A5\u53E3
-ef.external.filterNew.url=https://ef.zhiweidata.com/external/filterNew.do?firstTypes={1}&start={2}&end={3}
\ No newline at end of file
+ef.external.filterNew.url=https://ef.zhiweidata.com/external/filterNew.do?firstTypes={1}&start={2}&end={3}
+hot.search.url=https://hotsearch-manage.zhiweidata.com/hotsearch/hotSearch/findNewHotSearch?type={1}
\ No newline at end of file