⚡ 新增@TenantIgnore注解用于接口排除租户逻辑

blade-starter-tenant/src/main/java/org/springblade/core/tenant/BladeTenantHandler.java

@@ -62,6 +62,9 @@ public class BladeTenantHandler implements TenantLineHandler {
 	 */
 	@Override
 	public boolean ignoreTable(String tableName) {
+		if (BladeTenantHolder.isIgnore()) {
+			return true;
+		}
 		if (TenantUtil.isIgnore()) {
 			return true;
 		}

blade-starter-tenant/src/main/java/org/springblade/core/tenant/BladeTenantHolder.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springblade.core.tenant;
+
+import org.springframework.core.NamedThreadLocal;
+
+/**
+ * 租户线程处理
+ *
+ * @author Chill
+ */
+public class BladeTenantHolder {
+
+	private static final ThreadLocal<Boolean> TENANT_KEY_HOLDER = new NamedThreadLocal<Boolean>("blade-tenant") {
+		@Override
+		protected Boolean initialValue() {
+			return Boolean.FALSE;
+		}
+	};
+
+	public static void setIgnore(Boolean ignore) {
+		TENANT_KEY_HOLDER.set(ignore);
+	}
+
+	public static Boolean isIgnore() {
+		return TENANT_KEY_HOLDER.get();
+	}
+
+
+	public static void clear() {
+		TENANT_KEY_HOLDER.remove();
+	}
+
+
+}

blade-starter-tenant/src/main/java/org/springblade/core/tenant/annotation/TenantIgnore.java

@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springblade.core.tenant.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 排除租户逻辑.
+ *
+ * @author Chill
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface TenantIgnore {
+}

blade-starter-tenant/src/main/java/org/springblade/core/tenant/aspect/BladeTenantAspect.java

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
+ * <p>
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.gnu.org/licenses/lgpl.html
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springblade.core.tenant.aspect;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springblade.core.tenant.BladeTenantHolder;
+import org.springblade.core.tenant.annotation.TenantIgnore;
+
+/**
+ * 自定义租户切面
+ *
+ * @author Chill
+ */
+@Slf4j
+@Aspect
+public class BladeTenantAspect {
+
+	@Around("@annotation(tenantIgnore)")
+	public Object around(ProceedingJoinPoint point, TenantIgnore tenantIgnore) throws Throwable {
+		try {
+			//开启忽略
+			BladeTenantHolder.setIgnore(Boolean.TRUE);
+			//执行方法
+			return point.proceed();
+		} finally {
+			//关闭忽略
+			BladeTenantHolder.clear();
+		}
+	}
+
+}

blade-starter-tenant/src/main/java/org/springblade/core/tenant/config/TenantConfiguration.java

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springblade.core.tenant;
+package org.springblade.core.tenant.config;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.config.MybatisPlusConfiguration;
+import org.springblade.core.tenant.*;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;