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

sql/dm/ruoyi-vue-pro-dm8.sql

@@ -1944,7 +1944,7 @@ COMMENT ON TABLE system_oauth2_refresh_token IS 'OAuth2 刷新令牌';
 CREATE TABLE system_operate_log (
                                     id bigint NOT NULL PRIMARY KEY,
                                     trace_id varchar(64) DEFAULT '' NULL,
-                                    user_id bigint  NOT NULL,
+                                    user_id bigint NULL,
                                     user_type smallint DEFAULT 0 NOT NULL,
                                     type varchar(50)  NOT NULL,
                                     sub_type varchar(50)  NOT NULL,

zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/context/TenantContextHolder.java

@@ -1,7 +1,5 @@
 package com.zt.plat.framework.tenant.core.context;
 
-import cn.hutool.core.util.StrUtil;
-import com.zt.plat.framework.common.enums.DocumentEnum;
 import com.alibaba.ttl.TransmittableThreadLocal;
 
 /**
@@ -38,8 +36,10 @@ public class TenantContextHolder {
     public static Long getRequiredTenantId() {
         Long tenantId = getTenantId();
         if (tenantId == null) {
-            throw new NullPointerException("TenantContextHolder 不存在租户编号！可参考文档："
-                + DocumentEnum.TENANT.getUrl());
+//            throw new NullPointerException("TenantContextHolder 不存在租户编号！可参考文档："
+//                + DocumentEnum.TENANT.getUrl());
+            // 暂定所有获取不到租户的操作，默认都使用主租户进行操作 1l
+            tenantId = 1L;
         }
         return tenantId;
     }

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/auth/AuthController.java

@@ -143,6 +143,7 @@ public class AuthController {
 
     @PostMapping("/sms-login")
     @PermitAll
+    @TenantIgnore
     @Operation(summary = "使用短信验证码登录")
     public CommonResult<AuthLoginRespVO> smsLogin(@RequestBody @Valid AuthSmsLoginReqVO reqVO) {
         return success(authService.smsLogin(reqVO));