Browse Source

【更新】多租户参数校验

fengshuonan 4 years ago
parent
commit
129a2c1a33

+ 9 - 1
guns-base-support/guns-core/src/main/java/cn/stylefeng/guns/core/tenant/params/TenantInfoParam.java

@ -3,6 +3,9 @@ package cn.stylefeng.guns.core.tenant.params;
import cn.stylefeng.guns.core.pojo.base.param.BaseParam;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
 * <p>
 * 租户表
@ -19,26 +22,31 @@ public class TenantInfoParam extends BaseParam {
    /**
     * 主键id
     */
    private Long tenantId;
    @NotNull(message = "id不能为空,请检查id参数", groups = {edit.class, delete.class, detail.class})
    private Long id;
    /**
     * 租户名称
     */
    @NotBlank(message = "租户名称不能为空,请检查name参数", groups = {add.class, edit.class})
    private String name;
    /**
     * 租户的编码
     */
    @NotBlank(message = "租户的编码不能为空,请检查code参数", groups = {add.class, edit.class})
    private String code;
    /**
     * 租户管理员账号
     */
    @NotBlank(message = "租户管理员账号不能为空,请检查adminUsername参数", groups = {add.class})
    private String adminUsername;
    /**
     * 租户管理员密码
     */
    @NotBlank(message = "租户管理员账号不能为空,请检查adminPassword参数", groups = {add.class})
    private String adminPassword;
}

+ 1 - 0
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/modular/auth/factory/LoginUserFactory.java

@ -122,6 +122,7 @@ public class LoginUserFactory {
                    Dict tenantInfo = Dict.create();
                    tenantInfo.set(TenantConstants.TENANT_CODE, tenantCode);
                    tenantInfo.set(TenantConstants.TENANT_DB_NAME, dataBaseName);
                    sysLoginUser.setTenants(tenantInfo);
                }
                //注意,这里remove不代表所有情况,在aop remove
                TenantCodeHolder.remove();