From ba4998259a07eb8de9f1b9d7bf7a65462fe54029 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 21 Oct 2018 08:58:01 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E7=99=BB=E5=BD=95=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxMerchantBUserController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 8c3742f39..fccb722c0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -9,6 +9,7 @@ import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.enums.EnumMerchantStatus; +import com.iformall.interceptor.AuthorizationInterceptor; import com.iformall.service.WxMallService; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.WxMerchantService; @@ -148,6 +149,9 @@ public class WxMerchantBUserController extends BaseController { if (user1.getBUserPwd().equalsIgnoreCase(password)) { user1.createToken(currentDate); token = user1.getToken(); + resultMap.put("token", token); + request.setAttribute(AuthorizationInterceptor.LOGIN_USER_KEY, user1.getId()); + request.setAttribute(AuthorizationInterceptor.TENANT_ID, user1.getTenantId()); try { wxMerchantBUserService.saveOrUpdate(user1); } catch (Exception e) { @@ -155,7 +159,7 @@ public class WxMerchantBUserController extends BaseController { return new ResultData(ErrorCode.DB_FAIL.getCode(), "数据库保存失败,e:" + e.getMessage()); } - resultMap.put("token", token); + return new ResultData(resultMap); } else { return new ResultData(ErrorCode.PASSWORD_ERROR);