Merge remote-tracking branch 'origin/master'

src/main/java/com/lovenav/controller/UserController.java

@@ -81,41 +81,42 @@ public class UserController {
     }
     @RequestMapping(value = "/login",produces = {"application/json;charset=UTF-8"})
         public Map<String,Object>login(User user,String code,HttpSession session){
+            Map<String,Object> result=new HashMap<>();
             Map<String,Object> map=new HashMap<>();
 
             String sessionCode = (String) session.getAttribute(RandomValidateCode.RANDOMVALIDATECODE);
             if (sessionCode==null){
-                map.put("msg","验证码空的");
-                return map;
+                result.put("msg","验证码空的");
+                return result;
             }
             if (!sessionCode.equals(code)){
-                map.put("msg","验证码错误");
-                return map;
+                result.put("msg","验证码错误");
+                return result;
             }
 
             if(StringUtils.isEmpty(user.getUserLogin())||StringUtils.isEmpty(user.getUserPassword())){
-                map.put("msg","用户或密码为空！");
-                return map;
+                result.put("msg","用户或密码为空！");
+                return result;
             }
 
             User user1 = userService.userLogin(user);
 
             if(user1!=null){
-                map.put("code",200);
-                String token= tokenUtils.sign(user1);
+                result.put("code",200);
                 map.put("userEmail",user1.getUserEmail());
                 map.put("userLogin",user1.getUserLogin());
-                map.put("user",user1.getUserEmail());
-                map.put("userStatus",user1.getUserStatus());
-                map.put("Id",user1.getId());
-                map.put("nickname",user1.getNickname());
-                map.put("roleId",user1.getRoleId());
-                map.put("userRegistered",user1.getUserRegistered());
-                map.put("token",token);
+                String token= TokenUtils.createJWT(map,10000000L);
+                result.put("user",user1.getUserEmail());
+                result.put("userStatus",user1.getUserStatus());
+                result.put("Id",user1.getId());
+                result.put("nickname",user1.getNickname());
+                result.put("roleId",user1.getRoleId());
+                result.put("userRegistered",user1.getUserRegistered());
+                result.put("token",token);
             }else {
-                map.put("msg","用户名或密码错误!");
+                result.put("msg","用户名或密码错误!");
             }
-            return map;
+            return result;
 }
 /*图片验证码*/
     @RequestMapping("/verifyCode")