From 8aab2a67e773874ed81a0f556fe268b9b9e351e7 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 13 May 2021 17:00:07 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/custom/WechatAppletController.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index c227da1de..05fa2bb7f 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -521,6 +521,13 @@ public class WechatAppletController extends BaseController { public AjaxResult getPlanDetail(@RequestParam Long planId) { return AjaxResult.success(iSysRecipesService.selectSysRecipesByRecipesId(planId)); } + + @GetMapping("/server") + public Boolean authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { + return true; + } + + } From 8511939835a76d8b2b80b1e08025cbe146ce97e3 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 13 May 2021 17:05:14 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stdiet/web/controller/custom/WechatAppletController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index 05fa2bb7f..53a1b1911 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -523,8 +523,8 @@ public class WechatAppletController extends BaseController { } @GetMapping("/server") - public Boolean authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { - return true; + public String authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { + return "success"; } From 96e6135bb8f9de5e358facc0b2313747894f2e17 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 13 May 2021 17:30:02 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stdiet/web/controller/custom/WechatAppletController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index 53a1b1911..dc8841e84 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -522,7 +522,7 @@ public class WechatAppletController extends BaseController { return AjaxResult.success(iSysRecipesService.selectSysRecipesByRecipesId(planId)); } - @GetMapping("/server") + @GetMapping("/authServer") public String authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { return "success"; } From fa8d0a5f1990eaa4e43d72cb1d909f67f05a09a8 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 13 May 2021 17:45:10 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stdiet/web/controller/custom/WechatAppletController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index dc8841e84..bd5930401 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -523,8 +523,8 @@ public class WechatAppletController extends BaseController { } @GetMapping("/authServer") - public String authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { - return "success"; + public Boolean authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { + return true; } From 1426d2ab51c9d564ca02e007de4fc97eb802dee2 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 13 May 2021 17:48:31 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/custom/WechatAppletController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index bd5930401..20c17d15d 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -523,8 +523,10 @@ public class WechatAppletController extends BaseController { } @GetMapping("/authServer") - public Boolean authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { - return true; + public String authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { +// String token = "shengtang"; +// String encodingAESKey = "DsZDa8UQs2B0BUF31RNBexGrCEXMwa4z2uONuJmVKFW"; + return echostr; } From 7332ce76494c63efd72c602999b1cae3878280a5 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 13 May 2021 17:51:50 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stdiet/web/controller/custom/WechatAppletController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index 20c17d15d..788b1ab91 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.time.temporal.ChronoUnit; import java.util.*; @@ -523,10 +524,10 @@ public class WechatAppletController extends BaseController { } @GetMapping("/authServer") - public String authServer(@RequestParam String signature, @RequestParam String timestamp, @RequestParam String nonce, @RequestParam String echostr) { + public String authServer(HttpServletRequest request) { // String token = "shengtang"; // String encodingAESKey = "DsZDa8UQs2B0BUF31RNBexGrCEXMwa4z2uONuJmVKFW"; - return echostr; + return request.getParameter("echostr"); } From 2e8e6d7b8d73d29eb1c73306bfdc00a0b54e4e67 Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Thu, 13 May 2021 17:59:23 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stdiet/web/controller/custom/WechatAppletController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java index 788b1ab91..5e058dc19 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java @@ -526,7 +526,7 @@ public class WechatAppletController extends BaseController { @GetMapping("/authServer") public String authServer(HttpServletRequest request) { // String token = "shengtang"; -// String encodingAESKey = "DsZDa8UQs2B0BUF31RNBexGrCEXMwa4z2uONuJmVKFW"; +// String encodingAESKey = "i483gAY6KM0Ty5ij245U08jLhROxateWvg0LPjYLprS"; return request.getParameter("echostr"); }