1.修改user login 接口返回map, 2.nickName 格式为XX-XXXX-XXXX

luoo_user/src/main/java/com/luoo/user/controller/UserController.java

@@ -107,8 +107,12 @@ public class UserController {
 				return Result.failed(StatusCode.USER_MOBILE_VERIFICATION_CODE_MISMATCH);
 			}
 			User user = userService.loginOrRegister(mobile);
+			
+			
 	    	String token = jwtUtil.createJWT(user.getId(),user.getNickname(),Constants.TOKEN_ROLE_APP_USER);
-	    	return Result.success(token);
+	    	Map<String,String> map = new HashMap<>();
+	    	map.put("token", token);
+	    	return Result.success(map);
 		}finally {
 			redisTemplate.delete(redisMobileCheckCodeKey);
 		}
@@ -117,10 +121,12 @@ public class UserController {
 
 	@ApiOperation(value = "3.游客登录返回token", notes = "token中的subject和roles均为tourist")
 	@GetMapping("/touristLogin")
-	public Result<String> touristLogin() {
+	public Result<Map<String,String>> touristLogin() {
 		String nickName="游客-"+NickNameUtil.getRandomNickName();
     	String token = jwtUtil.createJWT(String.valueOf(idWorker.nextId()),nickName,Constants.TOKEN_ROLE_TOURIST);
-    	return Result.success(token);
+    	Map<String,String> map=new HashMap<>();
+    	map.put("token", token);
+    	return Result.success(map);
 	}
 
 	/**
@@ -140,8 +146,10 @@ public class UserController {
 	@ApiOperation(value = "5.token续期", notes = "有效期7天")
 	@PostMapping("/autoLogin")
 	@GlobalInterceptor
-	public Result<String> autoLogin(@RequestHeader(value = "token", required = false) String token) {
-		return Result.success(userService.autoLogin(token));
+	public Result<Map<String, String>> autoLogin(@RequestHeader(value = "token", required = false) String token) {
+    	Map<String,String> map=new HashMap<>();
+    	map.put("token", userService.autoLogin(token));
+    	return Result.success(map);
 	}
 	
 	/**

luoo_user/src/main/java/com/luoo/user/util/NickNameUtil.java

@@ -3,7 +3,21 @@ package com.luoo.user.util;
 import com.apifan.common.random.RandomSource;
 
 public class NickNameUtil {
+	/**
+	 * 最终名为： 雀乐/游客-XXXX-XXXX，经分析用户量1000万时，重名率为0.000001%
+	 * eg: 
+	 * 雀乐-冬力一柏.朋长
+	 * 雀乐-莹玲书蕊&贤秋
+	 * 雀乐-博应杨-沛道
+	 * 雀乐-石济$丁然自钧
+	 */
+	private static String[] SPECIAL_CHARACTER = new String[] { "~", "`", "@", "$", "%", "^", "&", "*", "+", "-", "|",
+			".", "<", ">" };
+
 	public static String getRandomNickName() {
-		return RandomSource.personInfoSource().randomChineseNickName(4);
+		int index = RandomSource.numberSource().randomInt(0, SPECIAL_CHARACTER.length);
+		String character = SPECIAL_CHARACTER[index];
+		return RandomSource.personInfoSource().randomChineseNickName(4) + character
+				+ RandomSource.personInfoSource().randomChineseNickName(4);
 	}
 }