返回0001处理

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

@@ -101,8 +101,8 @@ public class UserQueryLogController {
           String nowEndStr=sf.format(new Date());
           date2=sfs.parse(nowEndStr+" 23:59:59");
         }
-
-        List<UserQueryLog> userQueryLogs=userQueryLogService.findByTimestamp(date1,date2,pageId-1,pageSize);
+        int startP=(pageId-1)*pageSize;
+        List<UserQueryLog> userQueryLogs=userQueryLogService.findByTimestamp(date1,date2,startP,pageSize);
         Long total=userQueryLogService.findByTimestampCount(date1,date2);
         PageModel<UserQueryLog> uqp=new PageModel<UserQueryLog>();
         uqp.setTotal(total);
@@ -118,7 +118,8 @@ public class UserQueryLogController {
             ll.setCreateDate(sdf.format(ll.getCreatedAt()));
           }
         }catch (Exception e){
-
+          LOGGER.info("日期时间转换异常");
+          return JsonResult.buildErrorStateResult("日期时间转换异常",null);
         }
 
         uqp.setPageSize(pageSize);
@@ -229,12 +230,18 @@ public class UserQueryLogController {
 
       if(key.equals("phoneNo")){
         phonesCards=getBankCardsByPhoneNos(queryV);
+        if(phonesCards!=null&&phonesCards.get("errorMsg")!=null&&!phonesCards.get("errorMsg").equals("")){
+          return JsonResult.buildErrorStateResult(phonesCards.get("errorMsg"),null);
+        }
       }else{
         List<String> phones=new ArrayList<String>();
         for(UserDetail uda:userDetails){
           phones.add(uda.getPhoneNo());
         }
         phonesCards=getBankCardsByPhoneNos(phones);
+        if(phonesCards!=null&&phonesCards.get("errorMsg")!=null&&!phonesCards.get("errorMsg").equals("")){
+          return JsonResult.buildErrorStateResult(phonesCards.get("errorMsg"),null);
+        }
       }
 
     }
@@ -323,8 +330,9 @@ public class UserQueryLogController {
         String dataStr=data1.get("data").getAsString();
         String signStr=data1.get("sign").getAsString();
         //校验签名
-        if(RSA.checkSign(dataStr,signStr,publicKey)){
+        if(MD5Util.build(dataStr).equals(signStr)){
           String jsonDataStr=RSA.decrypt(dataStr,privateKey);
+          //String chang=jsonDataStr.substring(1,jsonDataStr.length()-1);
           JsonArray listObj = new JsonParser().parse(jsonDataStr).getAsJsonArray();//.getAsJsonObject();
           for(JsonElement jsonElement : listObj) {
             JsonObject jo = jsonElement.getAsJsonObject();
@@ -338,12 +346,15 @@ public class UserQueryLogController {
             phonesMap.put(phone,cards);
           }
         }else{
+          phonesMap.put("errorMsg","签名校验失败！");
             LOGGER.info("签名校验失败！");
         }
       }else{
+          phonesMap.put("errorMsg","从支付中心接口返回data为null");
           LOGGER.info("从支付中心接口返回data为null");
       }
     }catch(Exception e){
+       phonesMap.put("errorMsg","查询银行卡信息接口返回解析异常");
         LOGGER.info("查询银行卡信息接口返回解析异常");
     }
     return phonesMap;
@@ -578,7 +589,7 @@ public class UserQueryLogController {
         return userName;
       }
     }catch(Exception e){
-        LOGGER.info("解析支付中心返回结果resultStr异常");
+        LOGGER.info("解析运营系统用户token返回结果resultStr异常");
     }
     return "";
   }

src/main/resources/config/dev/xyqb.properties

@@ -3,7 +3,7 @@ configserver.disable=1
 configserver.system=xyqb-user
 
 #xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.22:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
-xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.153:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
+xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.26:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
 
 xyqb.data.mysql.password=qatest