Merge branch 'master' into 20171106_delete_58jr

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

@@ -71,6 +71,7 @@ public class AppController implements IBaseController {
    * 第三方用户登录
    */
   @RequestMapping("/login")
+  @LogHttpCaller
   public JsonResult login(
       String phoneNo,
       @RequestParam(required = false, defaultValue = "1") Long registerFrom,

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

@@ -75,6 +75,7 @@ public class UserController implements IBaseController {
       'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
 
   @RequestMapping("/login")
+  @LogHttpCaller
   public JsonResult login(
       @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,
       @RequestParam(required = false, defaultValue = "1") Long createdFrom,
@@ -112,6 +113,7 @@ public class UserController implements IBaseController {
   }
 
   @RequestMapping("/login/fast")
+  @LogHttpCaller
   public JsonResult loginFast(
       @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,
       @RequestParam(required = false, defaultValue = "1") Long createdFrom, @RequestParam(required = false,defaultValue = "xyqb") String key,@RequestParam(required = false)Long btRegisterChannelId,@RequestParam(required = false) String dimension ,HttpServletRequest request) {
@@ -216,6 +218,7 @@ public class UserController implements IBaseController {
    * @return
    */
   @RequestMapping("/register/fast")
+  @LogHttpCaller
   public JsonResult registerFast(@RequestParam String phoneNo, @RequestParam String verificationCode, @RequestParam(required = false) Long channelId,
                                  @RequestParam(required = false) Long registerFrom, @RequestParam(required = false, defaultValue = "") String appChannel,
                                  @RequestParam(required = false)Long btRegisterChannelId,@RequestParam(required = false)String dimension) {
@@ -264,6 +267,7 @@ public class UserController implements IBaseController {
    * @param channelId
    * @return
    */
+  @LogHttpCaller
   @RequestMapping("/register")
   public JsonResult register(@RequestParam String phoneNo, @RequestParam String password,
                              @RequestParam String verificationCode, @RequestParam(required = false) Long channelId,