Merge branch 'dev-login-20200323' into 'release'

h5端拼图验证加入百分比验证，入参新增客户端实际图片宽度

reviewCoder 赵培军

See merge request !19

server/pom.xml

@@ -192,7 +192,7 @@
         <dependency>
             <groupId>com.pica.cloud.foundation</groupId>
             <artifactId>pica-cloud-proof-client</artifactId>
-            <version>1.0.0</version>
+            <version>1.0.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>io.swagger</groupId>

server/src/main/java/com/pica/cloud/account/account/server/req/BaseRequest.java

@@ -50,6 +50,8 @@ public class BaseRequest {
     private String capCode;
     @ApiModelProperty("滑动图片的x位置")
     private int xPos;
+    @ApiModelProperty("h5端适配缩放后背景图实际宽度")
+    private int imageW;
 
     public String getCaptchaToken() {
         return captchaToken;
@@ -226,4 +228,12 @@ public class BaseRequest {
     public void setxPos(int xPos) {
         this.xPos = xPos;
     }
+
+    public int getImageW() {
+        return imageW;
+    }
+
+    public void setImageW(int imageW) {
+        this.imageW = imageW;
+    }
 }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/AuthCodeServiceImpl.java

@@ -249,6 +249,7 @@ public class AuthCodeServiceImpl implements AuthCodeService {
             SliderImageRequest req = new SliderImageRequest();
             req.setCapcode(capCode);
             req.setXpos(xPos);
+            req.setClientBackImageWidth(paramReq.getImageW());
             resp = sliderImageService.checkcapcode(req);
             logger.info("validateJigsawCode-resp:{}", JSON.toJSONString(resp));
         } catch (Exception e) {