Merge branch 'feature' into 'release'

事件中间件eventChannelVoices方法调整

See merge request !193

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.4-SNAPSHOT</event-client.version>
+        <event-client.version>1.0.5-SNAPSHOT</event-client.version>
     </properties>
 
     <dependencies>

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

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.zhiwei.brandkbs2.auth.UserThreadLocal;
 import com.zhiwei.brandkbs2.common.GenericAttribute;
-import com.zhiwei.brandkbs2.common.GlobalPojo;
 import com.zhiwei.brandkbs2.common.RedisKeyPrefix;
 import com.zhiwei.brandkbs2.config.Constant;
 import com.zhiwei.brandkbs2.dao.EventDao;
@@ -23,10 +22,10 @@ import com.zhiwei.brandkbs2.easyexcel.listener.EventFileListener;
 import com.zhiwei.brandkbs2.enmus.EmotionEnum;
 import com.zhiwei.brandkbs2.enmus.EventTagEnum;
 import com.zhiwei.brandkbs2.enmus.ImportantChannelEnum;
+import com.zhiwei.brandkbs2.enmus.response.EventCodeEnum;
 import com.zhiwei.brandkbs2.exception.ExceptionCast;
 import com.zhiwei.brandkbs2.listener.ApplicationProjectListener;
 import com.zhiwei.brandkbs2.model.CommonCodeEnum;
-import com.zhiwei.brandkbs2.enmus.response.EventCodeEnum;
 import com.zhiwei.brandkbs2.pojo.*;
 import com.zhiwei.brandkbs2.pojo.dto.EventDataDTO;
 import com.zhiwei.brandkbs2.pojo.dto.EventSearchDTO;
@@ -855,7 +854,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, UserThreadLocal.getProjectId());
+        return eventClient.eventChannelVoices(eventId, type, page, pageSize, sorter);
     }
 
     @Override