Skip to content

D
dsk-cr20g
Commit e9ff696a authored by 施翔轲's avatar 施翔轲
Browse files
Options

三方平台跳转登录相关改造

parent 8e8fb36d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1704 additions and 1590 deletions
dsk-common/src/main/java/com/dsk/common/core/domain/model/ThirdPlatformLoginBody.java 0 → 100644
View file @ e9ff696a
package com.dsk.common.core.domain.model;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* 三方平台用户登录对象
*
* @author sxk
*/
@Data
public class ThirdPlatformLoginBody {
/**
* 三方平台跳转本系统所需秘钥
*/
@NotBlank(message = "桑芳平台登录秘钥不能为空")
private String thirdPlatformKey;
}
dsk-system/src/main/java/com/dsk/system/domain/SysUser.java
View file @ e9ff696a
package com.dsk.system.domain; package com.dsk.system.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.dsk.common.annotation.Sensitive; import com.dsk.common.annotation.Sensitive;
import com.dsk.common.constant.UserConstants; import com.dsk.common.constant.UserConstants;
import com.dsk.common.enums.SensitiveStrategy; import com.dsk.common.enums.SensitiveStrategy;
import com.dsk.common.tenant.core.TenantEntity; import com.dsk.common.tenant.core.TenantEntity;
import com.dsk.common.xss.Xss; import com.dsk.common.xss.Xss;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import javax.validation.constraints.Email; import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/** /**
* 用户对象 sys_user * 用户对象 sys_user
* *
* @author Lion Li * @author Lion Li
*/ */
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName("sys_user") @TableName("sys_user")
public class SysUser extends TenantEntity { public class SysUser extends TenantEntity {
/** /**
* 用户ID * 用户ID
*/ */
@TableId(value = "user_id") @TableId(value = "user_id")
private Long userId; private Long userId;
/** /**
* 部门ID * 三方平台跳转本系统所需秘钥
*/ */
private Long deptId; private String thirdPlatformKey;
/** /**
* 用户账号 * 部门ID
*/ */
@Xss(message = "用户账号不能包含脚本字符") private Long deptId;
@NotBlank(message = "用户账号不能为空")
@Size(min = 0, max = 30, message = "用户账号长度不能超过{max}个字符") /**
private String userName; * 用户账号
*/
/** @Xss(message = "用户账号不能包含脚本字符")
* 用户昵称 @NotBlank(message = "用户账号不能为空")
*/ @Size(min = 0, max = 30, message = "用户账号长度不能超过{max}个字符")
@Xss(message = "用户昵称不能包含脚本字符") private String userName;
@NotBlank(message = "用户昵称不能为空")
@Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符") /**
private String nickName; * 用户昵称
*/
/** @Xss(message = "用户昵称不能包含脚本字符")
* 用户类型（sys_user系统用户） @NotBlank(message = "用户昵称不能为空")
*/ @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
private String userType; private String nickName;
/** /**
* 用户邮箱 * 用户类型（sys_user系统用户）
*/ */
@Sensitive(strategy = SensitiveStrategy.EMAIL) private String userType;
@Email(message = "邮箱格式不正确")
@Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") /**
private String email; * 用户邮箱
*/
/** @Sensitive(strategy = SensitiveStrategy.EMAIL)
* 手机号码 @Email(message = "邮箱格式不正确")
*/ @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符")
@Sensitive(strategy = SensitiveStrategy.PHONE) private String email;
private String phonenumber;
/**
/** * 手机号码
* 用户性别 */
*/ @Sensitive(strategy = SensitiveStrategy.PHONE)
private String sex; private String phonenumber;
/** /**
* 用户头像 * 用户性别
*/ */
private String avatar; private String sex;
/** /**
* 密码 * 用户头像
*/ */
@TableField( private String avatar;
insertStrategy = FieldStrategy.NOT_EMPTY,
updateStrategy = FieldStrategy.NOT_EMPTY, /**
whereStrategy = FieldStrategy.NOT_EMPTY * 密码
) */
private String password; @TableField(
insertStrategy = FieldStrategy.NOT_EMPTY,
@JsonIgnore updateStrategy = FieldStrategy.NOT_EMPTY,
@JsonProperty whereStrategy = FieldStrategy.NOT_EMPTY
public String getPassword() { )
return password; private String password;
}
@JsonIgnore
/** @JsonProperty
* 帐号状态（0正常 1停用） public String getPassword() {
*/ return password;
private String status; }
/** /**
* 删除标志（0代表存在 2代表删除） * 帐号状态（0正常 1停用）
*/ */
@TableLogic private String status;
private String delFlag;
/**
/** * 删除标志（0代表存在 2代表删除）
* 最后登录IP */
*/ @TableLogic
private String loginIp; private String delFlag;
/** /**
* 最后登录时间 * 最后登录IP
*/ */
private Date loginDate; private String loginIp;
/** /**
* 备注 * 最后登录时间
*/ */
private String remark; private Date loginDate;
/** /**
* 创建时间 * 备注
*/ */
private Date createTime; private String remark;
/** /**
* 部门对象 * 创建时间
*/ */
@TableField(exist = false) private Date createTime;
private SysDept dept;
/**
/** * 部门对象
* 角色对象 */
*/ @TableField(exist = false)
@TableField(exist = false) private SysDept dept;
private List<SysRole> roles;
/**
/** * 角色对象
* 角色组 */
*/ @TableField(exist = false)
@TableField(exist = false) private List<SysRole> roles;
private Long[] roleIds;
/**
/** * 角色组
* 岗位组 */
*/ @TableField(exist = false)
@TableField(exist = false) private Long[] roleIds;
private Long[] postIds;
/**
/** * 岗位组
* 数据权限 当前角色ID */
*/ @TableField(exist = false)
@TableField(exist = false) private Long[] postIds;
private Long roleId;
/**
* 数据权限 当前角色ID
public SysUser(Long userId) { */
this.userId = userId; @TableField(exist = false)
} private Long roleId;
public boolean isAdmin() {
return UserConstants.ADMIN_ID.equals(this.userId); public SysUser(Long userId) {
} this.userId = userId;
}
public boolean isSuperAdmin() {
return UserConstants.SUPER_ADMIN_ID.equals(this.userId); public boolean isAdmin() {
} return UserConstants.ADMIN_ID.equals(this.userId);
}
}
public boolean isSuperAdmin() {
return UserConstants.SUPER_ADMIN_ID.equals(this.userId);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment