Merge remote-tracking branch 'origin/master'

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FavoritesServiceImpl.java

@@ -292,8 +292,8 @@ public class FavoritesServiceImpl implements FavoritesService {
                     vo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
                 }
                 Map<String, Object> homePageMap = new HashMap<>();
-                if (StringUtils.isNotBlank(item.getVedios())) {
-                    String[] vedioImage = item.getVedios().split(";");
+                if (StringUtils.isNotBlank(item.getVideos())) {
+                    String[] vedioImage = item.getVideos().split(";");
                     if (vedioImage[0].contains(",")) {
                         String[] image = vedioImage[0].split(",");
                         homePageMap = getImageMap(image[1]);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/FootPrintServiceImpl.java

@@ -88,8 +88,8 @@ public class FootPrintServiceImpl implements FootPrintService {
                     itemResponseVo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
                 }
                 Map<String, Object> homePageMap = new HashMap<>();
-                if (StringUtils.isNotBlank(item.getVedios())) {
-                    String[] vedioImage = item.getVedios().split(";");
+                if (StringUtils.isNotBlank(item.getVideos())) {
+                    String[] vedioImage = item.getVideos().split(";");
                     if (vedioImage[0].contains(",")) {
                         String[] image = vedioImage[0].split(",");
                         homePageMap = getImageMap(image[1]);
@@ -212,8 +212,8 @@ public class FootPrintServiceImpl implements FootPrintService {
                     itemResponseVo.setCollectCount(String.format("%.1f", (double) count / 1000) + "k");
                 }
                 Map<String, Object> homePageMap = new HashMap<>();
-                if (StringUtils.isNotBlank(item.getVedios())) {
-                    String[] vedioImage = item.getVedios().split(";");
+                if (StringUtils.isNotBlank(item.getVideos())) {
+                    String[] vedioImage = item.getVideos().split(";");
                     if (vedioImage[0].contains(",")) {
                         String[] image = vedioImage[0].split(",");
                         homePageMap = getImageMap(image[1]);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ItemServiceImpl.java

@@ -103,8 +103,8 @@ public class ItemServiceImpl implements ItemService {
                 vo.setIsMine(0);
                 vo.setImages(item.getImages());
                 Map<String, Object> homePageMap = new HashMap<>();
-                if (StringUtils.isNotBlank(item.getVedios())) {
-                    String[] vedioImage = item.getVedios().split(";");
+                if (StringUtils.isNotBlank(item.getVideos())) {
+                    String[] vedioImage = item.getVideos().split(";");
                     if (vedioImage[0].contains(",")) {
                         String[] image = vedioImage[0].split(",");
                         homePageMap = getImageMap(image[1]);
@@ -173,7 +173,7 @@ public class ItemServiceImpl implements ItemService {
             item.setSort(100);
             item.setImages(dto.getImages());
             if (StringUtils.isNotBlank(dto.getVideos())) {
-                item.setVedios(getVediosImage(dto.getVideos()));
+                item.setVideos(getVediosImage(dto.getVideos()));
             }
             item.setPrice(Long.parseLong(dto.getPrice()) * 100);
             item.setDetail(dto.getDetail());
@@ -221,9 +221,9 @@ public class ItemServiceImpl implements ItemService {
             itemResponseVo.setName(item.getName());
             itemResponseVo.setImages(item.getImages());
             itemResponseVo.setVideos(null);
-            if (StringUtils.isNotBlank(item.getVedios())) {
+            if (StringUtils.isNotBlank(item.getVideos())) {
                 StringBuilder stringBuilder = new StringBuilder();
-                String[] videos = item.getVedios().split(";");
+                String[] videos = item.getVideos().split(";");
                 for (String s : videos) {
                     if (s.contains(",")) {
                         String[] video = s.split(",");
@@ -379,7 +379,7 @@ public class ItemServiceImpl implements ItemService {
             item.setCid(dto.getCid());
             item.setImages(dto.getImages());
             if (StringUtils.isNotBlank(dto.getVideos())) {
-                item.setVedios(getVediosImage(dto.getVideos()));
+                item.setVideos(getVediosImage(dto.getVideos()));
             }
             item.setPrice(Long.parseLong(dto.getPrice()) * 100);
             item.setDetail(dto.getDetail());

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@ package com.wwdz.ch.wx.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.wwdz.ch.core.captcha.CaptchaCodeManager;
+import com.wwdz.ch.core.consts.ResultCode;
 import com.wwdz.ch.core.notify.NotifyService;
 import com.wwdz.ch.core.notify.NotifyType;
 import com.wwdz.ch.core.notify.SmsResult;
@@ -78,6 +79,9 @@ public class UserServiceImpl implements UserService {
                 if (StringUtils.equals("phoneFalse", mobile)) {
                     return Result.failed("获取手机号失败");
                 }
+                if (StringUtils.equals("decryptFalse", mobile)) {
+                    return Result.failed(ResultCode.FAILED.getCode(), "用户信息解密失败");
+                }
             } catch (Exception e) {
                 logger.error("获取微信用户手机号失败", e);
                 return Result.failed("获取微信用户手机号失败");

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/WxLoginServiceImpl.java

@@ -83,7 +83,7 @@ public class WxLoginServiceImpl implements WxLoginService {
                 phone = wxMaPhoneNumberInfo.getPhoneNumber();
             } catch (Exception e) {
                 logger.error("解析手机号加密信息失败", e);
-                return "phoneFalse";
+                return "decryptFalse";
             }
         }
         return phone;