| @@ -120,7 +120,7 @@ public class BaseController { | |||||
| */ | */ | ||||
| public WxCUser getWxCUser() { | public WxCUser getWxCUser() { | ||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| BaseCUserEntity baseuser = (BaseCUserEntity) request.getAttribute(Constant.REQUEST_WX_C_USER_KEY); | |||||
| BaseCUserEntity baseuser = (BaseCUserEntity) request.getAttribute(Constant.REQUEST_C_USER_KEY); | |||||
| // Long cUserId = getUserId(); | // Long cUserId = getUserId(); | ||||
| // WxCUser user = wxCUserService.getById(cUserId); | // WxCUser user = wxCUserService.getById(cUserId); | ||||
| if (baseuser == null) { | if (baseuser == null) { | ||||
| @@ -67,7 +67,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { | |||||
| //设置userId到request里,后续根据userId,获取用户信息 | //设置userId到request里,后续根据userId,获取用户信息 | ||||
| request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId()); | request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId()); | ||||
| request.setAttribute(Constant.TENANT_ID, cUser.getTenantId()); | request.setAttribute(Constant.TENANT_ID, cUser.getTenantId()); | ||||
| request.setAttribute(Constant.REQUEST_WX_C_USER_KEY, cUser); | |||||
| request.setAttribute(Constant.REQUEST_C_USER_KEY, cUser); | |||||
| if (StringUtils.isNotBlank(cUser.getParentTenantId())) { | if (StringUtils.isNotBlank(cUser.getParentTenantId())) { | ||||
| request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId()); | request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId()); | ||||
| } | } | ||||
| @@ -29,7 +29,7 @@ public class BaseCUserEntity extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") | @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") | ||||
| private Date expireTime; | private Date expireTime; | ||||
| @io.swagger.annotations.ApiModelProperty(value="真实对象如wxCUser",name="expireTime") | |||||
| @io.swagger.annotations.ApiModelProperty(value="真实对象如wxCUser",name="realUser") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Object realUser; | private Object realUser; | ||||
| @@ -30,7 +30,7 @@ public class Constant { | |||||
| public static final String LOGIN_MEMBER_KEY = "LOGIN_MEMBER_KEY"; | public static final String LOGIN_MEMBER_KEY = "LOGIN_MEMBER_KEY"; | ||||
| public static final String TENANT_ID = "TENANT_ID"; | public static final String TENANT_ID = "TENANT_ID"; | ||||
| public static final String PARENT_TENANT_ID = "PARENT_TENANT_ID"; | public static final String PARENT_TENANT_ID = "PARENT_TENANT_ID"; | ||||
| public static final String REQUEST_WX_C_USER_KEY = "REQUEST_WX_C_USER"; | |||||
| public static final String REQUEST_C_USER_KEY = "REQUEST_C_USER"; | |||||
| public static final String adminPage = "https://admin.malls.iformall.com"; | public static final String adminPage = "https://admin.malls.iformall.com"; | ||||