Merge branch 'master' into 20180330-wechat-binding

# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

@@ -155,8 +155,8 @@ public class UserQueryLogController {
     }
     String[] values=keyValues.split("\\n");
     List<String> queryV= Arrays.asList(values);
-    if(queryV!=null&&queryV.size()>50000){
-      return JsonResult.buildErrorStateResult("查询记录数是"+queryV.size()+",超过50000条限制",null);
+    if(queryV!=null&&queryV.size()>3000){
+      return JsonResult.buildErrorStateResult("查询记录数是"+queryV.size()+",超过3000条限制",null);
     }
     List<UserQueryInfo> userQueryInfos=new ArrayList<UserQueryInfo>();
     List<UserDetail> userDetails=new ArrayList<UserDetail>();
@@ -366,8 +366,8 @@ public class UserQueryLogController {
 
     List<String> queryV= Arrays.asList(values);
 
-    if(queryV!=null&&queryV.size()>50000){
-      return JsonResult.buildErrorStateResult("查询记录数是"+queryV.size()+",超过50000条限制",null);
+    if(queryV!=null&&queryV.size()>3000){
+      return JsonResult.buildErrorStateResult("查询记录数是"+queryV.size()+",超过3000条限制",null);
     }
 
 

src/main/java/cn/quantgroup/xyqb/service/mq/Impl/LoanVestMQServiceImpl.java

@@ -12,8 +12,6 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-;
-
 /**
  * Created by xuran on 2017/6/21.
  * 用户统计信息
@@ -30,13 +28,6 @@ public class LoanVestMQServiceImpl implements IVestService {
   @Qualifier(value = "loanVestQueue")
   Queue loanVestQueue;
 
-
-
-
-
-
-
-
   /**
    * 发送用登陆统计信息
    * @param message 订单信息
@@ -44,17 +35,12 @@ public class LoanVestMQServiceImpl implements IVestService {
   @Async
   public void send(UserStatistics message){
     if(null==message){
-      LOGGER.error("用登陆统计消息不能为空");
+      LOGGER.error("用户登陆统计消息不能为空");
     }
-
-    LOGGER.info("用登陆统计发送,message={}",message);
+    LOGGER.info("用户登陆统计发送,message={}",message);
     String msg  = JSONObject.toJSONString(message);
     loanVestRabbitTemplate.convertAndSend("statistics-user", msg);
-
-    LOGGER.info("用登陆统计成功,message={}",msg);
+    LOGGER.info("用户登陆统计成功,message={}",msg);
   }
 
-
-
-
 }