:heavy_plus_sign: 令牌新增针对用户平台的判断逻辑

src/main/java/org/springblade/common/enums/DictEnum.java

@@ -84,6 +84,10 @@ public enum DictEnum {
 	 * 行政区划
 	 */
 	REGION("region"),
+	/**
+	 * 用户平台
+	 */
+	USER_TYPE("user_type"),
 	;
 
 	final String name;

src/main/java/org/springblade/modules/auth/enums/BladeUserEnum.java → src/main/java/org/springblade/modules/auth/enums/UserEnum.java

@@ -26,7 +26,7 @@ import lombok.Getter;
  */
 @Getter
 @AllArgsConstructor
-public enum BladeUserEnum {
+public enum UserEnum {
 
 	/**
 	 * web
@@ -37,6 +37,11 @@ public enum BladeUserEnum {
 	 * app
 	 */
 	APP("app", 2),
+
+	/**
+	 * other
+	 */
+	OTHER("other", 3),
 	;
 
 	final String name;

src/main/java/org/springblade/modules/auth/granter/CaptchaTokenGranter.java

@@ -24,7 +24,7 @@ import org.springblade.core.tool.utils.DigestUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.core.tool.utils.WebUtil;
-import org.springblade.modules.auth.enums.BladeUserEnum;
+import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.auth.provider.ITokenGranter;
 import org.springblade.modules.auth.provider.TokenParameter;
 import org.springblade.modules.auth.utils.TokenUtil;
@@ -77,12 +77,12 @@ public class CaptchaTokenGranter implements ITokenGranter {
 			// 获取用户类型
 			String userType = tokenParameter.getArgs().getStr("userType");
 			// 根据不同用户类型调用对应的接口返回数据，用户可自行拓展
-			if (userType.equals(BladeUserEnum.WEB.getName())) {
-				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password));
-			} else if (userType.equals(BladeUserEnum.APP.getName())) {
-				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password));
+			if (userType.equals(UserEnum.WEB.getName())) {
+				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password), UserEnum.WEB);
+			} else if (userType.equals(UserEnum.APP.getName())) {
+				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password), UserEnum.APP);
 			} else {
-				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password));
+				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password), UserEnum.OTHER);
 			}
 		}
 		return userInfo;

src/main/java/org/springblade/modules/auth/granter/PasswordTokenGranter.java

@@ -20,7 +20,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.tool.utils.DigestUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.auth.enums.BladeUserEnum;
+import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.auth.provider.ITokenGranter;
 import org.springblade.modules.auth.provider.TokenParameter;
 import org.springblade.modules.auth.utils.TokenUtil;
@@ -59,12 +59,12 @@ public class PasswordTokenGranter implements ITokenGranter {
 			// 获取用户类型
 			String userType = tokenParameter.getArgs().getStr("userType");
 			// 根据不同用户类型调用对应的接口返回数据，用户可自行拓展
-			if (userType.equals(BladeUserEnum.WEB.getName())) {
-				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password));
-			} else if (userType.equals(BladeUserEnum.APP.getName())) {
-				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password));
+			if (userType.equals(UserEnum.WEB.getName())) {
+				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password), UserEnum.WEB);
+			} else if (userType.equals(UserEnum.APP.getName())) {
+				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password), UserEnum.APP);
 			} else {
-				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password));
+				userInfo = userService.userInfo(tenantId, username, DigestUtil.hex(password), UserEnum.OTHER);
 			}
 		}
 		return userInfo;

src/main/java/org/springblade/modules/auth/utils/TokenUtil.java

@@ -81,7 +81,7 @@ public class TokenUtil {
 		Kv authInfo = Kv.create();
 		User user = userInfo.getUser();
 		//设置jwt参数
-		Map<String, String> param = new HashMap<>(16);
+		Map<String, Object> param = new HashMap<>(16);
 		param.put(TokenConstant.TOKEN_TYPE, TokenConstant.ACCESS_TOKEN);
 		param.put(TokenConstant.TENANT_ID, user.getTenantId());
 		param.put(TokenConstant.USER_ID, Func.toStr(user.getId()));
@@ -93,6 +93,7 @@ public class TokenUtil {
 		param.put(TokenConstant.USER_NAME, user.getAccount());
 		param.put(TokenConstant.NICK_NAME, user.getRealName());
 		param.put(TokenConstant.ROLE_NAME, Func.join(userInfo.getRoles()));
+		param.put(TokenConstant.DETAIL, userInfo.getDetail());
 
 		//拼装accessToken
 		try {
@@ -113,6 +114,7 @@ public class TokenUtil {
 				.set(TokenConstant.REFRESH_TOKEN, createRefreshToken(userInfo).getToken())
 				.set(TokenConstant.TOKEN_TYPE, TokenConstant.BEARER)
 				.set(TokenConstant.EXPIRES_IN, accessToken.getExpire())
+				.set(TokenConstant.DETAIL, userInfo.getDetail())
 				.set(TokenConstant.LICENSE, TokenConstant.LICENSE_NAME);
 		} catch (Exception ex) {
 			return authInfo.set("error_code", HttpServletResponse.SC_UNAUTHORIZED).set("error_description", ex.getMessage());
@@ -127,7 +129,7 @@ public class TokenUtil {
 	 */
 	private static TokenInfo createRefreshToken(UserInfo userInfo) {
 		User user = userInfo.getUser();
-		Map<String, String> param = new HashMap<>(16);
+		Map<String, Object> param = new HashMap<>(16);
 		param.put(TokenConstant.TOKEN_TYPE, TokenConstant.REFRESH_TOKEN);
 		param.put(TokenConstant.USER_ID, Func.toStr(user.getId()));
 		return SecureUtil.createJWT(param, "audience", "issuser", TokenConstant.REFRESH_TOKEN);

src/main/java/org/springblade/modules/system/entity/User.java

@@ -39,6 +39,10 @@ public class User extends TenantEntity {
 	 * 用户编号
 	 */
 	private String code;
+	/**
+	 * 用户平台
+	 */
+	private Integer userType;
 	/**
 	 * 账号
 	 */

src/main/java/org/springblade/modules/system/entity/UserInfo.java

@@ -19,6 +19,7 @@ package org.springblade.modules.system.entity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springblade.core.tool.support.Kv;
 
 import java.io.Serializable;
 import java.util.List;
@@ -40,6 +41,12 @@ public class UserInfo implements Serializable {
 	@ApiModelProperty(value = "用户")
 	private User user;
 
+	/**
+	 * 拓展信息
+	 */
+	@ApiModelProperty(value = "拓展信息")
+	private Kv detail;
+
 	/**
 	 * 权限标识集合
 	 */

src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -12,6 +12,8 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="code" property="code"/>
+        <result column="user_type" property="userType"/>
         <result column="account" property="account"/>
         <result column="password" property="password"/>
         <result column="name" property="name"/>
@@ -25,18 +27,6 @@
         <result column="post_id" property="postId"/>
     </resultMap>
 
-    <!-- 通用查询结果列 -->
-    <sql id="baseColumnList">
-        select id,
-        create_user AS createUser,
-        create_time AS createTime,
-        update_user AS updateUser,
-        update_time AS updateTime,
-        status,
-        is_deleted AS isDeleted,
-        account, password, name, real_name, email, phone, birthday, sex, role_id, dept_id
-    </sql>
-
     <select id="selectUserPage" resultMap="userResultMap">
         select * from blade_user where is_deleted = 0
         <if test="tenantId!=null and tenantId != ''">

src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -20,6 +20,7 @@ package org.springblade.modules.system.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
 import org.springblade.modules.system.entity.UserOauth;
@@ -96,6 +97,17 @@ public interface IUserService extends BaseService<User> {
 	 */
 	UserInfo userInfo(String tenantId, String account, String password);
 
+	/**
+	 * 用户信息
+	 *
+	 * @param tenantId
+	 * @param account
+	 * @param password
+	 * @param userEnum
+	 * @return
+	 */
+	UserInfo userInfo(String tenantId, String account, String password, UserEnum userEnum);
+
 	/**
 	 * 用户信息
 	 *

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -33,7 +33,9 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.BladeTenantProperties;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.jackson.JsonUtil;
+import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.*;
+import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.system.entity.*;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.mapper.UserMapper;
@@ -154,13 +156,31 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		return buildUserInfo(user);
 	}
 
+	@Override
+	public UserInfo userInfo(String tenantId, String account, String password, UserEnum userEnum) {
+		User user = baseMapper.getUser(tenantId, account, password);
+		return buildUserInfo(user, userEnum);
+	}
+
 	private UserInfo buildUserInfo(User user) {
+		return buildUserInfo(user, UserEnum.WEB);
+	}
+
+	private UserInfo buildUserInfo(User user, UserEnum userEnum) {
 		UserInfo userInfo = new UserInfo();
 		userInfo.setUser(user);
 		if (Func.isNotEmpty(user)) {
 			List<String> roleAlias = roleService.getRoleAliases(user.getRoleId());
 			userInfo.setRoles(roleAlias);
 		}
+		// 根据每个用户平台，建立对应的detail表，通过查询将结果集写入到detail字段
+		if (userEnum == UserEnum.WEB) {
+			userInfo.setDetail(Kv.create().set("type", userEnum.getName()));
+		} else if (userEnum == UserEnum.APP) {
+			userInfo.setDetail(Kv.create().set("type", userEnum.getName()));
+		} else {
+			userInfo.setDetail(Kv.create().set("type", userEnum.getName()));
+		}
 		return userInfo;
 	}
 

src/main/java/org/springblade/modules/system/vo/UserVO.java

@@ -52,6 +52,11 @@ public class UserVO extends User {
 	 */
 	private String tenantName;
 
+	/**
+	 * 用户平台名
+	 */
+	private String userTypeName;
+
 	/**
 	 * 角色名
 	 */

src/main/java/org/springblade/modules/system/wrapper/UserWrapper.java

@@ -51,7 +51,8 @@ public class UserWrapper extends BaseEntityWrapper<User, UserVO> {
 		userVO.setRoleName(Func.join(roleName));
 		userVO.setDeptName(Func.join(deptName));
 		userVO.setPostName(Func.join(postName));
-		userVO.setSexName(DictCache.getValue(DictEnum.SEX, Func.toInt(user.getSex())));
+		userVO.setSexName(DictCache.getValue(DictEnum.SEX, user.getSex()));
+		userVO.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
 		return userVO;
 	}