FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 合并分支

Browse Source
This commit is contained in:
yinglong zhang
2021-06-24 17:39:01 +08:00
parent 1398f34c1e d957107510
commit 31ee78f374
41 changed files with 3312 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-base/src/main/java/com/adc/da/util/LoginUserUtil.java
+8 -10
View File
@@ -15,17 +15,15 @@ public class LoginUserUtil {
*
*/
public static String getUserId() {
String userId = "WY8J26MH23";
String userId = null;
try {
if(!StringUtils.isNotBlank(userId)){
Subject subject = SecurityUtils.getSubject();
Object object=subject.getPrincipal();
if(object!=null){
String json = JSONObject.toJSONString(object);
if(json!=null && json.length()>0){
Map<String, Object> userInfo=JSONObject.parseObject(json, Map.class);
userId=userInfo.get("id").toString();
}
Subject subject = SecurityUtils.getSubject();
Object object=subject.getPrincipal();
if(object!=null){
String json = JSONObject.toJSONString(object);
if(json!=null && json.length()>0){
Map<String, Object> userInfo=JSONObject.parseObject(json, Map.class);
userId=userInfo.get("id").toString();
}
}
} catch (UnavailableSecurityManagerException e) {