From f2af33243ffca6ea7b8ab300cc0a3fa8ee6582e5 Mon Sep 17 00:00:00 2001 From: liuyingfang <1357764963@qq.com> Date: Fri, 11 Aug 2023 14:04:31 +0800 Subject: [PATCH] VO, --- .../platform/controller/UserInfoController.java | 3 +++ .../interceptor/TokenRegistryInterceptor.java | 1 + .../pluss/platform/vo/MerChannelStatusVO.java | 17 +++++++++++++++++ .../cn/pluss/platform/klk/LaKaLaUtility.java | 7 +------ .../controller/home/PayNotifyController.java | 7 ++++++- 5 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerChannelStatusVO.java diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java index 640679a..4a4d242 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/UserInfoController.java @@ -236,6 +236,9 @@ public class UserInfoController { */ @PostMapping("/login") public Result> detail(@RequestBody UserInfo userInfo) { + if (userInfo == null){ + throw new MsgException("请输入用户名密码"); + } Map login = userInfoNewService.login(userInfo.getLoginName(), userInfo.getPassword()); return ResultGenerator.genSuccessResult(login); } diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java index eb5be76..1f5a3fc 100644 --- a/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java +++ b/pluss-api-page/src/main/java/cn/pluss/platform/interceptor/TokenRegistryInterceptor.java @@ -69,6 +69,7 @@ public class TokenRegistryInterceptor extends HandlerInterceptorAdapter { limitUri.add("/api/systemConfig/updateSystemVersion"); limitUri.add("/api/lkl/querySubMerInfo"); limitUri.add("/api/lkl/lklCallBack"); + limitUri.add("/api/lkl/lklCallBackVoiceBox"); limitUri.add("/api/lkl/queryMerchantChannelStatus"); limitUri.add("/api/auditCallback/tradeCallBack"); limitUri.add("/api/merchantOrder/posTradeQuery"); diff --git a/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerChannelStatusVO.java b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerChannelStatusVO.java new file mode 100644 index 0000000..95f3a5b --- /dev/null +++ b/pluss-model-bundle/src/main/java/cn/pluss/platform/vo/MerChannelStatusVO.java @@ -0,0 +1,17 @@ +package cn.pluss.platform.vo; + +import lombok.Data; + +/** + * + * @author lyf + */ +@Data +public class MerChannelStatusVO { + private String status; + private String authorizationStatus; + + private String remark; + + private String virChannelFlag; +} diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/LaKaLaUtility.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/LaKaLaUtility.java index 9cc37d8..26b804d 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/LaKaLaUtility.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/klk/LaKaLaUtility.java @@ -49,12 +49,7 @@ public class LaKaLaUtility { public static void main(String[] args){ String key="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHB7j7gG3ioLnnr7bsuEXTAh/8YSxSp4lQIYGW9gX0Ikgz9JqARdg4iEnU6tgNirxA6Jdg0AWgLJQxQBEZMkwyK2ZfYgesYhlJkv6WVC8v5OkOrhA9NSQ3iS6JsYegsZO0GJSTtLQaTOF8WobPYe5NI+eWU1fRz2ZyxlWlKshBeQIDAQAB"; - String data="fXmWZcWWyDZ3IHgrJnTyuCs6sHKEZJ/yPDRlGNGS4PKps0FXnFZug4tr3UwVLgTBEQUOFx/j1q9VMS/kYe2oiUHyZ4qODDn\n" + - "1A3BjnKpjLKbbc+vAR7aSNRZhznmDZHlrc6vr6cPORm3GNs3o6VdM9a1hmrzDYrvAV5PgJXSojrQB2OJgedMXqRlDibTdH1e99HCWnFyoTAd0N0SLXnkp3oWawRNOcdPD0647o7+o/QEjVFdS8Hxxw+tEjR3qlGjH9lVndn+ZECMNYqBQsfx6Znx7sR\n" + - "RiegLj5zYhFr8lfWPe1a8AnvUggvfEgKFaVzDDXiUGuiTQcdNawQuY0g6cGw55d8zD3xZpx9s97aJ6u1GCydmC2Hj7DMQeVTJRNQeUKtZLEc+FqarPzOuuEQ5Ug+/ZDavtpMlGUb0gGIsfcbfd03m2YsvzaPakX3qf1CFHwas9wQCPpqRHff4S9tDlu\n" + - "pkcxq5MpuHo/01MaiXVMbpNqM9X+Y5bncE+CHAYIDaocq4cDdIlBR0ZL7ViWWH7FBnPaafkfbwVmVM1N5yb8lr+pi2WXsrOi/jfcEksQkhNZ+L7jsdAOvooPHzDDBGYJrHywK9BPbs9EA6VbOEDua6IhY31IL6QJrACZV7PA3TWfg0z5y9jjzT3QrnH\n" + - "J2ITlmM3TWlQAl7CqHAJOa3PEeUAKCLhtLsCuM80hkxHjVBsehGa3reAMZZkplXqjeHxuSMvJLllfUcN3V3yznxCadnXRlhyd5RagVS2sn8dvI6FD7nKlKCPXF6E4byOBMXtYkU4BrZHCsppFhrhSLJk3piJVzRdc5vf4wLUi6jfRyXL1NA+2fj3WJN\n" + - "cbaVGhjm5bQ=="; + String data="KdXIXByDVSGVtrX7E3Py2Nbw9c8Dy2qqC0oDgsEtdDMwBjCxCpsjwn+MNivA9wTQdHby36WSVQBbO1jylec8Y4EWXJbtEeW16/DpMSuuCvXunnvYaHmHGxp4/iq6ZSCTtFFoXzTVnLN9iSnKFt11aEsjHn+yTId//8SgVzzRriMpaKSkI6eVHZUKYHTw1JDK1z3NGw+WV0gdK7jiLVGB1vIz8YHgl7b/lYLUr5wwJIANGTSd9XJMUlkZ6kgRf0BQ7qBAaZH11F8h3YovmlHxvGAnS8bmKcSPg7j5+9eRxBG+yR6BvCdjBK146Fc6uQU/wKt6pYY9++5sEVoDUcVPImdOLpyq8g2R4R/Q9DvDDjxl/VJx+QkvMn+riaYnhUl13qUJx15R/9H7Aqs1KQW97vpHS5NbsKDsksfqJhj/Xxt6zmlVWrXbLaQ6kgOCwLKZ8Qve2oKm6mHSo6jZ0Cy4OvOQJt6KHWF6Mz34oaqRhJvcGexAVlWKkJlXLvceM9abFDoHmXK/Oosd3QK6afDJqKLkk7qRGgtZafAfVP3A2kRUPA9EeGqB7r2Dhffipwx49ewRCekWsuwtdtwq21BYuRmWweIA9cs2GYLWQykZ2eBmUQJiPN4fj+qAlgPgRZadBsgoouQDPJNMY0Jh0hXIcMac3k3pLmVRLqUhVDv6paA="; System.out.println(LaKaLaUtility.decrypt(key,data)); } diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/PayNotifyController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/PayNotifyController.java index 5e7bd1a..470aea9 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/PayNotifyController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/PayNotifyController.java @@ -65,11 +65,16 @@ public class PayNotifyController { } - @RequestMapping(value = "/lklCallBack",method = RequestMethod.POST) + @RequestMapping(value = "/lklCallBack",method = RequestMethod.POST) public String lklCallBack(@RequestBody Map params) { log.info("【拉卡拉】异步回调开始，【拉卡拉】回调参数:{}<=====================",JSONObject.toJSONString(params)); return String.valueOf(lklPayService.payNotifyCallBack(params)); } + @RequestMapping(value = "/lklCallBackVoiceBox",method = RequestMethod.POST) + public String lklCallBackVoiceBox(@RequestBody Map params) { + log.info("【拉卡拉音箱】异步回调开始，【拉卡拉】回调参数:{}<=====================",JSONObject.toJSONString(params)); + return String.valueOf(lklPayService.payNotifyCallBack(params)); + }