Merge branch 'release' into 'master'

Release



See merge request !1

common/src/main/java/com/pica/cloud/online/exam/analysis/common/CommonUtils.java

 package com.pica.cloud.online.exam.analysis.common;
 
 import com.alibaba.fastjson.JSON;
-import com.pica.cloud.foundation.redis.RedisClient;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,14 +24,4 @@ public class CommonUtils {
         }
         return JSON.parseObject(JSON.toJSONString(map), PicaUser.class);
     }
-
-    public static PicaUser getUserByToken(RedisClient client, String token) {
-        PicaUser picaUser = null;
-        try {
-            picaUser = CommonUtils.getUser(client.getToken(token));
-        } catch (Exception e) {
-            logger.error("根据token获取user失败：" + token);
-        }
-        return picaUser;
-    }
 }

pom.xml

@@ -12,7 +12,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-utils</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

server/pom.xml

@@ -101,17 +101,15 @@
             <artifactId>springfox-swagger-ui</artifactId>
             <version>2.8.0</version>
         </dependency>
-
         <dependency>
-            <groupId>com.pica.cloud.foundation</groupId>
-            <artifactId>pica-cloud-redis</artifactId>
-            <version>1.1.2</version>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>2.9.0</version>
         </dependency>
-
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
-            <artifactId>pica-cloud-utils</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
+            <artifactId>pica-cloud-redis</artifactId>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -138,10 +136,6 @@
             <version>5.1.39</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
@@ -154,11 +148,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.pica.cloud.foundation</groupId>
-            <artifactId>pica-cloud-utils</artifactId>
-            <version>1.0.7-SNAPSHOT</version>
-        </dependency>
 		<dependency>
 		    <groupId>com.dianping.cat</groupId>
 		    <artifactId>cat-core</artifactId>

server/src/main/java/com/pica/cloud/online/exam/analysis/server/App.java

@@ -9,10 +9,10 @@ import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @EnableCircuitBreaker
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "com.pica.cloud")
 @EnableDiscoveryClient
 @EnableSwagger2
-@EnableFeignClients
+@EnableFeignClients(basePackages = "com.pica.cloud")
 @MapperScan("com.pica.cloud.online.exam.analysis.server.mapper")
 public class App {
     public static void main( String[] args )

server/src/main/java/com/pica/cloud/online/exam/analysis/server/configuration/BeanConfiguration.java

 package com.pica.cloud.online.exam.analysis.server.configuration;
 
+import com.pica.cloud.foundation.redis.CacheMigrateClient;
+import com.pica.cloud.foundation.redis.ICacheClient;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.pica.cloud.foundation.redis.RedisClient;
 
 @Configuration
 @RefreshScope
 public class BeanConfiguration {
+    @Autowired
+    private SpringContextAware springContextAware;
+
     @Value("${spring.redis.config}")
     private String configStr;
 
     @Bean
-    public RedisClient redisClient() {
-        System.out.println(configStr);
+    @ConditionalOnMissingBean
+    public ICacheClient cacheClient() {
+        return new CacheMigrateClient(springContextAware.getActiveProfile());
 
-        return new RedisClient(configStr);
     }
 }

server/src/main/java/com/pica/cloud/online/exam/analysis/server/configuration/SpringContextAware.java

+package com.pica.cloud.online.exam.analysis.server.configuration;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author wuminghao
+ * @date 2018/12/27 14:11
+ */
+@Component
+public class SpringContextAware implements ApplicationContextAware {
+    private ApplicationContext context = null;
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext)
+            throws BeansException {
+        this.context = applicationContext;
+    }
+
+    public String getActiveProfile() {
+        return context.getEnvironment().getActiveProfiles()[0];
+    }
+}

server/src/main/java/com/pica/cloud/online/exam/analysis/server/controller/AntiSpamController.java

@@ -3,17 +3,16 @@ package com.pica.cloud.online.exam.analysis.server.controller;
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
-import com.pica.cloud.foundation.redis.RedisClient;
+import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.annotation.LoginPermission;
+import com.pica.cloud.foundation.utils.controller.BaseController;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
-import com.pica.cloud.online.exam.analysis.common.CommonUtils;
 import com.pica.cloud.online.exam.analysis.common.util.ReturnUtil;
 import com.pica.cloud.online.exam.analysis.server.service.AntiSpamService;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.tuple.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -22,10 +21,10 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/antispam")
-@Api(value = "内容甄别解析", description = "检测文本、图片内容")
-public class AntiSpamController {
+public class AntiSpamController extends BaseController {
+    @Qualifier("cacheMigrateClient")
     @Autowired
-    private RedisClient redisClient;
+    private ICacheClient redisClient;
 
     @Autowired
     AntiSpamService antiSpamService;
@@ -36,33 +35,17 @@ public class AntiSpamController {
     public PicaResponse processText(@RequestBody String content,
                                 @RequestHeader String sysCode,
                                 @RequestHeader String token) {
-        PicaUser user = CommonUtils.getUserByToken(redisClient, token);
-
-        if (user == null || user.getId().intValue() == 0) {
-            return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
-        }
-
-        StringBuilder sbContent = new StringBuilder();
-        /**
-         * type:0 不检测广告 其他: 检测广告, 默认不检测
-         */
-        Integer type = 0;
+        PicaUser user = fetchPicaUser();
+        Pair<String, Integer> params;
         try {
-            JSONObject jsonObject = JSONObject.parseObject(content);
-            sbContent.append(jsonObject.get("content").toString());
-            type = (jsonObject.get("type") != null ? Integer.parseInt(jsonObject.get("type").toString()) : 0);
+            params = parseContentAndType(content);
         } catch (Exception e) {
             return ReturnUtil.getPicaResponse(PicaResultCode.PARAM_IS_INVALID);
         }
-
-        return antiSpamService.processString(
-                user.getId(),
-                sysCode,
-                sbContent.toString(),
-                type != 0
-        );
+        return antiSpamService.processString(user.getId(), sysCode, params.getLeft(), params.getRight() != 0);
    }
 
+    @LoginPermission
     @ApiOperation(value = "内容检测", response = PicaResponse.class)
     @RequestMapping(value = "/text/v1", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
     public PicaResponse processTextV1(@RequestBody String content,
@@ -71,53 +54,30 @@ public class AntiSpamController {
         return processText(content, sysCode, token);
     }
 
+    @LoginPermission
     @ApiOperation(value = "内容检测", response = PicaResponse.class)
     @RequestMapping(value = "/text/v2", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
     public PicaResponse processTextV2(@RequestBody String content,
                                       @RequestHeader String sysCode,
                                       @RequestHeader String token) {
-        PicaUser user = CommonUtils.getUserByToken(redisClient, token);
-
-        if (user == null || user.getId().intValue() == 0) {
-            return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
-        }
-
-        StringBuilder sbContent = new StringBuilder();
-        /**
-         * type:0 不检测广告 其他: 检测广告, 默认不检测
-         */
-        Integer type = 0;
+        PicaUser user = fetchPicaUser();
+        Pair<String, Integer> params;
         try {
-            JSONObject jsonObject = JSONObject.parseObject(content);
-            sbContent.append(jsonObject.get("content").toString());
-            type = (jsonObject.get("type") != null ? Integer.parseInt(jsonObject.get("type").toString()) : 0);
+             params = parseContentAndType(content);
         } catch (Exception e) {
             return ReturnUtil.getPicaResponse(PicaResultCode.PARAM_IS_INVALID);
         }
 
-        return antiSpamService.processStringV2(
-                user.getId(),
-                sysCode,
-                sbContent.toString(),
-                type != 0
-        );
+        return antiSpamService.processStringV2(user.getId(), sysCode, params.getLeft(), params.getRight() != 0);
     }
 
+    @LoginPermission
     @ApiOperation(value = "图片检测", response = PicaResponse.class)
     @RequestMapping(value = "/image", method = RequestMethod.POST, produces = "application/json;charset=UTF-8")
     public PicaResponse processImage(@RequestBody String content,
                                 @RequestHeader String sysCode,
                                 @RequestHeader String token) {
-        if (token == null) {
-            return ReturnUtil.getPicaResponse(PicaResultCode.SYSTEM_NO_TOKEN);
-        }
-
-        PicaUser user = CommonUtils.getUserByToken(redisClient, token);
-
-        if (user == null || user.getId().intValue() == 0) {
-            return ReturnUtil.getPicaResponse(PicaResultCode.LOGIN_FAILE);
-        }
-
+        PicaUser user = fetchPicaUser();
         StringBuilder sbContent = new StringBuilder();
         try {
             JSONObject jsonObject = JSONObject.parseObject(content);
@@ -132,4 +92,11 @@ public class AntiSpamController {
 
         return ReturnUtil.getPicaResponse(PicaResultCode.SUCCESS);
     }
+
+    public Pair<String, Integer> parseContentAndType(String content) {
+        JSONObject jsonObject = JSONObject.parseObject(content);
+        return Pair.of(jsonObject.get("content").toString(),
+                jsonObject.get("type") != null ? Integer.parseInt(jsonObject.get("type").toString()) : 0
+        );
+    }
 }

server/src/main/java/com/pica/cloud/online/exam/analysis/server/mapper/AntiSpamRecordMapper.java

 package com.pica.cloud.online.exam.analysis.server.mapper;
 
 import com.pica.cloud.online.exam.analysis.server.entity.AntiSpamRecord;
+import org.springframework.stereotype.Component;
 
+@Component
 public interface AntiSpamRecordMapper {
     int deleteByPrimaryKey(Integer id);
 

server/src/main/java/com/pica/cloud/online/exam/analysis/server/monitor/CatFilterConfigure.java

-package com.pica.cloud.online.exam.analysis.server.monitor;
-
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.dianping.cat.servlet.CatFilter;
-
-
-@Configuration
-public class CatFilterConfigure {
-
-	@Bean
-	public FilterRegistrationBean catFilter() {
-		FilterRegistrationBean registration = new FilterRegistrationBean();
-		CatFilter filter = new CatFilter();
-		registration.setFilter(filter);
-		registration.addUrlPatterns("/*");
-		registration.setName("cat-filter");
-		registration.setOrder(1);
-		return registration;
-	}
-}
\ No newline at end of file

server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/CHCAnalysisService.java

 package com.pica.cloud.online.exam.analysis.server.service;
 
+import com.pica.cloud.foundation.entity.PicaResponse;
+import com.pica.cloud.foundation.utils.entity.PicaUser;
 import com.pica.cloud.online.exam.analysis.common.dto.*;
 import com.pica.cloud.online.exam.analysis.server.entity.AnalysisRound;
 import com.pica.cloud.online.exam.analysis.server.entity.AnalysisRoundExamTitle;
 import com.pica.cloud.online.exam.analysis.server.entity.CHCAnalysis;
 import com.pica.cloud.online.exam.analysis.server.entity.Reply;
+import io.swagger.models.auth.In;
 import org.omg.CORBA.INTERNAL;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @author wuminghao
  * @date 2018/8/17 9:40
  */
 public interface CHCAnalysisService {
-    /**
-     * 根据活动id获取活动详情
-     * @param analysisId
-     * @return
-     */
-    CHCAnalysis getAnalysisById(Integer analysisId);
-
-    /**
-     * 根据活动id获取活动详情
-     * @param analysisId
-     * @return
-     */
-    CHCAnalysisDto getCHCAnalysisDtoById(Integer analysisId);
 
     /**
-     * 根据活动id获取活动详情
-     * @param analysisId
+     * 获取CHC活动详情
+     * @param analysisId 活动id
+     * @param user
      * @return
      */
-    CHCAnalysisDto getPSAAnalysisDtoById(Integer analysisId);
+    CHCAnalysisDto getCHCActivityDetail(Integer analysisId, PicaUser user);
 
     /**
-     * 根据活动id获取活动的轮数
-     * @param analysisId
+     * 获取PSA活动详情
+     * @param analysisId 活动id
      * @return
      */
-    List<AnalysisRoundDto> getRoundListByAnalysisId(Integer analysisId);
+    CHCAnalysisDto getPSAActivityDetail(Integer analysisId);
 
     /**
-     * 根据轮的id获取信息
-     * @param roundId
+     * 获取轮详情
+     * @param roundId 轮id
      * @return
      */
-    RoundExamTitleDto getRoundExamTitleDtoById(Integer roundId);
+    RoundExamTitleDto getRoundDetail(Integer roundId);
 
     /**
-     * 根据轮的id获取信息
+     * 获取轮详情V2
      * @param roundId
      * @return
      */
-    AnalysisRound getRoundInfoById(Integer roundId);
-
-    /**
-     * 根据轮的id获取题目信息
-     * @param roundId
-     * @return
-     */
-    List<ExamTitleDto> getExamTitleListByRoundId(Integer roundId);
-
-    /**
-     * 获取当前的活动-轮-题目关联表
-     * @param analysisRoundExamTitleId
-     * @return
-     */
-    AnalysisRoundExamTitle getAnanlysisRoundExamTitleById(Integer analysisRoundExamTitleId);
-
-    /**
-     * 获取考题信息
-     * @param analysisRoundExamTitleId
-     * @return
-     */
-    ExamTitleDto getExamTitleDtoById(Integer analysisRoundExamTitleId);
-
-    /**
-     * 获取当前题目的下一题目
-     * @param roundId 当前轮的id
-     * @param analysisRoundExamTitleId 当前题目的id
-     * @return 下一题目的id
-     */
-    ExamTitleDto getNextExamTitleDtoById(Integer roundId, Integer analysisRoundExamTitleId);
-
-    /**
-     * 根据题目id获取回复信息
-     * @param analysisRoundExamTitleId
-     * @param userId
-     * @return
-     */
-    List<ReplyDto> getReplyListDtoByExamTitleId(Integer analysisRoundExamTitleId, Integer userId);
-
-    /**
-     * 根据id获取reply
-     * @param replyId
-     * @return
-     */
-    Reply getReplyById(Integer replyId);
+    RoundExamTitleV2Dto getRoundDetailV2(Integer roundId);
 
     /**
-     * 根据id获取下一条reply
-     * @param replyId
-     * @return
-     */
-    Reply getNextReplyById(Integer replyId);
-
-    /**
-     * 根据reply获取replydto
-     * @param reply
-     * @param userId
-     * @return
-     */
-    ReplyDto getReplyDtoByReply(Reply reply, Integer userId);
-
-    /**
-     * 插入点赞记录
-     * @param analysisId
-     * @param roundId
+     * 获取题目的回复列表
      * @param examTitleId
-     * @param replyId
+     * @param user
      * @return
      */
-    Integer insertStarRecord(Integer analysisId, Integer roundId, Integer examTitleId, Integer replyId, Integer userId);
+    ExamTitleReplyDto getReplyListByExamTitleId(Integer examTitleId, PicaUser user);
 
     /**
-     * 取消点赞记录
-     * @param replyId
-     * @param userId
+     * 获取题目的回复列表 分页
+     * @param examTitleId 题目id
+     * @param pageNo 页码
+     * @param pageSize 大小
+     * @param user
      * @return
      */
-    Integer removeStarRecord(Integer replyId, Integer userId);
+    ExamTitleReplyDto getReplyListV2ByExamTitleId(Integer examTitleId, Integer pageNo, Integer pageSize, PicaUser user);
 
     /**
-     * 增加解析
+     * 获取下一题的回复列表
      * @param examTitleId
-     * @param content
-     * @param userId
+     * @param user
      * @return
      */
-    Integer insertReply(Integer examTitleId, String content, Integer userId);
-
-    /**
-     * 获取我的评论状态
-     * @param examTitleId
-     * @param userId
-     * @return
-     */
-    Integer getReplyStatus(Integer examTitleId, Integer userId);
-
+    ExamTitleReplyDto getNextReplyListByExamTitleId(Integer examTitleId, PicaUser user);
 
     /**
-     * 获取我的评论详情
-     * @param examTitleId
-     * @param userId
+     * 获取回复的详情
+     * @param replyId 回复id
+     * @param user 用户
      * @return
      */
-    Reply getReplyByExamTitleId(Integer examTitleId, Integer userId);
+    ExamTitleReplyDetailDto getReplyDetailByReplyId(Integer replyId, PicaUser user);
 
     /**
-     * 根据考试id获取评论列表
-     * @param examTitleId
+     * 获取下一回复的详情
+     * @param replyId
+     * @param user
      * @return
      */
-    List<Reply> getReplyList(Integer examTitleId);
+    ExamTitleReplyDetailDto getNextReplyDetailByReplyId(Integer replyId, PicaUser user);
 
     /**
-     * 获取所有的历史轮详情
-     * @param ananlysisId
+     * 获取回复的详情
+     * @param examTitleId 题目id
+     * @param user 用户
      * @return
      */
-    List<AnalysisRoundDto> getCHCHistoryRound(Integer analysisId);
+    ExamTitleReplyDetailDto getReplyDetailByExamTitleId(Integer examTitleId, PicaUser user);
 
     /**
-     * 获取某一轮的最多得票数
-     * @param roundId
+     * 点赞
+     * @param user 用户
+     * @param analysisId 活动id
+     * @param roundId 轮id
+     * @param examTitleId 题目id
+     * @param replyId 回复id
      * @return
      */
-    Integer getElectedStarCountByRoundId(Integer roundId);
+    PicaResponse starReply(PicaUser user, Integer analysisId, Integer roundId, Integer examTitleId, Integer replyId);
 
     /**
-     * 获取被选中的医生id
-     * @param roundId
+     * 解析/回复某一个题目
+     * @param user 用户
+     * @param sysCode
+     * @param examTitleId 题目
+     * @param content 内容
+     * @param isAdFilterOpen 广告检测
      * @return
      */
-    Integer getElectedDoctorIdByRoundId(Integer roundId);
+    PicaResponse reply(PicaUser user, String sysCode, Integer examTitleId, String content, Boolean isAdFilterOpen);
 
     /**
-     * 根据医生id和轮id获取得赞数
-     * @param roundId
-     * @param doctorId
+     * 获取我的赞
+     * @param user 用户
+     * @param roundId 某轮的id
      * @return
      */
-    Integer getStarCountByRoundIdAndDoctorId(Integer roundId, Integer doctorId);
+    MyStarDto myStar(PicaUser user, Optional<Integer> roundId);
 
     /**
-     * 根据医生id和轮id获取得赞记录
-     * @param roundId
-     * @param doctorId
+     * 取消点赞
+     * @param replyId 活动id
+     * @param user 用户
      * @return
      */
-    List<UserExamTitleDto> getMyStarRecordByRoundIdAndDoctorId(Integer roundId, Integer doctorId);
+    Integer removeStarRecord(Integer replyId, PicaUser user);
 }

server/src/main/java/com/pica/cloud/online/exam/analysis/server/service/impl/AntiSpamServiceImpl.java

@@ -38,7 +38,7 @@ public class AntiSpamServiceImpl implements AntiSpamService {
     @Autowired
     private AntiSpamRecordMapper antiSpamRecordMapper;
 
-    private static HttpClient httpClient = HttpClient4Utils.createHttpClient(100, 20, 2000, 2000, 2000);
+    private static HttpClient httpClient = HttpClient4Utils.createHttpClient(200, 200, 2000, 2000, 2000);
     private static HttpClient httpClientImage = HttpClient4Utils.createHttpClient(100, 20, 10000, 2000, 2000);
 
     private String neteaseResult(String content, boolean isAdFilterOpen) {

server/src/main/resources/mybatis/AnalysisRoundMapper.xml

@@ -38,6 +38,7 @@
         seq_no from p_analysis_round
       where is_published = 1
       and is_deleted = 0
+      and analysis_id = #{id,jdbcType=INTEGER}
       order by seq_no desc
       limit 1)
     order by seq_no