用户信息调整

kn-sys-manager/src/main/java/org/springblade/auth/service/BladeUserDetails.java

@@ -20,6 +20,9 @@ public class BladeUserDetails extends User {
 	 */
 	private final Long userId;
 
+	/**
+	 * 邮箱
+	 */
 	private final String email;
 
 	/**
@@ -43,14 +46,6 @@ public class BladeUserDetails extends User {
 	 * 账号
 	 */
 	private final String account;
-	/**
-	 * 部门id
-	 */
-	private final String deptId;
-	/**
-	 * 岗位id
-	 */
-	private final String postId;
 	/**
 	 * 角色id
 	 */
@@ -70,7 +65,7 @@ public class BladeUserDetails extends User {
 
 	public BladeUserDetails(Long userId, String email,
 							String tenantId, String oauthId, String name,
-							String realName, String deptId, String postId, String roleId,
+							String realName, String roleId,
 							String roleName, String avatar, String username, String password, Kv detail,
 							boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired,
 							boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
@@ -82,8 +77,6 @@ public class BladeUserDetails extends User {
 		this.name = name;
 		this.realName = realName;
 		this.account = username;
-		this.deptId = deptId;
-		this.postId = postId;
 		this.roleId = roleId;
 		this.roleName = roleName;
 		this.avatar = avatar;

kn-sys-manager/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -1,7 +1,5 @@
 package org.springblade.auth.service;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.lang.StringUtils;
@@ -46,7 +44,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 	public BladeUserDetails loadUserByUsername(String username) {
 		HttpServletRequest request = WebUtil.getRequest();
 		// 获取用户绑定ID
-		String headerDept = request.getHeader(TokenUtil.DEPT_HEADER_KEY);
+		//String headerDept = request.getHeader(TokenUtil.DEPT_HEADER_KEY);
 		String headerRole = request.getHeader(TokenUtil.ROLE_HEADER_KEY);
 		// 获取租户ID
 		String headerTenant = request.getHeader(TokenUtil.TENANT_HEADER_KEY);
@@ -66,7 +64,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 		}
 
 		// 获取用户类型
-		String userType = Func.toStr(request.getHeader(TokenUtil.USER_TYPE_HEADER_KEY), TokenUtil.DEFAULT_USER_TYPE);
+		//String userType = Func.toStr(request.getHeader(TokenUtil.USER_TYPE_HEADER_KEY), TokenUtil.DEFAULT_USER_TYPE);
 
 		// 远程调用返回数据
 		UserInfo userInfo = UserCache.getUser(tenantId, username);
@@ -93,7 +91,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 			user.setRoleId(headerRole);
 		}
 		return new BladeUserDetails(user.getId(), user.getEmail(),
-			user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
+			user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
 			username, AuthConstant.ENCRYPT + user.getPassword(), userInfo.getDetail(), true, true, true, true,
 			AuthorityUtils.commaSeparatedStringToAuthorityList(Func.join(userInfo.getRoles())));
 	}

kn-sys-manager/src/main/java/org/springblade/auth/system/entity/User.java

@@ -62,9 +62,9 @@ public class User extends TenantEntity {
 	private String realName;
 
 	/**
-	 * 用户身份证号
+	 * 用户组织机构
 	 */
-	private String idCard;
+	private String organization;
 
 	/**
 	 * 头像
@@ -78,25 +78,9 @@ public class User extends TenantEntity {
 	 * 手机
 	 */
 	private String phone;
-	/**
-	 * 生日
-	 */
-	private Date birthday;
-	/**
-	 * 性别
-	 */
-	private Integer sex;
 	/**
 	 * 角色id
 	 */
 	private String roleId;
-	/**
-	 * 部门id
-	 */
-	private String deptId;
-	/**
-	 * 岗位id
-	 */
-	private String postId;
 
 }

kn-sys-manager/src/main/java/org/springblade/auth/system/mapper/UserMapper.xml

@@ -14,22 +14,18 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="code" property="code"/>
         <result column="user_type" property="userType"/>
-        <result column="id_card" property="idCard"/>
+        <result column="organization" property="organization"/>
         <result column="account" property="account"/>
         <result column="password" property="password"/>
         <result column="name" property="name"/>
         <result column="real_name" property="realName"/>
         <result column="email" property="email"/>
         <result column="phone" property="phone"/>
-        <result column="birthday" property="birthday"/>
-        <result column="sex" property="sex"/>
         <result column="role_id" property="roleId"/>
-        <result column="dept_id" property="deptId"/>
-        <result column="post_id" property="postId"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,tenant_id,code,user_type,id_card,account,password,name,real_name,email,phone,birthday,sex,role_id,dept_id,post_id,
+        id,tenant_id,code,user_type,organization,account,password,name,real_name,email,phone,role_id,
         create_user,create_dept,create_time,update_user,update_time,status,is_deleted
     </sql>
 

kn-sys-manager/src/main/java/org/springblade/auth/utils/TokenUtil.java

@@ -57,18 +57,18 @@ public class TokenUtil {
 	public final static String MOBILE_HEADER_CODE = "Mobile-Code";
 	public final static String CAPTCHA_HEADER_KEY = "Captcha-Key";
 	public final static String CAPTCHA_HEADER_CODE = "Captcha-Code";
-	public final static String CAPTCHA_NOT_CORRECT = "验证码不正确";
+	public final static String CAPTCHA_NOT_CORRECT = "Incorrect verification code";
 	public final static String TENANT_HEADER_KEY = "Tenant-Id";
 	public final static String TENANT_PARAM_KEY = "tenant_id";
 	public final static String DEFAULT_TENANT_ID = "000000";
 	public final static String TENANT_NOT_FOUND = "租户ID未找到";
 	public final static String USER_TYPE_HEADER_KEY = "User-Type";
 	public final static String DEFAULT_USER_TYPE = "web";
-	public final static String USER_NOT_FOUND = "用户名或密码错误";
+	public final static String USER_NOT_FOUND = "Incorrect username or password";
-	public final static String USER_HAS_NO_ROLE = "未获得用户的角色信息";
+	public final static String USER_HAS_NO_ROLE = "Unable to obtain user's role information";
 	public final static String USER_HAS_NO_TENANT = "未获得用户的租户信息";
 	public final static String USER_HAS_NO_TENANT_PERMISSION = "租户授权已过期,请联系管理员";
-	public final static String USER_HAS_TOO_MANY_FAILS = "登录错误次数过多,请稍后再试";
+	public final static String USER_HAS_TOO_MANY_FAILS = "Too many login errors. Please try again later";
 	public final static String HEADER_KEY = "Authorization";
 	public final static String HEADER_PREFIX = "Basic ";
 	public final static String DEFAULT_AVATAR = "";