Merge branch 'feature' into 'dev'

添加手机号解析打印2

See merge request !255

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

@@ -359,16 +359,17 @@ 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("手机号解析失败");
             }
-            log.info("解析手机号,accessToken:{},wxGetUserPhoneNumberUrl:{},response:{}", accessToken, wxGetUserPhoneNumberUrl, phoneNumberEntity.getBody());
             phoneNumber = Long.valueOf(phoneNumberEntity.getBody().getJSONObject("phone_info").getString("purePhoneNumber"));
         }
         User user = userDao.findOne("phoneNumber", phoneNumber);