wangli/axzo-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'addDevice' into 'master'

Browse Source 
loginDevice 字段已经被消费了所以这里需要新创建一个字段 用来设置登录端

See merge request universal/framework/backend/axzo-framework!6
This commit is contained in:
谭杰 2023-08-16 10:15:48 +00:00
commit 137cbaf055
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/SystemAndDeviceInfo.java
View File

@ -15,6 +15,11 @@ public class SystemAndDeviceInfo {
private String deviceNo; private String deviceNo;
/**
* 登录的端
*/
private String device;
private String appVersion; private String appVersion;
private String ipAddress; private String ipAddress;

2
axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/service/ContextInfoBuilderAspect.java
View File

@ -317,6 +317,8 @@ public class ContextInfoBuilderAspect {
try { try {
fillLegacyGuess(contextInfo, userinfoMap); fillLegacyGuess(contextInfo, userinfoMap);
contextInfo.getSystemAndDeviceInfo().setLoginDevice(contextInfo.getTerminalInfo().getSimpleTerminal()); contextInfo.getSystemAndDeviceInfo().setLoginDevice(contextInfo.getTerminalInfo().getSimpleTerminal());
// loginDevice 字段已经被消费了所以这里需要新创建一个字段 用来设置登录端
contextInfo.getSystemAndDeviceInfo().setDevice((String) userinfoMap.get("loginDevice"));
} catch (Exception e) { } catch (Exception e) {
log.warn("fill legacy guess error for user identityId=" + userInfo.getIdentityId(), e); log.warn("fill legacy guess error for user identityId=" + userInfo.getIdentityId(), e);
} }