Merge branch 'feature' into 'dev'

新增用户中心注册功能7

See merge request !150

src/main/java/com/zhiwei/brandkbs2/service/UserCenterService.java

@@ -30,6 +30,6 @@ public interface UserCenterService {
      * @param password 密码
      * @return
      */
-    CenterUser registerUser(long phone, String password);
+    CenterUser registerUser(long phone, String password, String nickName);
 
 }

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

@@ -69,17 +69,17 @@ public class UserCenterServiceImpl implements UserCenterService {
     }
 
     @Override
-    public CenterUser registerUser(long phone, String password) {
+    public CenterUser registerUser(long phone, String password, String nickName) {
         HttpHeaders httpHeaders = new HttpHeaders();
         httpHeaders.set(EXTERNAL_ORIGIN, SERVICE_NAME);
         httpHeaders.set(EXTERNAL_TOKEN, token);
         JSONObject json = new JSONObject();
         json.put("phone", phone);
         json.put("password", password);
+        json.put("nickName", nickName);
         HttpEntity<JSONObject> requestEntity = new HttpEntity<>(json, httpHeaders);
         HttpEntity<JSONObject> entity = restTemplate.exchange(yuqingInterface + "/thirdPart/external/register/phone", HttpMethod.POST,
                 requestEntity, JSONObject.class);
-        System.out.println("registerUser:" + entity.getBody());
         if (null == entity.getBody() || !entity.getBody().getBoolean("status")) {
             return null;
         }

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

@@ -137,7 +137,7 @@ public class UserServiceImpl implements UserService {
         // 有密码则通过用户中心注册
         CenterUser centerUser = null;
         if (null != userDTO.getPassword()) {
-            if (null == (centerUser = userCenterService.registerUser(userDTO.getPhoneNumber(), userDTO.getPassword()))) {
+            if (null == (centerUser = userCenterService.registerUser(userDTO.getPhoneNumber(), userDTO.getPassword(), userDTO.getNickname()))) {
                 return ResponseResult.failure("用户中心注册账号失败");
             }
         }
@@ -218,7 +218,7 @@ public class UserServiceImpl implements UserService {
         // 有密码则通过用户中心注册
         CenterUser centerUser = null;
         if (null != userDTO.getPassword()) {
-            if (null == (centerUser = userCenterService.registerUser(userDTO.getPhoneNumber(), userDTO.getPassword()))) {
+            if (null == (centerUser = userCenterService.registerUser(userDTO.getPhoneNumber(), userDTO.getPassword(), userDTO.getNickname()))) {
                 return ResponseResult.failure("用户中心注册账号失败");
             }
         }
@@ -358,8 +358,8 @@ public class UserServiceImpl implements UserService {
     }
 
     private PageVO<JSONObject> findList(int page, int size, String keyword, String pid, Query query) {
-        userDao.addKeywordFuzz(query,keyword,"nickname");
-        userDao.addSort(query,"{\"cTime\":\"descend\"}");
+        userDao.addKeywordFuzz(query, keyword, "nickname");
+        userDao.addSort(query, "{\"cTime\":\"descend\"}");
         long count = userDao.count(query);
         mongoUtil.start(page, size, query);
         List<User> userList = userDao.findList(query);