Merge branch 'feature' into 'dev'

Feature

See merge request !139

src/main/java/com/zhiwei/brandkbs2/auth/AuthAspect.java

@@ -55,15 +55,20 @@ public class AuthAspect {
         String token = request.getHeader(jwtKey);
         // 存在有效token
         if (null != token && !Tools.tokenEmpty(token)) {
-            Map<String, Object> tokenInfo = JwtUtil.unsign(token, Map.class);
-            String uid = tokenInfo.get(GenericAttribute.USER_ID).toString();
-            UserInfo userInfo = UserService.queryUserInfo(uid, request.getHeader("pid"));
-            if (null == userInfo) {
-                userInfo = new UserInfo().setUserId(uid).setProjectId(request.getHeader("pid"));
+            Object proceed;
+            try {
+                Map<String, Object> tokenInfo = JwtUtil.unsign(token, Map.class);
+                String uid = tokenInfo.get(GenericAttribute.USER_ID).toString();
+                UserInfo userInfo = UserService.queryUserInfo(uid, request.getHeader("pid"));
+                if (null == userInfo) {
+                    userInfo = new UserInfo().setUserId(uid).setProjectId(request.getHeader("pid"));
+                }
+                UserThreadLocal.set(userInfo);
+            } catch (Exception ignore) {
+            } finally {
+                proceed = joinPoint.proceed();
+                UserThreadLocal.clear();
             }
-            UserThreadLocal.set(userInfo);
-            Object proceed = joinPoint.proceed();
-            UserThreadLocal.clear();
             // todo 操作记录收集
             return proceed;
         }

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

@@ -249,4 +249,11 @@ public class AppEventController extends BaseController {
                                                    @RequestParam(value = "aggTitle", required = false) String aggTitle){
         return ResponseResult.success(eventService.eventTopArticlesAnalysis(eventId, type, emotion, aggTitle));
     }
+
+    @ApiOperation("前台事件库-事件详情-持续事件")
+    @GetMapping("/detail/continue-event")
+    public ResponseResult continueEvent(@RequestParam(value = "eventId") String eventId){
+        eventService.continueEvent(eventId);
+        return ResponseResult.success();
+    }
 }

src/main/java/com/zhiwei/brandkbs2/interceptor/InterceptorConfig.java

@@ -22,6 +22,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		// 自定义拦截器，添加拦截路径和排除拦截路径
-		registry.addInterceptor(mainAuthInterceptor).addPathPatterns("/app/**","/admin/**").excludePathPatterns();
+		registry.addInterceptor(mainAuthInterceptor).addPathPatterns("/app/**","/admin/**").excludePathPatterns("/app/event/detail/**");
 	}
 }

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

@@ -394,4 +394,10 @@ public interface EventService {
      * @return
      */
     JSONObject eventTopArticlesAnalysis(String eventId, String type, String emotion, String aggTitle);
+
+    /**
+     * 持续事件
+     * @param eventId       事件id
+     */
+    void continueEvent(String eventId);
 }

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

@@ -863,6 +863,16 @@ public class EventServiceImpl implements EventService {
         return eventClient.eventTopArticlesAnalysis(eventId, type, emotion, aggTitle);
     }
 
+    @Override
+    public void continueEvent(String eventId) {
+        ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        HttpServletRequest request = Objects.requireNonNull(requestAttributes).getRequest();
+        String submitterId = JwtUtil.unsign(request.getHeader(jwtKey), Map.class).get(GenericAttribute.USER_ID).toString();
+        String submitter = userService.queryUserInfo(submitterId, UserThreadLocal.getProjectId()).getNickname();
+
+        eventClient.continueEvent(eventId, submitter, submitterId);
+    }
+
     @Data
     public static class MongoQueryUtil {
 

src/main/resources/application-local.properties

@@ -52,7 +52,7 @@ mark.registry.address=zookeeper://192.168.0.11:2181?backup=192.168.0.30:2181,192
 mark.provider.group=zhiwei-mark-test_liuyu
 #\u4E8B\u4EF6\u4E2D\u95F4\u4EF6
 event.registry.address=zookeeper://192.168.0.11:2181?backup=192.168.0.30:2181,192.168.0.35:2181
-event.provider.group=zhiwei-event
+event.provider.group=zhiwei-event-ygd
 #\u7528\u6237\u4E2D\u5FC3
 auth.center.client.consumer.group=zhiwei-auth-dev-liuyu
 auth.center.client.registry.address=zookeeper://192.168.0.11:2181?backup=192.168.0.30:2181,192.168.0.35:2181