Merge branch 'feature' into 'release'

Feature

See merge request !136

pom.xml

@@ -35,7 +35,7 @@
         <dubbo.version>2.7.4.1</dubbo.version>
         <curator.version>2.12.0</curator.version>
         <push.log.version>2.17.0-SNAPSHOT</push.log.version>
-        <event-client.version>1.0.1-SNAPSHOT</event-client.version>
+        <event-client.version>1.0.2-SNAPSHOT</event-client.version>
     </properties>
 
     <dependencies>

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

@@ -14,7 +14,7 @@ public class GenericAttribute {
     /**
      * es index
      */
-    public static final String ES_INDEX_PRE = "brandkbs2";
+    public static final String ES_INDEX_PRE = "brandkbs2_";
 //  public static final String ES_INDEX_TEST = "brandkbs2_test";
     public static final String ES_INDEX_TEST = "brandkbs2_2022";
     public static final String ES_CHANNEL_INDEX_TEST = "brandkbs2_channel_record_test";

src/main/java/com/zhiwei/brandkbs2/dao/impl/ChannelDaoImpl.java

@@ -44,11 +44,6 @@ public class ChannelDaoImpl extends BaseMongoDaoImpl<Channel> implements Channel
         if (null == channelIndex) {
             return null;
         }
-//        Query query = Query.query(Criteria.where("linkedGroupId").is(channelIndex.getLinkedGroupId()).
-//                and("projectId").is(channelIndex.getProjectId()).
-//                and("platform").is(channelIndex.getPlatform()).
-//                and("realSource").is(channelIndex.getRealSource()).
-//                and("source").is(channelIndex.getSource()));
         return queryUnique(channelIndex.getFid());
     }
 

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

@@ -855,7 +855,7 @@ public class EventServiceImpl implements EventService {
 
     @Override
     public PageData<JSONObject> eventChannelVoices(String eventId, String type, int page, int pageSize, String sorter) {
-        return eventClient.eventChannelVoices(eventId, type, page, pageSize, sorter);
+        return eventClient.eventChannelVoices(eventId, type, page, pageSize, sorter, UserThreadLocal.getProjectId());
     }
 
     @Override

src/main/resources/application-dev.properties

@@ -36,7 +36,7 @@ es.httpClusterNodes=192.168.0.130:9200:qbjc-back:yuqing.zhiweidata.com,192.168.0
 #es.password=3vh65l$i6qQA
 es.username=joker
 es.password=jokerdevops
-es.index.test = true
+es.index.test = false
 
 #channel-index
 channel.index.registry=zookeeper://192.168.0.104:2182?backup=192.168.0.105:2182,192.168.0.203:2182
@@ -62,6 +62,8 @@ qbjc.project.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/project
 qbjc.event.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/aplan/event
 qbjc.event.tag.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/tag/event?project={1}
 qbjc.platform.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/platform/resource
+qbjc.userCenter.url=https://login.zhiweidata.com/plogin/center
+qbjc.userCenter.token=AoJ0ooy3HV1EElWnvQw9YTS9b5Y+fmtkbM6DdpPgDO6D/OhNqH4qrJKarzMr
 #\u5371\u673A\u5E93\u5916\u90E8\u63A5\u53E3
 crisis.search.url=https://crisis.zhiweidata.com/app/brandkbs/crisisSearch?page={1}&size={2}&keyword={3}
 crisis.searchTags.url=https://crisis.zhiweidata.com/app/brandkbs/searchCrisisByTags?page={1}&size={2}&brand={3}&category={4}

src/main/resources/application-prod.properties

@@ -36,7 +36,7 @@ es.httpClusterNodes=192.168.0.130:9200:qbjc-back:yuqing.zhiweidata.com,192.168.0
 #es.password=3vh65l$i6qQA
 es.username=joker
 es.password=jokerdevops
-es.index.test = true
+es.index.test = false
 
 #channel-index
 channel.index.registry=zookeeper://192.168.0.104:2182?backup=192.168.0.105:2182,192.168.0.203:2182
@@ -62,6 +62,8 @@ qbjc.project.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/project
 qbjc.event.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/aplan/event
 qbjc.event.tag.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/tag/event?project={1}
 qbjc.platform.url=https://yuqing.zhiweidata.com/qbjcbackPhoenix/interface/platform/resource
+qbjc.userCenter.url=https://login.zhiweidata.com/plogin/center
+qbjc.userCenter.token=AoJ0ooy3HV1EElWnvQw9YTS9b5Y+fmtkbM6DdpPgDO6D/OhNqH4qrJKarzMr
 #\u5371\u673A\u5E93\u5916\u90E8\u63A5\u53E3
 crisis.search.url=https://crisis.zhiweidata.com/app/brandkbs/crisisSearch?page={1}&size={2}&keyword={3}
 crisis.searchTags.url=https://crisis.zhiweidata.com/app/brandkbs/searchCrisisByTags?page={1}&size={2}&brand={3}&category={4}