Merge branch 'refs/heads/jxl-guys' into container-test

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileUserVO.java

@@ -249,5 +249,15 @@ public class SmileUserVO implements Serializable {
 
     private  int authStatus;
 
+    private static final SmileUserVO obj = new SmileUserVO();
+
+    public static SmileUserVO getNew() {
+        try {
+            return (SmileUserVO) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SmileUserVO();
+        }
+    }
+
 
 }

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileNoLoginController.java

@@ -6,6 +6,7 @@ import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
+import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.util.SmileRedisUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -52,6 +53,17 @@ public class SmileNoLoginController {
     @ApiOperation("获取用户状态,返回用户")
     public ResponseDto<SmileUserVO> getUserById(@RequestParam("userId") String userId) {
         SmileUserVO smileUserVO =smileRedisUtils.getSmileUserVo(userId);
+        if (smileUserVO == null) {
+            String name = (String) redisUtil.getDB15RedisHGet(
+                    KylinRedisConst.PERFORMANCES_AGENT_INFO + userId,
+                    "name"
+            );
+            if (name != null && name.startsWith("\"") && name.endsWith("\"")) {
+                name = name.substring(1, name.length() - 1);
+            }
+            smileUserVO = SmileUserVO.getNew();
+            smileUserVO.setName(name);
+        }
         return ResponseDto.success(smileUserVO);
     }