Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/model/session/SessionStruct.java

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.security.Principal;
 import java.util.Random;
 
@@ -65,6 +66,12 @@ public class UserController implements IBaseController {
             'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w',
             'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 
+    @RequestMapping("/login")
+    public JsonResult login2(HttpServletRequest request) {
+
+        return null;
+    }
+
     /**
      * 用户登录
      *

src/main/java/cn/quantgroup/xyqb/model/session/SessionStruct.java

 package cn.quantgroup.xyqb.model.session;
 
-import cn.quantgroup.xyqb.entity.User;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Map;
-
 /**
  * Created by 11 on 2016/12/28.
  */

src/main/java/cn/quantgroup/xyqb/model/session/SessionValue.java

+package cn.quantgroup.xyqb.model.session;
+
+import cn.quantgroup.xyqb.entity.User;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.sql.Timestamp;
+import java.util.Map;
+
+/**
+ * Created by Miraculous on 2016/12/28.
+ */
+@Data
+@NoArgsConstructor
+public class SessionValue{
+    private User user;
+    private Map<String, Object> values;
+    private Timestamp createdAt;
+    private Timestamp lastAccessTime;
+
+}