开放资料编辑数美校验（昵称、签名、头像、背景）;

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserInfoService.java

@@ -14,7 +14,7 @@ import com.liquidnet.service.base.ResponseDto;
  */
 public interface IAdamUserInfoService {
 
-    ResponseDto<AdamUserInfoVo> edit(AdamUserInfoParam parameter);
+    ResponseDto<AdamUserInfoVo> edit(AdamUserInfoVo existUserInfoVo, AdamUserInfoParam parameter);
 
     String editMobile(String uid, String mobile);
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/pom.xml

@@ -61,6 +61,11 @@
             <artifactId>liquidnet-common-sms</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-third-shumei</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>com.aliyun</groupId>

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

@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import com.liquidnet.common.third.shumei.util.ShumeiUtil;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.constant.LnsRegex;
 import com.liquidnet.commons.lang.util.CollectionUtil;
@@ -33,7 +34,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Pattern;
-import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +57,8 @@ public class AdamUserController {
     IAdamUserService adamUserService;
     @Autowired
     IAdamUserInfoService adamUserInfoService;
+    @Autowired
+    private ShumeiUtil shumeiUtil;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "资料编辑")
@@ -143,7 +145,43 @@ public class AdamUserController {
 ////        editVo.setMobile(SensitizeUtil.custom(editVo.getMobile(), 3, 4));
 //        return ResponseDto.success(editVo.desensitize(reviewUserInfo));
         parameter.setSex(sex);
-        return adamUserInfoService.edit(parameter);
+
+        String currentUid = CurrentUtil.getCurrentUid();
+        AdamUserInfoVo existUserInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
+
+        String nickname = parameter.getNickname();
+        if (StringUtils.isNotBlank(nickname) && !StringUtils.equals(existUserInfoVo.getNickname(), nickname)) {
+            if (!shumeiUtil.checkText(currentUid, nickname)) {
+                return ResponseDto.failure(ErrorMapping.get("10020"));
+            }
+        }
+        String signature = parameter.getSignature();
+        if (StringUtils.isNotBlank(signature) && !StringUtils.equals(existUserInfoVo.getSignature(), signature)) {
+            if (!shumeiUtil.checkText(currentUid, signature)) {
+                return ResponseDto.failure(ErrorMapping.get("10021"));
+            }
+        }
+        String avatar = parameter.getAvatar();
+        if (StringUtils.isNotBlank(avatar)) {
+            if (!StringUtils.equals(existUserInfoVo.getAvatar(), avatar) && !StringUtils.equals(AdamConst.DEF_URL_AVATAR, avatar)) {
+                if (!shumeiUtil.checkImage(currentUid, avatar)) {
+                    return ResponseDto.failure(ErrorMapping.get("10022"));
+                }
+            }
+        } else {
+            parameter.setAvatar(AdamConst.DEF_URL_AVATAR);
+        }
+        String background = parameter.getBackground();
+        if (StringUtils.isNotBlank(background)) {
+            if (!StringUtils.equals(existUserInfoVo.getBackground(), background) && !StringUtils.equals(AdamConst.DEF_URL_BACKGROUND, background)) {
+                if (!shumeiUtil.checkText(currentUid, background)) {
+                    return ResponseDto.failure(ErrorMapping.get("10023"));
+                }
+            }
+        } else {
+            parameter.setBackground(AdamConst.DEF_URL_BACKGROUND);
+        }
+        return adamUserInfoService.edit(existUserInfoVo, parameter);
     }
 
     @ApiOperationSupport(order = 2)

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

@@ -5,14 +5,12 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.third.easemob.util.EasemobUtil;
 import com.liquidnet.commons.lang.core.JwtValidator;
 import com.liquidnet.commons.lang.util.*;
-import com.liquidnet.service.adam.constant.AdamConst;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
 import com.liquidnet.service.adam.dto.vo.AdamTagParentVo;
 import com.liquidnet.service.adam.dto.vo.AdamTagVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserInfoService;
-import com.liquidnet.service.adam.util.ObjectUtil;
 import com.liquidnet.service.adam.util.QueueUtils;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
@@ -20,7 +18,6 @@ import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.feign.adam.rsc.FeignAdamChimeClient;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -64,28 +61,24 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public ResponseDto<AdamUserInfoVo> edit(AdamUserInfoParam parameter) {
-        String currentUid = CurrentUtil.getCurrentUid();
-        AdamUserInfoVo userInfoVo = adamRdmService.getUserInfoVoByUid(currentUid);
-
-        Integer voIsComplete = userInfoVo.getIsComplete();
+    public ResponseDto<AdamUserInfoVo> edit(AdamUserInfoVo existUserInfoVo, AdamUserInfoParam parameter) {
+        Integer voIsComplete = existUserInfoVo.getIsComplete();
         int isComplete = voIsComplete == 0 ? 1 : voIsComplete;
 
         boolean syncChimeFlg = false;// 标识是否需要同步`service-chime`
         boolean syncChimeRegisterFlg = false;// 标识同步`service-chime`是否为首次注册
 
         List<AdamTagParentVo> tagMe = parameter.getTagMe();
-        String uuid = null, type = null, created = null, modified = null;
+        String uuid = null, type = null;
         if (!CollectionUtil.isEmpty(tagMe)) {// 标签不为空则注册或更新IM
-            if (isComplete == 1) {// 注册IM
+            if (isComplete == 1) {// 注册IM，参见：https://docs-im.easemob.com/im/server/ready/user
                 JSONObject jsonObject = null;
                 try {
                     // 138cef91a62088bd3ef329fa3a6176cb18a > 138CEF91A62088BD3EF329FA3A6176CB18A > IM@zhengzai
-                    String result = easemobUtil.createUser(userInfoVo.getUid(), ppwd, userInfoVo.getNickname());
-
+                    String result = easemobUtil.createUser(existUserInfoVo.getUid(), ppwd, existUserInfoVo.getNickname());
                     jsonObject = JSONObject.parseObject(result);
                 } catch (Exception e) {
-                    log.error("###编辑资料:注册IM异常[uid:{},mobile:{}]", userInfoVo.getUid(), userInfoVo.getMobile());
+                    log.error("###编辑资料:注册IM异常[uid:{},mobile:{}]", existUserInfoVo.getUid(), existUserInfoVo.getMobile());
                 }
                 if (null == jsonObject || StringUtil.isNotNull(jsonObject.get("error"))) {
                     return ResponseDto.failure(ErrorMapping.get("10014"));
@@ -95,8 +88,6 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 
                     type = jsonObject.getString("type");
                     uuid = jsonObject.getString("uuid");
-                    created = jsonObject.getString(created);
-                    modified = jsonObject.getString("modified");
 
                     syncChimeRegisterFlg = true;
                 }
@@ -106,38 +97,37 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 
             syncChimeFlg = true;
         } else {
-            tagMe = userInfoVo.getTagMe();
+            tagMe = existUserInfoVo.getTagMe();
         }
-        AdamTagVo existSex = userInfoVo.getSex();
-
-//        userInfoVo.setAvatar(parameter.getAvatar());
-//        userInfoVo.setBackground(parameter.getBackground());
-//        userInfoVo.setNickname(parameter.getNickname());
-        userInfoVo.setAvatar(StringUtils.isEmpty(userInfoVo.getAvatar()) ? AdamConst.DEF_URL_AVATAR : userInfoVo.getAvatar());
-        userInfoVo.setBackground(StringUtils.isEmpty(userInfoVo.getBackground()) ? AdamConst.DEF_URL_BACKGROUND : userInfoVo.getBackground());
-        userInfoVo.setNickname(userInfoVo.getNickname());
-        userInfoVo.setSex(parameter.getSex());
-        userInfoVo.setBirthday(parameter.getBirthday());
-        userInfoVo.setArea(parameter.getArea());
-//        userInfoVo.setSignature(parameter.getSignature());
-        userInfoVo.setSignature(userInfoVo.getSignature());
-        userInfoVo.setTagMe(tagMe);
-        userInfoVo.setUpdatedAt(LocalDateTime.now());
-        userInfoVo.setIsComplete(isComplete);
+
+        existUserInfoVo.setAvatar(parameter.getAvatar());
+        existUserInfoVo.setBackground(parameter.getBackground());
+        existUserInfoVo.setNickname(parameter.getNickname());
+        existUserInfoVo.setSignature(parameter.getSignature());
+//        existUserInfoVo.setAvatar(StringUtils.isEmpty(existUserInfoVo.getAvatar()) ? AdamConst.DEF_URL_AVATAR : existUserInfoVo.getAvatar());
+//        existUserInfoVo.setBackground(StringUtils.isEmpty(existUserInfoVo.getBackground()) ? AdamConst.DEF_URL_BACKGROUND : existUserInfoVo.getBackground());
+//        existUserInfoVo.setNickname(existUserInfoVo.getNickname());
+//        existUserInfoVo.setSignature(existUserInfoVo.getSignature());
+        existUserInfoVo.setSex(parameter.getSex());
+        existUserInfoVo.setBirthday(parameter.getBirthday());
+        existUserInfoVo.setArea(parameter.getArea());
+        existUserInfoVo.setTagMe(tagMe);
+        existUserInfoVo.setUpdatedAt(LocalDateTime.now());
+        existUserInfoVo.setIsComplete(isComplete);
 
         long s = System.currentTimeMillis();
-        adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
+        adamRdmService.setUserInfoVoByUid(existUserInfoVo.getUid(), existUserInfoVo);
         log.debug("#RDS耗时:{}ms", System.currentTimeMillis() - s);
 
-        String sexStr = JsonUtils.toJson(userInfoVo.getSex());
-        if (syncChimeFlg || null == existSex || !userInfoVo.getSex().getVal().equals(existSex.getVal())) {// 同步`service-chime`
+        AdamTagVo existSex = existUserInfoVo.getSex();
+        String sexStr = JsonUtils.toJson(existUserInfoVo.getSex());
+        String tagMeStr = JsonUtils.toJson(tagMe);
+        if (syncChimeFlg || null == existSex || !parameter.getSex().getVal().equals(existSex.getVal())) {// 同步`service-chime`
             ResponseDto<String> chimeRegisterRstFlg = null;
             try {
                 chimeRegisterRstFlg = feignAdamChimeClient.registerForUser(
-                        userInfoVo.getUid(),
-                        sexStr,
-                        JsonUtils.toJson(tagMe),
-                        syncChimeRegisterFlg ? "CREATE" : "UPDATE");
+                        existUserInfoVo.getUid(), sexStr, tagMeStr,syncChimeRegisterFlg ? "CREATE" : "UPDATE"
+                );
             } catch (Exception e) {
                 log.error("同步`chime`用户标签信息异常", e);
             }
@@ -150,27 +140,21 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 
         s = System.currentTimeMillis();
         toMqSqls.add(SqlMapping.get("adam_user.complete"));
-        updateUserObjs.add(new Object[]{1, userInfoVo.getUpdatedAt(), userInfoVo.getUid()});
+        updateUserObjs.add(new Object[]{1, existUserInfoVo.getUpdatedAt(), existUserInfoVo.getUid()});
         toMqSqls.add(SqlMapping.get("adam_user_info.edit"));
         updateUserInfoObjs.add(new Object[]{
-                userInfoVo.getNickname(),
-                sexStr,
-                userInfoVo.getBirthday(),
-                userInfoVo.getArea(),
-                userInfoVo.getSignature(),
-                userInfoVo.getAvatar(),
-                userInfoVo.getBackground(),
-                JsonUtils.toJson(tagMe),
-                userInfoVo.getUid()}
+                        existUserInfoVo.getNickname(), sexStr, existUserInfoVo.getBirthday(), existUserInfoVo.getArea(),
+                        existUserInfoVo.getSignature(), existUserInfoVo.getAvatar(), existUserInfoVo.getBackground(),
+                tagMeStr, existUserInfoVo.getUid()
+                }
         );
         log.debug("#SQL.GET耗时:{}ms", System.currentTimeMillis() - s);
 
-
         if (syncChimeRegisterFlg) {
             toMqSqls.add(SqlMapping.get("adam_user_busi_acct.add"));
             LinkedList<Object[]> initUserBusiAcctObjs = CollectionUtil.linkedListObjectArr();
             initUserBusiAcctObjs.add(new Object[]{
-                    userInfoVo.getUid(), "IMHX", uuid, type, ppwd, 1, userInfoVo.getUpdatedAt()
+                    existUserInfoVo.getUid(), "IMHX", uuid, type, ppwd, 1, existUserInfoVo.getUpdatedAt()
             });
             queueUtils.sendMsgByRedis(MQConst.AdamQueue.SQL_UCENTER.getKey(),
                     SqlMapping.gets(toMqSqls, updateUserObjs, updateUserInfoObjs, initUserBusiAcctObjs)
@@ -180,7 +164,7 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
                     SqlMapping.gets(toMqSqls, updateUserObjs, updateUserInfoObjs)
             );
         }
-        return ResponseDto.success(userInfoVo.desensitize(reviewUserInfo));
+        return ResponseDto.success(existUserInfoVo.desensitize(reviewUserInfo));
     }
 
     @Override

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

@@ -23,6 +23,10 @@
 10017=入场人不存在，请核实
 10018=收货地址不存在，请核实
 10019=入场人已存在，请核实
+10020=昵称不合规
+10021=签名不合规
+10022=头像不合规
+10023=背景图不合规
 
 
 10101=姓名或身份证件号无效