fix;

liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-handler-service/src/main/java/com/liquidnet/common/exception/RestControllerAdviceHandler.java

@@ -39,8 +39,9 @@ public class RestControllerAdviceHandler {
     @ExceptionHandler(value = Exception.class)
     @ResponseBody
     public ResponseEntity<Error> serviceExceptionHandler(Exception rex, HttpServletRequest req) {
-        logger.error("Ex.Handler.RestController:{},ex:{},request:{},param:{}",
-                rex.getClass().getSimpleName(), rex.getLocalizedMessage(), req.getRequestURI(), JSON.toJSONString(req.getParameterMap()));
+        logger.error("Ex.Handler.RestController:uri:{},param:{},ex:{},msg:{},",
+                req.getRequestURI(), JSON.toJSONString(req.getParameterMap()), rex.getClass().getSimpleName(), rex.getLocalizedMessage());
+
         if (rex instanceof MissingServletRequestParameterException) {
             MissingServletRequestParameterException ygex = (MissingServletRequestParameterException) rex;
             String message = ygex.getMessage();

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

@@ -4,7 +4,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.constant.LnsRegex;
-import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.AdamUserInfoParam;
 import com.liquidnet.service.adam.dto.vo.*;
@@ -23,14 +26,16 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Pattern;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 @ApiSupport(order = 10020)
 @Api(tags = "用户中心")
@@ -55,14 +60,18 @@ public class AdamUserController {
         log.debug("parameter:{}", JsonUtils.toJson(parameter));
 
         AdamTagVo sex = parameter.getSex();
-        if (null == sex) {
-            return ResponseDto.failure(ErrorMapping.get("10011"));
-        }
-        List<AdamTagVo> allSexTagVos = this.getTagsForSex().getData();
-        Optional<AdamTagVo> existSexTagVoOptional = allSexTagVos.stream().filter(r -> r.getVal().equals(sex.getVal())).findAny();
-        if (!existSexTagVoOptional.isPresent()) {
-            // 已选中的性别标签不在系统性别标签库中
-            return ResponseDto.failure(ErrorMapping.get("10011"));
+//        if (null == sex) {
+//            return ResponseDto.failure(ErrorMapping.get("10011"));
+//        }
+        if (null != sex) {
+            String sexVal = sex.getVal();
+            List<AdamTagVo> allSexTagVos = this.getTagsForSex().getData();
+            Optional<AdamTagVo> existSexTagVoOptional = allSexTagVos.stream().filter(r -> r.getVal().equals(sexVal)).findAny();
+            if (!existSexTagVoOptional.isPresent()) {
+                // 已选中的性别标签不在系统性别标签库中
+                return ResponseDto.failure(ErrorMapping.get("10011"));
+            }
+            sex = existSexTagVoOptional.get();
         }
 //        List<AdamTagParentVo> tagMeVos = parameter.getTagMe();
 //        if (null == tagMeVos) {
@@ -113,7 +122,7 @@ public class AdamUserController {
         editVo.setAvatar(parameter.getAvatar());
         editVo.setBackground(parameter.getBackground());
         editVo.setNickname(parameter.getNickname());
-        editVo.setSex(existSexTagVoOptional.get());
+        editVo.setSex(sex);
         editVo.setBirthday(parameter.getBirthday());
         editVo.setArea(parameter.getArea());
         editVo.setSignature(parameter.getSignature());

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

@@ -81,7 +81,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
                 userInfoVo = AdamUserInfoVo.getNew();
                 userInfoVo.setUid(IDGenerator.nextSnowId() + "");
                 userInfoVo.setMobile(mobile);
-                userInfoVo.setNickname("Now_".concat(SensitizeUtil.custom(mobile, 3, 4)));
+                userInfoVo.setNickname("Now_".concat(RandomStringUtils.randomAlphanumeric(3)).concat(mobile.substring(6)));
                 userInfoVo.setIsComplete(0);
                 userInfoVo.setState(1);
                 userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));
@@ -139,7 +139,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
 
                     userInfoVo.setUid(IDGenerator.nextSnowId() + "");
                     userInfoVo.setMobile(param.getMobile());
-                    userInfoVo.setNickname("Now_".concat(SensitizeUtil.custom(param.getMobile(), 3, 4)));
+                    userInfoVo.setNickname("Now_".concat(RandomStringUtils.randomAlphanumeric(3)).concat(param.getMobile().substring(6)));
                     userInfoVo.setIsComplete(0);
                     userInfoVo.setState(1);
                     userInfoVo.setQrCode("lN".concat(userInfoVo.getUid()).concat(RandomStringUtils.randomAlphanumeric(5).toUpperCase()));