From 09c726d51bbeba2173caa361bd5dd7bf79a8e5cf Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 25 Dec 2025 10:46:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=20=E9=81=BF=E5=85=8D=E6=97=A0=E7=99=BB?= =?UTF-8?q?=E5=BD=95=E7=9A=84=E6=93=8D=E4=BD=9C=E6=97=A0=E6=B3=95=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=97=A5=E5=BF=97=E7=9A=84=E6=83=85=E5=86=B5=202.=20?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E7=99=BB=E5=BD=95=E5=8F=AF=E4=BB=A5=E4=B8=8D?= =?UTF-8?q?=E4=BC=A0=E9=80=92=E7=A7=9F=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/dm/ruoyi-vue-pro-dm8.sql | 2 +- .../module/system/controller/admin/auth/AuthController.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/dm/ruoyi-vue-pro-dm8.sql b/sql/dm/ruoyi-vue-pro-dm8.sql index 42b3bd3d..1aa21a6d 100644 --- a/sql/dm/ruoyi-vue-pro-dm8.sql +++ b/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, diff --git a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/auth/AuthController.java b/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/auth/AuthController.java index 510eb674..ca3fb848 100644 --- a/zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/controller/admin/auth/AuthController.java +++ b/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 smsLogin(@RequestBody @Valid AuthSmsLoginReqVO reqVO) { return success(authService.smsLogin(reqVO)); From e6fc24d3b174dc200d8cc56a5c21316a1dccee20 Mon Sep 17 00:00:00 2001 From: chenbowen Date: Thu, 25 Dec 2025 17:29:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E7=9B=AE=E5=89=8D=E6=B6=89=E5=8F=8A?= =?UTF-8?q?=E5=88=B0=E5=A4=AA=E5=A4=9A=E6=B2=A1=E6=9C=89=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E5=9C=BA=E6=99=AF=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=B8=BB=E7=A7=9F=E6=88=B7=E5=85=9C=E5=BA=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tenant/core/context/TenantContextHolder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/context/TenantContextHolder.java b/zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/context/TenantContextHolder.java index ac0b17aa..be8d66ca 100644 --- a/zt-framework/zt-spring-boot-starter-biz-tenant/src/main/java/com/zt/plat/framework/tenant/core/context/TenantContextHolder.java +++ b/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; }