Merge branch 'dev' into pre-production

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

@@ -58,6 +58,7 @@ public interface ISysClient {
 	String ROLE_ALIASES = API_PREFIX + "/role-aliases";
 	String TENANT = API_PREFIX + "/tenant";
 	String TENANT_ID = API_PREFIX + "/tenant-id";
+	String TENANT_NAME = API_PREFIX + "/tenant-name";
 	String TENANT_PACKAGE = API_PREFIX + "/tenant-package";
 	String PARAM = API_PREFIX + "/param";
 	String PARAM_VALUE = API_PREFIX + "/param-value";
@@ -249,6 +250,16 @@ public interface ISysClient {
 	@GetMapping(TENANT_ID)
 	R<Tenant> getTenant(@RequestParam("tenantId") String tenantId);
 
+	/**
+	 * 获取租户名称
+	 * @param tenantName
+	 * @return
+	 */
+
+	@GetMapping(TENANT_NAME)
+	R<Tenant> getTenantByName(@RequestParam("tenantName") String tenantName);
+
+
 	/**
 	 * 获取租户产品包
 	 *

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

@@ -138,6 +138,11 @@ public class ISysClientFallback implements ISysClient {
 		return R.fail("获取数据失败");
 	}
 
+	@Override
+	public R<Tenant> getTenantByName(String tenantName) {
+		return R.fail("获取数据失败");
+	}
+
 	@Override
 	public R<TenantPackage> getTenantPackage(String tenantId) {
 		return R.fail("获取数据失败");

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

@@ -16,6 +16,7 @@
  */
 package org.springblade.system.feign;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.AllArgsConstructor;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
@@ -181,6 +182,14 @@ public class SysClient implements ISysClient {
 		return R.data(tenantService.getByTenantId(tenantId));
 	}
 
+	@Override
+	public R<Tenant> getTenantByName(String tenantName) {
+		QueryWrapper queryWrapper = new QueryWrapper();
+		queryWrapper.eq("tenant_name",tenantName);
+		queryWrapper.eq("is_deleted",0);
+		return R.data(tenantService.getOne(queryWrapper));
+	}
+
 	@Override
 	@GetMapping(TENANT_PACKAGE)
 	public R<TenantPackage> getTenantPackage(String tenantId) {