From 47f882588d1d18df404478bc79cc53cb608549a2 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期五, 20 八月 2021 22:20:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xinghong-dev
---
service-front/src/main/java/com/java110/front/controller/wechat/StaffWechatAuthController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/controller/wechat/StaffWechatAuthController.java b/service-front/src/main/java/com/java110/front/controller/wechat/StaffWechatAuthController.java
old mode 100644
new mode 100755
index c09391e..567295e
--- a/service-front/src/main/java/com/java110/front/controller/wechat/StaffWechatAuthController.java
+++ b/service-front/src/main/java/com/java110/front/controller/wechat/StaffWechatAuthController.java
@@ -47,6 +47,7 @@
/**
* 寰俊鐧诲綍鎺ュ彛
+ * /app/loginStaffWechatAuth
*
* @param request
*/
@@ -65,19 +66,20 @@
/**
* 寰俊鍏紬鍙峰彿閴存潈
+ * /app/staffAuth
*
* @param request
*/
@RequestMapping(path = "/staffAuth")
- public ResponseEntity<String> staffAuth(@RequestParam String redirectUrl,
- @RequestParam String errorUrl,
- @RequestParam String loginFlag,
+ public ResponseEntity<String> staffAuth(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "staffId") String staffId,
+ @RequestParam(value = "storeId") String storeId,
+ @RequestParam(value = "appId") String appId,
HttpServletRequest request,
HttpServletResponse response) {
IPageData pd = PageData.newInstance().builder("", "", "", "",
- "login", "", "", "", request.getHeader("app-id")
- );
- return staffAuthSMOImpl.refreshToken(pd, redirectUrl, errorUrl, loginFlag, request, response);
+ "login", "", "", "", appId);
+ return staffAuthSMOImpl.refreshToken(pd, communityId, staffId, storeId, request, response);
}
--
Gitblit v1.8.0