From 2fb4395eb79e1b609b4f843bbbe90bf6c1e648ee Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Fri, 29 Jan 2021 17:32:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stdiet/web/controller/custom/CusWxController.java | 9 ++++++--- .../java/com/stdiet/custom/service/ISysWxService.java | 2 +- .../com/stdiet/custom/service/impl/SysWxServiceImpl.java | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/CusWxController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/CusWxController.java index 8394f4c54..ac9d921d8 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/CusWxController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/CusWxController.java @@ -3,7 +3,10 @@ package com.stdiet.web.controller.custom; import com.stdiet.common.core.controller.BaseController; import com.stdiet.custom.service.ISysWxService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/wx") @@ -13,8 +16,8 @@ public class CusWxController extends BaseController { public ISysWxService sysWxService; @GetMapping("/checkSign") - public boolean wxCheckAuth(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce) { - return sysWxService.wxCheckAuth(signature, timestamp, nonce); + public String wxCheckAuth(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { + return sysWxService.wxCheckAuth(signature, timestamp, nonce, echostr); } } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxService.java index f705ff49a..4d1eb7d59 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxService.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysWxService.java @@ -9,5 +9,5 @@ public interface ISysWxService { * @param nonce * @return */ - public boolean wxCheckAuth(String signature, String timestamp, String nonce); + public String wxCheckAuth(String signature, String timestamp, String nonce, String echostr); } diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxServiceImpl.java index 69fd55559..613fc728c 100644 --- a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxServiceImpl.java +++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysWxServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.transaction.annotation.Transactional; public class SysWxServiceImpl implements ISysWxService { @Override - public boolean wxCheckAuth(String signature, String timestamp, String nonce) { - return WxTokenUtils.checkSignature(signature, timestamp, nonce); + public String wxCheckAuth(String signature, String timestamp, String nonce, String echostr) { + return WxTokenUtils.checkSignature(signature, timestamp, nonce) ? echostr : null; } }