From 249d800220342ae0012b17d299d6174979d2a4a7 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Sun, 21 Oct 2018 08:57:44 +0800 Subject: [PATCH] =?UTF-8?q?[C=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 --- .../iformall/controller/WxUserGrantController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index d030f57c1..4f3da28a4 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -14,6 +14,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCUserVo; import com.iformall.enums.EnumAssignTagsTrigger; +import com.iformall.interceptor.AuthorizationInterceptor; import com.iformall.service.*; import com.iformall.utils.IPUtil; import io.swagger.annotations.Api; @@ -123,6 +124,11 @@ public class WxUserGrantController extends BaseController { if (user1 != null) { user1.createToken(new Date()); token = user1.getToken(); + + resultMap.put("token", token); + request.setAttribute(AuthorizationInterceptor.LOGIN_USER_KEY, user1.getId()); + request.setAttribute(AuthorizationInterceptor.TENANT_ID, user1.getTenantId()); + user1.setRegisterIp(ipaddress); user1.setSessionKey(session_key); if (user1.getSceneAddress() == null || user1.getSceneAddress().equals("undefined")) @@ -145,13 +151,16 @@ public class WxUserGrantController extends BaseController { } catch (Exception e) { logger.error(e.getMessage()); } - resultMap.put("token", token); - wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN,user1); } else { user.setTenantId(wxAppinfo.getTenantId()); user.createToken(new Date()); token = user.getToken(); + + resultMap.put("token", token); + request.setAttribute(AuthorizationInterceptor.LOGIN_USER_KEY, user1.getId()); + request.setAttribute(AuthorizationInterceptor.TENANT_ID, user1.getTenantId()); + user.setRegisterIp(ipaddress); if (user.getSceneAddress() == null || user.getSceneAddress().equals("undefined")) user.setSceneAddress(sceneAddress); @@ -174,7 +183,6 @@ public class WxUserGrantController extends BaseController { } catch (Exception e) { logger.error(e.getMessage()); } - resultMap.put("token", token); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN,user); }