Merge remote-tracking branch 'origin/master' into master

1、升級成2.8.1

blade-auth/pom.xml

@@ -8,12 +8,12 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
 
     <artifactId>blade-auth</artifactId>
     <name>${project.artifactId}</name>
-    <version>${bladex.project.version}</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <dependencies>
@@ -90,7 +90,7 @@
 <!--        <dependency>-->
 <!--            <groupId>org.springblade</groupId>-->
 <!--            <artifactId>blade-service-api</artifactId>-->
-<!--            <version>2.7.2.RELEASE</version>-->
+<!--            <version>2.8.1.RELEASE</version>-->
 <!--        </dependency>-->
 
         <!-- 链路追踪、服务监控 -->

blade-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops-api/blade-flow-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops-api/blade-resource-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-ops-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.8.0.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 

blade-ops/blade-admin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-develop/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-ops</artifactId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-ops/blade-flow-design/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-flow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-resource/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-swagger/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-turbine/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-ops/blade-xxljob-admin/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-ops/blade-xxljob/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-ops</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>blade-xxljob</artifactId>

blade-ops/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-ops</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.8.0.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
 
     <modules>

blade-service-api/blade-desk-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-dict-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-scope-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-system-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/blade-system-api/src/main/java/org/springblade/system/dto/MyTenantDTO.java

@@ -0,0 +1,15 @@
+package org.springblade.system.dto;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.Query;
+import org.springblade.system.entity.Tenant;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MyTenantDTO extends Tenant {
+
+	private static final long serialVersionUID = 1L;
+
+	private Query query;
+}

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

@@ -18,8 +18,8 @@ package org.springblade.system.feign;
 
 import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.mp.support.BladePage;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.system.dto.MyTenantDTO;
 import org.springblade.system.entity.*;
 import org.springblade.system.vo.MenuVO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -267,7 +267,7 @@ public interface ISysClient {
 	R<Boolean> removeTenant(@RequestParam String ids);
 
 	@GetMapping(TENANT_GETLIST)
-	R<BladePage<Tenant>> getTenantList(Tenant tenant, Query query);
+	R<BladePage<Tenant>> getTenantList(@RequestBody MyTenantDTO myTenantDTO);
 
 	/**
 	 * 获取参数

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

@@ -17,8 +17,8 @@
 package org.springblade.system.feign;
 
 import org.springblade.core.mp.support.BladePage;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springblade.system.dto.MyTenantDTO;
 import org.springblade.system.entity.*;
 import org.springblade.system.vo.MenuVO;
 import org.springframework.stereotype.Component;
@@ -145,7 +145,7 @@ public class ISysClientFallback implements ISysClient {
 	}
 
 	@Override
-	public R<BladePage<Tenant>> getTenantList(Tenant tenant, Query query) {
+	public R<BladePage<Tenant>> getTenantList(MyTenantDTO myTenantDTO) {
 		return null;
 	}
 

blade-service-api/blade-user-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blade-service-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.8.0.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 

blade-service/blade-desk/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-service</artifactId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-service/blade-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -21,13 +21,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.dto.MyTenantDTO;
 import org.springblade.system.entity.*;
 import org.springblade.system.service.*;
 import org.springblade.system.vo.MenuVO;
@@ -198,9 +198,9 @@ public class SysClient implements ISysClient {
 
 	@Override
 	@GetMapping(TENANT_GETLIST)
-	public R<BladePage<Tenant>> getTenantList(Tenant tenant, Query query) {
-		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
-		IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!AuthUtil.getUser().getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, AuthUtil.getUser().getTenantId()) : queryWrapper);
+	public R<BladePage<Tenant>> getTenantList(@RequestBody MyTenantDTO myTenantDTO) {
+		QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(myTenantDTO);
+		IPage<Tenant> pages = tenantService.page(Condition.getPage(myTenantDTO.getQuery()), (!AuthUtil.getUser().getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, AuthUtil.getUser().getTenantId()) : queryWrapper);
 		return R.data(BladePage.of(pages));
 	}
 

blade-service/blade-user/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

blade-service/pom.xml

@@ -6,14 +6,14 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX</artifactId>
-        <version>2.8.0.RELEASE</version>
+        <version>2.8.1.RELEASE</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.8.0.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务集合</description>
 

pom.xml

@@ -5,11 +5,11 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX</artifactId>
-    <version>2.8.0.RELEASE</version>
+    <version>2.8.1.RELEASE</version>
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.project.version>2.8.0.RELEASE</bladex.project.version>
+        <bladex.project.version>2.8.1.RELEASE</bladex.project.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.1</maven.plugin.version>