|
@@ -11,6 +11,7 @@ import com.dragonsoft.duceap.base.entity.security.BaseSecurityUser;
|
|
|
import com.dragonsoft.duceap.base.entity.security.SecurityUser;
|
|
|
import com.dragonsoft.duceap.commons.util.UrlMatcher;
|
|
|
import com.dragonsoft.duceap.commons.util.json.JsonUtils;
|
|
|
+import com.dragonsoft.duceap.commons.util.string.StringUtils;
|
|
|
import com.dragonsoft.duceap.security.jwt.SecurityUserCacheResolver;
|
|
|
import com.dragonsoft.duceap.security.jwt.securityaccess.SecurityAccessTokenProperties;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -99,9 +100,14 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
|
|
|
securityUser.setUserName(userInfo.getIdcard());
|
|
|
securityUser.setPoliceNo(userInfo.getPoliceNumber());
|
|
|
securityUser.setIdcard(userInfo.getIdcard());
|
|
|
- securityUser.setSecurityOrg(userInfo.getOrgCode());
|
|
|
securityUser.setSecurityOrgName(userInfo.getOrgName());
|
|
|
-
|
|
|
+ securityUser.setMobile(StringUtils.isBlank(userInfo.getMobileWork()) ? userInfo.getMobilePrivate() : userInfo.getMobileWork());
|
|
|
+ securityUser.setTelephone(userInfo.getPhone());
|
|
|
+ securityUser.setDeptId(userInfo.getOrgId());
|
|
|
+ securityUser.setCompanyCode(userInfo.getCompanyCode());
|
|
|
+ String[] orgCodes = new String[1];
|
|
|
+ orgCodes[0] = userInfo.getOrgCode();
|
|
|
+ securityUser.setSecurityOrgs(orgCodes);
|
|
|
//放入缓存
|
|
|
if (cacheResolver != null) {
|
|
|
cacheResolver.put(userToken, securityUser);
|