Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

@@ -103,7 +103,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 toMqSqls.add(SqlMapping.get("adam_user.add"));
                 initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), 0, now});
                 toMqSqls.add(SqlMapping.get("adam_user_info.add"));
-                initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), userInfoVo.getQrCode()});
+                initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), null, userInfoVo.getQrCode()});
                 log.debug("#SQL.GET耗时:{}ms", System.currentTimeMillis() - s);
 
                 queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UREGISTER.getKey(),
@@ -139,7 +139,8 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
                     userInfoVo.setUid(IDGenerator.nextSnowId() + "");
                     userInfoVo.setMobile(param.getMobile());
-                    userInfoVo.setNickname("Now_".concat(RandomStringUtils.randomAlphanumeric(3)).concat(param.getMobile().substring(6)));
+                    userInfoVo.setNickname(param.getNickname());
+                    userInfoVo.setAvatar(param.getAvatar());
                     userInfoVo.setIsComplete(0);
                     userInfoVo.setState(1);
                     userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
@@ -154,7 +155,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                     toMqSqls.add(SqlMapping.get("adam_user.add"));
                     initUserObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), now});
                     toMqSqls.add(SqlMapping.get("adam_user_info.add"));
-                    initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), userInfoVo.getQrCode()});
+                    initUserInfoObjs.add(new Object[]{userInfoVo.getUid(), userInfoVo.getNickname(), userInfoVo.getAvatar(), userInfoVo.getQrCode()});
                 } else {
                     s = System.currentTimeMillis();
                     userInfoVo = adamRdmService.getUserInfoVoByUid(uid);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/sqlmap.properties

@@ -4,7 +4,7 @@ adam_user.edit.mobile=UPDATE adam_user SET mobile=?, updated_at=? WHERE `uid`=?
 adam_user.close=UPDATE adam_user SET `state`=2, updated_at=?, closed_at=? WHERE `uid`=? 
 
 # ----------------------------------------------------
-adam_user_info.add=INSERT INTO adam_user_info (`uid`, nickname, qr_code) VALUES (?,?,?) 
+adam_user_info.add=INSERT INTO adam_user_info (`uid`, nickname, avatar, qr_code) VALUES (?,?,?,?) 
 adam_user_info.edit=UPDATE adam_user_info SET nickname=?, sex=?, birthday=?, area=?, signature=?, avatar=?, background=?, tag_me=? WHERE uid=? 
 
 # ----------------------------------------------------