fix: 修复在多数据源情况下，租户忽略的表未使用主数据源问题。修复租户信息修改时的异常问题。合并dev

README.md

@@ -4,7 +4,7 @@
 <img src="https://img.shields.io/badge/RELEASE-v3.4.1-%23ff3f59.svg" alt="Release" />
 </a>
 <a href="https://github.com/continew-org/continew-starter" title="ContiNew Starter" target="_blank">
-<img src="https://img.shields.io/badge/ContiNew Starter-2.8.0-%236CB52D.svg" alt="ContiNew Starter" />
+<img src="https://img.shields.io/badge/ContiNew Starter-2.8.2-%236CB52D.svg" alt="ContiNew Starter" />
 </a>
 <a href="https://spring.io/projects/spring-boot" title="Spring Boot" target="_blank">
 <img src="https://img.shields.io/badge/Spring Boot-3.2.12-%236CB52D.svg?logo=Spring-Boot" alt="Spring Boot" />
@@ -229,7 +229,7 @@ public class DeptController extends BaseController<DeptService, DeptResp, DeptDe
 | <a href="https://arco.design/vue/docs/start" target="_blank">Arco Design</a>                                                      | 2.56.0       | 字节跳动推出的前端 UI 框架，年轻化的色彩和组件设计。         |
 | <a href="https://www.typescriptlang.org/zh/" target="_blank">TypeScript</a>                                                       | 5.0.4        | TypeScript 是微软开发的一个开源的编程语言，通过在 JavaScript 的基础上添加静态类型定义构建而成。 |
 | <a href="https://vite.dev/" target="_blank">Vite</a>                                                                         | 5.1.5        | 下一代的前端工具链，为开发提供极速响应。                     |
-| [ContiNew Starter](https://github.com/continew-org/continew-starter)                                                              | 2.8.0        | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 |
+| [ContiNew Starter](https://github.com/continew-org/continew-starter)                                                              | 2.8.2        | ContiNew Starter 包含了一系列经过企业实践优化的依赖包（如 MyBatis-Plus、SaToken），可轻松集成到应用中，为开发人员减少手动引入依赖及配置的麻烦，为 Spring Boot Web 项目的灵活快速构建提供支持。 |
 | <a href="https://spring.io/projects/spring-boot" target="_blank">Spring Boot</a>                                                  | 3.2.12       | 简化 Spring 应用的初始搭建和开发过程，基于“约定优于配置”的理念，使开发人员不再需要定义样板化的配置。（Spring Boot 3.0 开始，要求 Java 17 作为最低版本） |
 | <a href="https://undertow.io/" target="_blank">Undertow</a>                                                                       | 2.3.17.Final | 采用 Java 开发的灵活的高性能 Web 服务器，提供包括阻塞和基于 NIO 的非堵塞机制。 |
 | <a href="https://sa-token.dev33.cn/" target="_blank">Sa-Token + JWT</a>                                                           | 1.39.0       | 轻量级 Java 权限认证框架，让鉴权变得简单、优雅。             |

continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java

@@ -20,7 +20,7 @@
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
 import top.continew.admin.common.context.UserContextHolder;
-import top.continew.starter.extension.crud.model.entity.BaseDO;
+import top.continew.admin.common.model.entity.BaseDO;
 
 import java.time.LocalDateTime;
 

continew-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java

@@ -16,20 +16,18 @@
 
 package top.continew.admin.common.constant;
 
-import top.continew.starter.extension.crud.constant.ContainerPool;
-
 /**
  * 数据源容器相关常量（Crane4j 数据填充组件使用）
  *
  * @author Charles7c
  * @since 2024/1/20 12:33
  */
-public class ContainerConstants extends ContainerPool {
+public class ContainerConstants {
 
     /**
      * 用户昵称
      */
-    public static final String USER_NICKNAME = ContainerPool.USER_NICKNAME;
+    public static final String USER_NICKNAME = "UserNickname";
 
     /**
      * 用户角色 ID 列表

continew-common/src/main/java/top/continew/admin/common/constant/SysConstants.java

@@ -65,12 +65,12 @@ public class SysConstants {
     public static final String ALL_PERMISSION = "*:*:*";
 
     /**
-     * 账号登录 URI
+     * 登录 URI
      */
-    public static final String LOGIN_URI = "/auth/account";
+    public static final String LOGIN_URI = "/auth/login";
 
     /**
-     * 退出 URI
+     * 登出 URI
      */
     public static final String LOGOUT_URI = "/auth/logout";
 

continew-common/src/main/java/top/continew/admin/common/context/UserContext.java

@@ -85,6 +85,16 @@ public class UserContext implements Serializable {
      */
     private Long tenantId;
 
+    /*
+     * 客户端类型
+     */
+    private String clientType;
+
+    /**
+     * 客户端 ID
+     */
+    private String clientId;
+
     public UserContext(Set<String> permissions, Set<RoleContext> roles, Integer passwordExpirationDays) {
         this.permissions = permissions;
         this.setRoles(roles);

continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java

@@ -20,8 +20,8 @@
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.extra.spring.SpringUtil;
+import top.continew.admin.common.service.CommonUserService;
 import top.continew.starter.core.util.ExceptionUtils;
-import top.continew.starter.extension.crud.service.CommonUserService;
 
 /**
  * 用户上下文 Holder

continew-common/src/main/java/top/continew/admin/common/base/BaseController.java → continew-common/src/main/java/top/continew/admin/common/controller/BaseController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package top.continew.admin.common.base;
+package top.continew.admin.common.controller;
 
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.context.SaHolder;

continew-common/src/main/java/top/continew/admin/common/model/entity/BaseCreateDO.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 top.continew.admin.common.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import top.continew.starter.extension.crud.model.entity.BaseIdDO;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * 实体类基类
+ *
+ * <p>
+ * 通用字段：创建人、创建时间
+ * </p>
+ *
+ * @author Charles7c
+ * @since 2025/1/12 23:00
+ */
+@Data
+public class BaseCreateDO extends BaseIdDO {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+}

continew-common/src/main/java/top/continew/admin/common/model/entity/BaseDO.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 top.continew.admin.common.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import top.continew.starter.extension.crud.model.entity.BaseIdDO;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * 实体类基类
+ *
+ * @author Charles7c
+ * @since 2025/1/12 23:00
+ */
+@Data
+public class BaseDO extends BaseIdDO {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createUser;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    private Long updateUser;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+}

continew-common/src/main/java/top/continew/admin/common/model/entity/BaseUpdateDO.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 top.continew.admin.common.model.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+import top.continew.starter.extension.crud.model.entity.BaseIdDO;
+
+/**
+ * 实体类基类
+ *
+ * <p>
+ * 通用字段：创建人、创建时间
+ * </p>
+ *
+ * @author Charles7c
+ * @since 2025/1/12 23:00
+ */
+@Data
+public class BaseUpdateDO extends BaseIdDO {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    private Long updateUser;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
+}

continew-common/src/main/java/top/continew/admin/common/model/resp/BaseDetailResp.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2022-present Charles7c Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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 top.continew.admin.common.model.resp;
+
+import cn.crane4j.annotation.Assemble;
+import cn.crane4j.annotation.Mapping;
+import cn.crane4j.annotation.condition.ConditionOnPropertyNotNull;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import top.continew.admin.common.constant.ContainerConstants;
+
+import java.io.Serial;
+import java.time.LocalDateTime;
+
+/**
+ * 详情响应基类
+ *
+ * @author Charles7c
+ * @since 2024/12/27 20:32
+ */
+@Data
+public class BaseDetailResp extends BaseResp {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 修改人
+     */
+    @JsonIgnore
+    @ConditionOnPropertyNotNull
+    @Assemble(container = ContainerConstants.USER_NICKNAME, props = @Mapping(ref = "updateUserString"))
+    private Long updateUser;
+
+    /**
+     * 修改人
+     */
+    @Schema(description = "修改人", example = "李四")
+    @ExcelProperty(value = "修改人", order = Integer.MAX_VALUE - 2)
+    private String updateUserString;
+
+    /**
+     * 修改时间
+     */
+    @Schema(description = "修改时间", example = "2023-08-08 08:08:08", type = "string")
+    @ExcelProperty(value = "修改时间", order = Integer.MAX_VALUE - 1)
+    private LocalDateTime updateTime;
+}