Merge branch 'release' into 'master'

Release



See merge request !2

pom.xml

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

server/pom.xml

@@ -62,10 +62,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-feign</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-hystrix</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.springframework.cloud</groupId>-->
+            <!--<artifactId>spring-cloud-starter-hystrix</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-entity</artifactId>
-            <version>1.0.0</version>
+            <version>1.3.2</version>
         </dependency>
 
         <dependency>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-redis</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
+            <version>1.2.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -215,7 +215,7 @@
     </pluginRepositories>
 
     <build>
-        <finalName>pica-cloud-analysis</finalName>
+        <finalName>pica-cloud-analysis-server</finalName>
 
         <plugins>
             <plugin>

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

@@ -8,7 +8,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.feign.EnableFeignClients;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
-@EnableCircuitBreaker
+//@EnableCircuitBreaker
 @SpringBootApplication(scanBasePackages = "com.pica.cloud")
 @EnableDiscoveryClient
 @EnableSwagger2

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

-package com.pica.cloud.online.exam.analysis.server.client;
-
-import org.springframework.cloud.netflix.feign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author wuminghao
- * @date 2018/9/30 10:01
- */
-@FeignClient(value="10901-PICA-CLOUD-ONLINEEXAM")
-public interface IOnlineExamServiceClient {
-
-    /**
-     * 调用
-     * @param onlineExamId
-     * @param sysCode
-     * @param token
-     * @return
-     */
-    @RequestMapping(value="/onlineexam/getExamStatus", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
-    String getExamStatus(@RequestParam(value = "onlineExamId") Integer onlineExamId,
-                         @RequestParam(value = "code") Integer code,
-                        @RequestHeader(value = "sysCode") String sysCode,
-                        @RequestHeader(value = "token") String token);
-}

server/src/main/java/com/pica/cloud/online/exam/analysis/server/client/impl/OnlineExamServiceClient.java

-package com.pica.cloud.online.exam.analysis.server.client.impl;
-
-import com.pica.cloud.online.exam.analysis.server.client.IOnlineExamServiceClient;
-import org.springframework.stereotype.Component;
-
-/**
- * @author wuminghao
- * @date 2018/9/30 10:22
- */
-@Component
-public class OnlineExamServiceClient implements IOnlineExamServiceClient {
-    @Override
-    public String getExamStatus(Integer onlineExamId, Integer code, String sysCode, String token) {
-        return "";
-    }
-}

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.CacheClient;
 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;
@@ -15,13 +13,8 @@ public class BeanConfiguration {
     @Autowired
     private SpringContextAware springContextAware;
 
-    @Value("${spring.redis.config}")
-    private String configStr;
-
     @Bean
-    @ConditionalOnMissingBean
     public ICacheClient cacheClient() {
-        return new CacheMigrateClient(springContextAware.getActiveProfile());
-
+        return new CacheClient(springContextAware.getActiveProfile());
     }
 }

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

+package com.pica.cloud.online.exam.analysis.server.constants;
+
+/**
+ * @author wuminghao
+ * @date 2019/4/25 16:50
+ */
+public class RedisKey {
+    /** 是否打开敏感词校验功能 0:false  1: true **/
+    public static final String ENABLE_ANTI_SPAM = "analysis_enable_anti_spam";
+}

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

@@ -3,6 +3,7 @@ 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.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;
@@ -10,14 +11,10 @@ import com.pica.cloud.online.exam.analysis.common.dto.*;
 import com.pica.cloud.online.exam.analysis.common.util.ReturnUtil;
 import com.pica.cloud.online.exam.analysis.server.configuration.PropertiesConfiguration;
 import com.pica.cloud.online.exam.analysis.server.service.CHCAnalysisService;
-import com.pica.cloud.online.exam.analysis.server.service.DoctorService;
-import com.pica.cloud.foundation.redis.ICacheClient;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Optional;
 
 /**
@@ -28,7 +25,6 @@ import java.util.Optional;
 @RequestMapping("/")
 public class AnalysisController extends BaseController {
 
-    @Qualifier("cacheMigrateClient")
     @Autowired
     private ICacheClient redisClient;
 

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

@@ -8,11 +8,14 @@ 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.util.ReturnUtil;
+import com.pica.cloud.online.exam.analysis.server.configuration.SpringContextAware;
+import com.pica.cloud.online.exam.analysis.server.constants.RedisKey;
 import com.pica.cloud.online.exam.analysis.server.service.AntiSpamService;
+import com.pica.cloud.online.exam.analysis.server.utils.LoginUtil;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 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,12 +25,17 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("/antispam")
 public class AntiSpamController extends BaseController {
-    @Qualifier("cacheMigrateClient")
     @Autowired
     private ICacheClient redisClient;
 
     @Autowired
-    AntiSpamService antiSpamService;
+    private SpringContextAware springContextAware;
+
+    @Autowired
+    private AntiSpamService antiSpamService;
+
+    @Autowired
+    private LoginUtil loginUtil;
 
     @LoginPermission
     @ApiOperation(value = "内容检测", response = PicaResponse.class)
@@ -35,14 +43,22 @@ public class AntiSpamController extends BaseController {
     public PicaResponse processText(@RequestBody String content,
                                 @RequestHeader String sysCode,
                                 @RequestHeader String token) {
-        PicaUser user = fetchPicaUser();
+
+        if (!"prod".equals(springContextAware.getActiveProfile())) {
+            String enableAntispam = redisClient.get(RedisKey.ENABLE_ANTI_SPAM);
+            if ("0".equals(enableAntispam)) {
+                return PicaResponse.toResponse("");
+            }
+        }
+
+        PicaUser user = loginUtil.getCurrentUser();
         Pair<String, Integer> params;
         try {
             params = parseContentAndType(content);
         } catch (Exception e) {
             return ReturnUtil.getPicaResponse(PicaResultCode.PARAM_IS_INVALID);
         }
-        return antiSpamService.processString(user.getId(), sysCode, params.getLeft(), params.getRight() != 0);
+        return antiSpamService.processString(user != null ? user.getId() : 0, sysCode, params.getLeft(), params.getRight() != 0);
    }
 
     @LoginPermission
@@ -51,16 +67,27 @@ public class AntiSpamController extends BaseController {
     public PicaResponse processTextV1(@RequestBody String content,
                                     @RequestHeader String sysCode,
                                     @RequestHeader String token) {
+        if (!"prod".equals(springContextAware.getActiveProfile())) {
+            String enableAntispam = redisClient.get(RedisKey.ENABLE_ANTI_SPAM);
+            if ("0".equals(enableAntispam)) {
+                return PicaResponse.toResponse("");
+            }
+        }
         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 = fetchPicaUser();
+                                      @RequestHeader(value = "sysCode", required = false) String sysCode) {
+        if (!"prod".equals(springContextAware.getActiveProfile())) {
+            String enableAntispam = redisClient.get(RedisKey.ENABLE_ANTI_SPAM);
+            if ("0".equals(enableAntispam)) {
+                return PicaResponse.toResponse("");
+            }
+        }
+
+        PicaUser user = loginUtil.getCurrentUser();
         Pair<String, Integer> params;
         try {
              params = parseContentAndType(content);
@@ -68,7 +95,10 @@ public class AntiSpamController extends BaseController {
             return ReturnUtil.getPicaResponse(PicaResultCode.PARAM_IS_INVALID);
         }
 
-        return antiSpamService.processStringV2(user.getId(), sysCode, params.getLeft(), params.getRight() != 0);
+        return antiSpamService.processStringV2(user != null ? user.getId() : 0,
+                StringUtils.isNotEmpty(sysCode) ? sysCode : "0",
+                params.getLeft(),
+                params.getRight() != 0);
     }
 
     @LoginPermission
@@ -77,7 +107,14 @@ public class AntiSpamController extends BaseController {
     public PicaResponse processImage(@RequestBody String content,
                                 @RequestHeader String sysCode,
                                 @RequestHeader String token) {
-        PicaUser user = fetchPicaUser();
+        if (!"prod".equals(springContextAware.getActiveProfile())) {
+            String enableAntispam = redisClient.get(RedisKey.ENABLE_ANTI_SPAM);
+            if ("0".equals(enableAntispam)) {
+                return PicaResponse.toResponse("");
+            }
+        }
+
+        PicaUser user = loginUtil.getCurrentUser();
         StringBuilder sbContent = new StringBuilder();
         try {
             JSONObject jsonObject = JSONObject.parseObject(content);
@@ -86,7 +123,7 @@ public class AntiSpamController extends BaseController {
             return ReturnUtil.getPicaResponse(PicaResultCode.PARAM_IS_INVALID);
         }
 
-        if (!antiSpamService.processImageContent(user.getId(), sysCode, sbContent.toString())) {
+        if (!antiSpamService.processImageContent(user != null ? user.getId() : 0, sysCode, sbContent.toString())) {
             return ReturnUtil.getPicaResponse("400002", "图片包含违禁内容，请修改后重新输入", "");
         }
 

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

-package com.pica.cloud.online.exam.analysis.server.controller;
-
-import com.pica.cloud.foundation.entity.PicaResponse;
-import com.pica.cloud.online.exam.analysis.server.client.IOnlineExamServiceClient;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author wuminghao
- * @date 2018/9/30 9:58
- */
-@RestController
-@RequestMapping("/onlineexam")
-@Api(value = "服务调用", description = "测试")
-public class TestController {
-    @Autowired
-    private IOnlineExamServiceClient onlineExamServiceClient;
-
-    @ApiOperation(value = "获取考试状态", response = PicaResponse.class)
-    @RequestMapping(value = "/getExamStatus", method = RequestMethod.GET, produces = "application/json;charset=UTF-8")
-    public String getExamStatus(@RequestHeader String token) {
-        return onlineExamServiceClient.getExamStatus(1,1, "27", token);
-    }
-}

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

+package com.pica.cloud.online.exam.analysis.server.utils;
+
+import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.foundation.utils.entity.PicaUser;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+/**
+ * @author wuminghao
+ * @date 2020/6/28 15:35
+ */
+@Component
+public class LoginUtil {
+    public static final Logger logger =  LoggerFactory.getLogger(LoginUtil.class);
+
+    @Autowired
+    private ICacheClient cacheClient;
+
+    public PicaUser getCurrentUser() {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.currentRequestAttributes();
+        String token = servletRequestAttributes.getRequest().getHeader("token");
+
+        if (StringUtils.isEmpty(token)) {
+            return null;
+        } else {
+            return cacheClient.getToken(token, PicaUser.class);
+        }
+    }
+
+    public PicaUser getCurrentUserByToken(String token) {
+        if (StringUtils.isEmpty(token)) {
+            return null;
+        } else {
+            return cacheClient.getToken(token, PicaUser.class);
+        }
+    }
+}

server/src/main/resources/bootstrap-dev.properties

@@ -25,9 +25,14 @@ spring.rabbitmq.username=appuser
 spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 
 #local settings
-feign.hystrix.enabled=true
+#feign.hystrix.enabled=true
 management.security.enabled=false
 
+ribbon.ReadTimeout=300000
+ribbon.SocketTimeout=300000
+#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
+ribbon.ConnectTimeout=30000
+
 #spring.zipkin.base-url=http://192.168.110.124:7895
 #spring.sleuth.sampler.percentage=1.0
 

server/src/main/resources/bootstrap-prod.properties

@@ -24,11 +24,16 @@ spring.rabbitmq.port=5672
 spring.rabbitmq.username=appuser
 spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 
-#local setting
-feign.hystrix.enabled=true
+#local settings
+#feign.hystrix.enabled=true
 management.security.enabled=true
 
-spring.zipkin.base-url=http://172.19.137.19:7895
-spring.sleuth.sampler.percentage=1.0
+ribbon.ReadTimeout=300000
+ribbon.SocketTimeout=300000
+#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
+ribbon.ConnectTimeout=30000
+
+#spring.zipkin.base-url=http://172.19.137.19:7895
+#spring.sleuth.sampler.percentage=1.0
 
 logging.config=classpath:log4j2-prod.xml
\ No newline at end of file

server/src/main/resources/bootstrap-test1.properties

@@ -25,10 +25,15 @@ spring.rabbitmq.username=appuser
 spring.rabbitmq.password=AqLfvyWOvLQEUzdI
 
 #local settings
-feign.hystrix.enabled=true
+#feign.hystrix.enabled=true
 management.security.enabled=false
 
-spring.zipkin.base-url=http://192.168.110.133:7895
-spring.sleuth.sampler.percentage=1.0
+ribbon.ReadTimeout=300000
+ribbon.SocketTimeout=300000
+#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
+ribbon.ConnectTimeout=30000
+
+#spring.zipkin.base-url=http://192.168.110.133:7895
+#spring.sleuth.sampler.percentage=1.0
 
 logging.config=classpath:log4j2-test1.xml
\ No newline at end of file

server/src/main/resources/bootstrap-test2.properties

-server.port=10902
-server.context-path=/analysis
-spring.application.name=${server.port}-pica-cloud-analysis
-
-#config server settings
-spring.cloud.config.name=com.pica.cloud.online.exam
-spring.cloud.config.profile=test2
-spring.cloud.config.label=publish
-spring.cloud.config.discovery.enabled=true
-spring.cloud.config.discovery.service-id=config-server
-
-#eureka settings
-eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
-eureka.client.service-url.defaultZone=http://192.168.110.128:7891/eureka,http://192.168.110.129:7891/eureka
-eureka.instance.status-page-url=http://${spring.cloud.client.ipAddress}:${server.port}/swagger-ui.html
-eureka.instance.lease-renewal-interval-in-seconds=10
-eureka.instance.lease-expiration-duration-in-seconds=10
-eureka.instance.hostname=${spring.cloud.client.ipAddress}
-eureka.instance.prefer-ip-address=true
-
-#rabbigmq settings
-spring.rabbitmq.host=192.168.110.206
-spring.rabbitmq.port=5672
-spring.rabbitmq.username=appuser
-spring.rabbitmq.password=AqLfvyWOvLQEUzdI
-
-#local settings
-feign.hystrix.enabled=true
-management.security.enabled=false
-
-spring.zipkin.base-url=http://192.168.110.133:7895
-spring.sleuth.sampler.percentage=1.0
-
+server.port=10902
+server.context-path=/analysis
+spring.application.name=${server.port}-pica-cloud-analysis
+
+#config server settings
+spring.cloud.config.name=com.pica.cloud.online.exam
+spring.cloud.config.profile=test2
+spring.cloud.config.label=publish
+spring.cloud.config.discovery.enabled=true
+spring.cloud.config.discovery.service-id=config-server
+
+#eureka settings
+eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
+eureka.client.service-url.defaultZone=http://10.98.0.3:7891/eureka,http://10.98.0.4:7891/eureka,http://10.98.0.5:7891/eureka
+eureka.instance.status-page-url=http://${spring.cloud.client.ipAddress}:${server.port}/swagger-ui.html
+eureka.instance.lease-renewal-interval-in-seconds=10
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.hostname=${spring.cloud.client.ipAddress}
+eureka.instance.prefer-ip-address=true
+
+#rabbigmq settings
+spring.rabbitmq.host=192.168.110.206
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=appuser
+spring.rabbitmq.password=AqLfvyWOvLQEUzdI
+
+#local settings
+#feign.hystrix.enabled=true
+management.security.enabled=false
+
+ribbon.ReadTimeout=300000
+ribbon.SocketTimeout=300000
+#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
+ribbon.ConnectTimeout=30000
+
+#spring.zipkin.base-url=http://192.168.110.133:7895
+#spring.sleuth.sampler.percentage=1.0
+
 logging.config=classpath:log4j2-test1.xml
\ No newline at end of file

server/src/main/resources/bootstrap-uat.properties

@@ -25,10 +25,15 @@ spring.rabbitmq.username=picacloud
 spring.rabbitmq.password=123456
 
 #local settings
-feign.hystrix.enabled=true
+#feign.hystrix.enabled=true
 management.security.enabled=false
 
-spring.zipkin.base-url=http://192.168.110.141:7895
-spring.sleuth.sampler.percentage=1.0
+ribbon.ReadTimeout=300000
+ribbon.SocketTimeout=300000
+#\u8BF7\u6C42\u8FDE\u63A5\u7684\u8D85\u65F6\u65F6\u95F4 add by six-vision
+ribbon.ConnectTimeout=30000
+
+#spring.zipkin.base-url=http://192.168.110.141:7895
+#spring.sleuth.sampler.percentage=1.0
 
 logging.config=classpath:log4j2-uat.xml
\ No newline at end of file

server/src/test/java/com/pica/cloud/online/exam/analysis/RedisClientTest.java

+package com.pica.cloud.online.exam.analysis;
+
+import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.online.exam.analysis.server.App;
+import com.pica.cloud.online.exam.analysis.server.constants.RedisKey;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+/**
+ * @author wuminghao
+ * @date 2019/4/25 16:18
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = App.class)
+public class RedisClientTest {
+    @Autowired
+    private ICacheClient redisClient;
+
+    @Test
+    public void testRead() {
+        System.out.println(redisClient.get(RedisKey.ENABLE_ANTI_SPAM));
+    }
+
+    @Test
+    public void testWrite() {
+        redisClient.set(RedisKey.ENABLE_ANTI_SPAM, 0);
+    }
+}