1.暂时替换图片URL组装规则

2.验证码过滤校检
3.移动端前端地址修改

b2b2c/b2b2c-core/src/main/java/com/slodon/b2b2c/core/config/DomainUrlUtil.java

@@ -17,7 +17,7 @@ public class DomainUrlUtil {
     public static final String SLD_API_URL = "https://ad.eqbidding.com";                //主站的URL
     public static final String SLD_STATIC_RESOURCES = "https://ad.eqbidding.com";       //静态资源的URL
 
-    public static final String SLD_H5_URL = "http://jbbcs.slodon.cn";                       //移动端前端地址
+    public static final String SLD_H5_URL = "https://ad.eqbidding.com";                       //移动端前端地址
     public static final String SLD_PC_URL = "http://jbbcs-pc.slodon.cn/";                   //pc前端地址
 
     public static final String SLD_ADMIN_URL = "https://ad.eqbidding.com";              //admin前端地址

b2b2c/b2b2c-core/src/main/java/com/slodon/b2b2c/core/util/FileUrlUtil.java

@@ -25,9 +25,11 @@ public class FileUrlUtil {
             //默认大图
             return DomainUrlUtil.SLD_IMAGE_RESOURCES + filePath;
         }
+        return DomainUrlUtil.SLD_IMAGE_RESOURCES + filePath;
+        // TODO 暂时禁用该功能
         //裁剪图片
-        return DomainUrlUtil.SLD_IMAGE_RESOURCES + "/unsafe/"
-                + imageSize.getHeight() + "x" + imageSize.getWidth() + "/"
-                + DomainUrlUtil.SLD_IMAGE_RESOURCES + filePath;
+//        return DomainUrlUtil.SLD_IMAGE_RESOURCES + "/unsafe/"
+//                + imageSize.getHeight() + "x" + imageSize.getWidth() + "/"
+//                + DomainUrlUtil.SLD_IMAGE_RESOURCES + filePath;
     }
 }

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/LoginController.java

@@ -234,8 +234,11 @@ public class LoginController extends BaseController {
         AssertUtil.isTrue(StringUtils.isEmpty(wxUserInfo), "绑定失败，请重新授权登录");
         AssertUtil.isTrue(StringUtils.isEmpty(mobile), "请确认手机号信息");
 
-        String sms_number = stringRedisTemplate.opsForValue().get(mobile);
-        AssertUtil.isTrue(sms_number == null || !sms_number.equalsIgnoreCase(smsCode), "短信验证码不正确");
+        // TODO 暂时免验证码登入
+        if(!"123456".equals(smsCode)){
+            String sms_number = stringRedisTemplate.opsForValue().get(mobile);
+            AssertUtil.isTrue(sms_number == null || !sms_number.equalsIgnoreCase(smsCode), "短信验证码不正确");
+        }
 
         JSONObject userInfoJson = JSONObject.parseObject(wxUserInfo);
         //各个来源，用户信息key不同，统一使用小程序的key
@@ -441,7 +444,6 @@ public class LoginController extends BaseController {
             throw new MallException("登录失败");
         }
         UrlBuilder urlBuilder = UrlBuilder.of(uri, Charset.defaultCharset()).setQuery(urlQuery);
-
         HttpResponse execute = new HttpRequest(urlBuilder).method(Method.POST).addHeaders(headers).execute();
         return JSONObject.parseObject(execute.body(), JsonResult.class);
     }

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/controller/member/front/MemberPasswordController.java

@@ -229,8 +229,11 @@ public class MemberPasswordController extends BaseController {
         //验证验证码
         Member member = UserUtil.getUser(request, Member.class);
         Member memberDB = memberModel.getMemberByMemberId(member.getMemberId());
-        String smsCode = stringRedisTemplate.opsForValue().get(memberAddPayPwdDTO.getMemberMobile());
-        AssertUtil.isTrue(StringUtil.isEmpty(smsCode) || !smsCode.equalsIgnoreCase(memberAddPayPwdDTO.getVerifyCode()), "您输入的手机验证码有误,请重新输入");
+        // TODO 暂时免验证码登入
+        if(!"123456".equals(memberAddPayPwdDTO.getVerifyCode())){
+            String smsCode = stringRedisTemplate.opsForValue().get(memberAddPayPwdDTO.getMemberMobile());
+            AssertUtil.isTrue(StringUtil.isEmpty(smsCode) || !smsCode.equalsIgnoreCase(memberAddPayPwdDTO.getVerifyCode()), "您输入的手机验证码有误,请重新输入");
+        }
 
         memberModel.addPayPwd(memberAddPayPwdDTO, member.getMemberId());
         return SldResponse.success("设置/重置支付密码成功");

b2b2c/b2b2c-web/src/main/java/com/slodon/b2b2c/vo/goods/GoodsFrontDetailVO.java

@@ -60,6 +60,9 @@ public class GoodsFrontDetailVO {
     @ApiModelProperty("分享图片")
     private String shareImage;
 
+    @ApiModelProperty("商品视频")
+    private String goodsVideo;
+
     @ApiModelProperty("分享链接")
     private String shareLink;
 
@@ -110,6 +113,9 @@ public class GoodsFrontDetailVO {
         this.serviceLabels = serviceLabels;
         this.storeInf = new StoreInf(store, isFollowStore);
         this.deliverInfo = deliverInfo;
+        if(!StringUtils.isEmpty(goods.getGoodsVideo())){
+            this.goodsVideo = DomainUrlUtil.SLD_API_URL+ goods.getGoodsVideo();
+        }
 
         this.shareImage = FileUrlUtil.getFileUrl(product.getMainImage(), ImageSizeEnum.SMALL);
         this.shareLink = DomainUrlUtil.SLD_H5_URL + "/pages/product/detail?productId=" + product.getProductId();