fixed

src/main/java/cn/quantgroup/xyqb/controller/internal/querylog/UserQueryLogController.java

@@ -75,14 +75,7 @@ public class UserQueryLogController {
     public JsonResult queryLog(HttpServletRequest request, @RequestParam(required = false) String beginDate, @RequestParam(required = false) String endDate, Integer pageId, Integer pageSize) {
         log.info("查询日期：beginDate{},endDate{}", beginDate, endDate);
         String token = request.getHeader(Constants.X_AUTH_TOKEN);
-        if (StringUtils.isEmpty(token)) {
-            log.info("token为空，非法查询");
-            return JsonResult.buildErrorStateResult("缺少授权信息", null);
-        }
-        if (StringUtils.isEmpty(checkUserToken(token))) {
-            log.info("token授权异常");
-            return JsonResult.buildErrorStateResult("未授权查询", null);
-        }
+        checkUserToken(token);
         try {
             SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
             SimpleDateFormat sfs = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -134,14 +127,7 @@ public class UserQueryLogController {
     @ApiOperation(value = "给运营系统提供的查询用户信息的接口", notes = "给运营系统提供的查询用户信息的接口", httpMethod = "POST")
     public JsonResult queryForResult(HttpServletRequest request, String key, String keyValues, String columns, Integer pageId, Integer pageSize) {
         String token = request.getHeader(Constants.X_AUTH_TOKEN);
-        if (StringUtils.isEmpty(token)) {
-            log.info("token为空，非法查询");
-            return JsonResult.buildErrorStateResult("缺少授权信息", null);
-        }
         String userName = checkUserToken(token);
-        if (StringUtils.isEmpty(userName)) {
-            return JsonResult.buildErrorStateResult("未授权查询", null);
-        }
         if (StringUtils.isEmpty(keyValues)) {
             return JsonResult.buildErrorStateResult("请输入查询条件", null);
         }
@@ -263,7 +249,7 @@ public class UserQueryLogController {
 
                     }
                 } else {
-                    log.info("签名校验失败！");
+                    log.error("签名校验失败！");
                     throw new UserQueryLogException("签名校验失败");
                 }
             }
@@ -278,14 +264,7 @@ public class UserQueryLogController {
     @ApiOperation(value = "给运营系统提供的导出用户信息的接口", notes = "给运营系统提供的导出用户信息的接口", httpMethod = "POST")
     public JsonResult exportExcel(final HttpServletResponse response, HttpServletRequest request, String key, String keyValues, String columns) {
         String token = request.getHeader(Constants.X_AUTH_TOKEN);
-        if (StringUtils.isEmpty(token)) {
-            log.info("token为空，非法查询");
-            return JsonResult.buildErrorStateResult("缺少授权信息", null);
-        }
-        String userName = checkUserToken(token);
-        if (StringUtils.isEmpty(userName)) {
-            return JsonResult.buildErrorStateResult("未授权查询", null);
-        }
+        checkUserToken(token);
         if (StringUtils.isEmpty(keyValues)) {
             return JsonResult.buildErrorStateResult("请输入查询条件", null);
         }
@@ -484,19 +463,27 @@ public class UserQueryLogController {
     }
 
     private String checkUserToken(String token) {
+        if (StringUtils.isEmpty(token)) {
+            log.info("token为空，非法查询");
+            throw new UserQueryLogException("缺少授权信息");
+        }
         HashMap<String, String> parameters = new HashMap<>();
         parameters.put("token", token);
         //访问用户中心查询用户银行卡接口
         String resultStr = httpService.post(yunyingUrl + "/user/info", parameters);
+        String userName = null;
         try {
             JsonObject resultUser = new JsonParser().parse(resultStr).getAsJsonObject();
             if (Objects.equals(Constants.SUCCESS_CODE, resultUser.get(Constants.RESULT_CODE).getAsString()) && resultUser.get(Constants.RESULT_DATA).getAsJsonObject() != null) {
-                String userName = resultUser.get(Constants.RESULT_DATA).getAsJsonObject().get("user").getAsString();
-                return userName;
+                userName = resultUser.get(Constants.RESULT_DATA).getAsJsonObject().get("user").getAsString();
             }
         } catch (Exception e) {
-            log.info("解析运营系统用户token返回结果resultStr异常");
+            log.error("解析运营系统用户token返回结果resultStr异常", e);
+            throw new UserQueryLogException("未授权查询", e);
         }
-        return "";
+        if (StringUtils.isEmpty(userName)) {
+            throw new UserQueryLogException("未授权查询");
+        }
+        return userName;
     }
 }