⚡ 增加租户信息获取

blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java

@@ -22,6 +22,7 @@ import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.entity.Menu;
 import org.springblade.system.entity.Role;
+import org.springblade.system.entity.Tenant;
 import org.springblade.system.feign.ISysClient;
 
 import java.util.List;
@@ -43,6 +44,7 @@ public class SysCache {
 	private static final String ROLE_NAMES_ID = "roleNames:id:";
 	private static final String ROLE_ALIAS_ID = "roleAlias:id:";
 	private static final String ROLE_ALIASES_ID = "roleAliases:id:";
+	private static final String TENANT_ID = "tenant:id:";
 
 	private static ISysClient sysClient;
 
@@ -168,4 +170,17 @@ public class SysCache {
 		});
 	}
 
+	/**
+	 * 获取租户
+	 *
+	 * @param id 主键
+	 * @return Tenant
+	 */
+	public static Tenant getTenant(Long id) {
+		return CacheUtil.get(SYS_CACHE, TENANT_ID, id, () -> {
+			R<Tenant> result = sysClient.getTenant(id);
+			return result.getData();
+		});
+	}
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -21,6 +21,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.entity.Menu;
 import org.springblade.system.entity.Role;
+import org.springblade.system.entity.Tenant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -48,6 +49,7 @@ public interface ISysClient {
 	String ROLE_NAMES = API_PREFIX + "/role-names";
 	String ROLE_ALIAS = API_PREFIX + "/role-alias";
 	String ROLE_ALIASES = API_PREFIX + "/role-aliases";
+	String TENANT = API_PREFIX + "/tenant";
 
 	/**
 	 * 获取菜单
@@ -130,4 +132,13 @@ public interface ISysClient {
 	@GetMapping(ROLE_ALIASES)
 	R<List<String>> getRoleAliases(@RequestParam("roleIds") String roleIds);
 
+	/**
+	 * 获取租户
+	 *
+	 * @param id 主键
+	 * @return Tenant>
+	 */
+	@GetMapping(TENANT)
+	R<Tenant> getTenant(@RequestParam("id") Long id);
+
 }

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java

@@ -20,6 +20,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.entity.Menu;
 import org.springblade.system.entity.Role;
+import org.springblade.system.entity.Tenant;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -76,4 +77,9 @@ public class ISysClientFallback implements ISysClient {
 	public R<List<String>> getRoleAliases(String roleIds) {
 		return R.fail("获取数据失败");
 	}
+
+	@Override
+	public R<Tenant> getTenant(Long id) {
+		return R.fail("获取数据失败");
+	}
 }

blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java

@@ -21,9 +21,11 @@ import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.entity.Menu;
 import org.springblade.system.entity.Role;
+import org.springblade.system.entity.Tenant;
 import org.springblade.system.service.IDeptService;
 import org.springblade.system.service.IMenuService;
 import org.springblade.system.service.IRoleService;
+import org.springblade.system.service.ITenantService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
@@ -46,6 +48,8 @@ public class SysClient implements ISysClient {
 
 	private IMenuService menuService;
 
+	private ITenantService tenantService;
+
 	@Override
 	@GetMapping(MENU)
 	public R<Menu> getMenu(Long id) {
@@ -100,4 +104,10 @@ public class SysClient implements ISysClient {
 		return R.data(roleService.getRoleAliases(roleIds));
 	}
 
+	@Override
+	@GetMapping(TENANT)
+	public R<Tenant> getTenant(Long id) {
+		return R.data(tenantService.getById(id));
+	}
+
 }