|
@@ -536,17 +536,7 @@ public class UserController extends BaseController {
|
|
|
User user = userService.getUser(userId);
|
|
|
//获取当前用户数
|
|
|
int userCurrentNum = userService.getUser(request).size();
|
|
|
- Tenant tenant = tenantService.getTenantByTenantId(user.getTenantId());
|
|
|
- if(tenant.getExpireTime()!=null && tenant.getExpireTime().getTime()<System.currentTimeMillis()){
|
|
|
- //租户已经过期,移除token
|
|
|
- redisService.deleteObjectBySession(request,"userId");
|
|
|
- redisService.deleteObjectBySession(request,"clientIp");
|
|
|
- }
|
|
|
- data.put("type", tenant.getType()); //租户类型,0免费租户,1付费租户
|
|
|
- data.put("expireTime", Tools.parseDateToStr(tenant.getExpireTime()));
|
|
|
data.put("userCurrentNum", userCurrentNum);
|
|
|
- data.put("userNumLimit", tenant.getUserNumLimit());
|
|
|
- data.put("tenantId", tenant.getTenantId());
|
|
|
res.code = 200;
|
|
|
res.data = data;
|
|
|
} catch (Exception e) {
|