[C端登录支持多租户][修改]

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);
             }