Merge branch 'feature' into 'release'

Feature

See merge request !256

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -25,6 +25,8 @@ import com.zhiwei.brandkbs2.util.MongoUtil;
 import com.zhiwei.brandkbs2.util.Tools;
 import com.zhiwei.middleware.auth.pojo.CenterUser;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -48,6 +50,7 @@ import java.util.stream.Collectors;
  */
 @Service("userServiceImpl")
 public class UserServiceImpl implements UserService {
+    public static final Logger log = LogManager.getLogger(UserServiceImpl.class);
 
     @Resource(name = "userDao")
     private UserDao userDao;
@@ -356,14 +359,16 @@ public class UserServiceImpl implements UserService {
             // 解析code获取手机号
             ResponseEntity<String> entity = restTemplate.getForEntity(wechatAccessTokenUrl, String.class);
             if (null == entity.getBody()) {
-                return ResponseResult.failure("手机号获取失败");
+                return ResponseResult.failure("手机号解析失败");
             }
             String accessToken = JSON.parseObject(entity.getBody()).getJSONObject("data").getString("accessToken");
+            log.info("解析手机号,accessToken:{},loginVO:{}", accessToken, JSONObject.toJSONString(loginVO));
             JSONObject info = new JSONObject();
             info.put("code", loginVO.getCode());
             HttpEntity<JSONObject> phoneNumberEntity = restTemplate.postForEntity(wxGetUserPhoneNumberUrl + accessToken, info, JSONObject.class);
+            log.info("解析手机号,accessToken:{},wxGetUserPhoneNumberUrl:{},response:{}", accessToken, wxGetUserPhoneNumberUrl, JSON.toJSONString(phoneNumberEntity));
             if (null == phoneNumberEntity.getBody()) {
-                return ResponseResult.failure("手机号获取失败");
+                return ResponseResult.failure("手机号解析失败");
             }
             phoneNumber = Long.valueOf(phoneNumberEntity.getBody().getJSONObject("phone_info").getString("purePhoneNumber"));
         }