Merge branch 'master-queryLog'

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

@@ -369,11 +369,15 @@ public class UserQueryLogController {
   }
 
   @RequestMapping("/exportUserInfo")
-  public JsonResult exportExcel(final HttpServletResponse response,String key,String keyValues, String columns,String token){
+  public JsonResult exportExcel(final HttpServletResponse response, HttpServletRequest request,String key,String keyValues, String columns){
 
+
+    String token=request.getHeader("x-auth-token");
     if(token==null||token.equals("")){
+      LOGGER.info("token为空，非法查询");
       return JsonResult.buildErrorStateResult("缺少授权信息",null);
     }
+
     String userName=checkUserToken(token);
     if(userName.equals("")){
       return JsonResult.buildErrorStateResult("未授权查询",null);
@@ -564,8 +568,9 @@ public class UserQueryLogController {
     {
       OutputStream output=response.getOutputStream();
       response.reset();
-      response.setHeader("Content-disposition", "attachment; filename=users.xls");
-      response.setContentType("application/msexcel");
+      response.setHeader("Content-disposition", "attachment; filename=users.xlsx");
+      response.setContentType("application/vnd.ms-excel;charset=utf-8");
+      response.setCharacterEncoding("utf-8");
       wb.write(output);
       output.close();