| @@ -59,26 +59,24 @@ public class BaseController { | |||||
| }); | }); | ||||
| } | } | ||||
| public WxCUser getUser() { | |||||
| Long cUserId = getUserId(); | |||||
| WxCUser user = wxCUserService.getById(cUserId); | |||||
| if (user == null) | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | |||||
| return user; | |||||
| } | |||||
| public Long getUserId() { | public Long getUserId() { | ||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | ||||
| Long cUserId = (Long) request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY); | Long cUserId = (Long) request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY); | ||||
| return cUserId; | return cUserId; | ||||
| } | } | ||||
| public String getTenantId() { | |||||
| public WxCUser getUser() { | |||||
| Long cUserId = getUserId(); | Long cUserId = getUserId(); | ||||
| WxCUser user = wxCUserService.getById(cUserId); | WxCUser user = wxCUserService.getById(cUserId); | ||||
| if (user == null) | if (user == null) | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| return user.getTenantId(); | |||||
| return user; | |||||
| } | |||||
| public String getTenantId() { | |||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||||
| String tenantId = (String) request.getAttribute(AuthorizationInterceptor.TENANT_ID); | |||||
| return tenantId; | |||||
| } | } | ||||
| public WxAppinfo getAppInfo(String appId) { | public WxAppinfo getAppInfo(String appId) { | ||||