|
|
|
@@ -103,6 +103,11 @@ public class BaseController { |
|
|
|
return tenantEntity; |
|
|
|
} |
|
|
|
|
|
|
|
public String getFinalTenantId() { |
|
|
|
TenantEntity tenantEntity = getTenantInfo(); |
|
|
|
return tenantEntity.getFinalTenantId(); |
|
|
|
} |
|
|
|
|
|
|
|
// public Long getUserId() { |
|
|
|
// HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); |
|
|
|
// Long cUserId = (Long) request.getAttribute(Constant.LOGIN_USER_KEY); |
|
|
|
@@ -154,11 +159,11 @@ public class BaseController { |
|
|
|
cUserTokenService.updateTokenCache(token, cuser); |
|
|
|
} |
|
|
|
|
|
|
|
private WxCUserBasicInfo getCacheMember(Long memberId,String key,long seconds) throws Exception { |
|
|
|
private WxCUserBasicInfo getCacheMember(Long memberId,String finalTenantId,String key,long seconds) throws Exception { |
|
|
|
// 缓存 |
|
|
|
WxCUserBasicInfo member = RedisCacheUtils.getCacheObject(cuserBasicInfoTemplate, key, WxCUserBasicInfo.class); |
|
|
|
if(null == member) { |
|
|
|
member = wxCUserBasicInfoService.getById(memberId); |
|
|
|
member = wxCUserBasicInfoService.getById(memberId,finalTenantId); |
|
|
|
if (member == null) { |
|
|
|
throw new MallinkException(ErrorCode.USER_IS_EMPTY); |
|
|
|
} |
|
|
|
@@ -170,13 +175,13 @@ public class BaseController { |
|
|
|
public WxCUserBasicInfo getCacheMember() throws Exception { |
|
|
|
Long memberId = getMemberId(); |
|
|
|
String key = "webapp:member:"+memberId; |
|
|
|
return getCacheMember(memberId, key, 3600*24*3); |
|
|
|
return getCacheMember(memberId,getFinalTenantId(), key, 3600*24*3); |
|
|
|
} |
|
|
|
|
|
|
|
/*此处缓存短暂时间,因为积分、成长值记录*/ |
|
|
|
public WxCUserBasicInfo getShortCacheMember(Long memberId) throws Exception { |
|
|
|
public WxCUserBasicInfo getShortCacheMember(Long memberId,String finalTenantId) throws Exception { |
|
|
|
String key = "webapp:short:member:"+memberId; |
|
|
|
return getCacheMember(memberId, key, 100); |
|
|
|
return getCacheMember(memberId,finalTenantId, key, 100); |
|
|
|
} |
|
|
|
|
|
|
|
public void removeCacheMember(Long memberId) { |
|
|
|
@@ -228,7 +233,7 @@ public class BaseController { |
|
|
|
|
|
|
|
WxCUserBasicInfo byId = null; |
|
|
|
if (null != userId) { |
|
|
|
byId = wxCUserBasicInfoService.getById(userId); |
|
|
|
byId = wxCUserBasicInfoService.getById(userId,getFinalTenantId()); |
|
|
|
} |
|
|
|
|
|
|
|
// List<WxCUserBasicInfo> list = wxCUserBasicInfoService.findByPhone(tenantEntity, phone); |
|
|
|
|