diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/mobile/WeiXinController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/mobile/WeiXinController.java index d239faa8..7f20f3c4 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/mobile/WeiXinController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/mobile/WeiXinController.java @@ -145,22 +145,16 @@ public class WeiXinController extends BaseControllerImpl { @ApiOperation(value = "小程序回调", notes = "小程序回调") @RequestMapping(value = "/xcxCallBack", method = RequestMethod.GET) - public CommonResult xcxCallBack(@RequestParam(value = "signature",required = false) String signature, + public String xcxCallBack(@RequestParam(value = "signature",required = false) String signature, @RequestParam(value = "timestamp",required = false) String timestamp, @RequestParam(value = "nonce",required = false) String nonce, @RequestParam(value = "echostr",required = false) String echostr) { - if(StringUtils.isEmpty(signature) || StringUtils.isEmpty(timestamp) || StringUtils.isEmpty(nonce) || StringUtils.isEmpty(echostr) ) { - return CommonResult.success("校验成功");//todo 配置好消息链接改回来,腾讯服务器测试提交没有发送参数,导致报错 - } boolean checked=weiXinService.checkSignature(timestamp, nonce, signature); if(checked){ - return CommonResult.success("校验成功"); + accountUserBindConnectService.bindTmplId(echostr); + return echostr; } - if(!checked){ - return CommonResult.failed("校验失败"); - } - accountUserBindConnectService.bindTmplId(echostr); - return CommonResult.success("小程序订阅消息模板绑定成功"); + return "fail"; } } diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBindConnectService.java b/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBindConnectService.java index 2ff35f8c..b1df5ad4 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBindConnectService.java +++ b/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBindConnectService.java @@ -93,5 +93,5 @@ public interface AccountUserBindConnectService extends IBaseService queryWrapper = new QueryWrapper<>(); @@ -552,7 +554,6 @@ public class AccountUserBindConnectServiceImpl extends BaseServiceImpl