diff --git a/adc-da-login/src/main/java/com/adc/da/login/util/CommonUtils.java b/adc-da-login/src/main/java/com/adc/da/login/util/CommonUtils.java index e834ff7..7cd4cfa 100644 --- a/adc-da-login/src/main/java/com/adc/da/login/util/CommonUtils.java +++ b/adc-da-login/src/main/java/com/adc/da/login/util/CommonUtils.java @@ -50,23 +50,20 @@ public class CommonUtils { } public static String getUserId() { -// String userId = null; -// try { -// Subject subject = SecurityUtils.getSubject(); -// MyPrincipal principal = (MyPrincipal) subject.getPrincipal(); -// if (principal != null) { -// userId = principal.getId(); -// } -// } catch (UnavailableSecurityManagerException e) { -// log.error("getUserId UnavailableSecurityManagerException", e); -// } catch (InvalidSessionException e) { -// log.error("getUserId InvalidSessionException", e); -// -// } -// return userId; -// return "BKS7G52TVR";//拆解管理员 + String userId = null; + try { + Subject subject = SecurityUtils.getSubject(); + MyPrincipal principal = (MyPrincipal) subject.getPrincipal(); + if (principal != null) { + userId = principal.getId(); + } + } catch (UnavailableSecurityManagerException e) { + log.error("getUserId UnavailableSecurityManagerException", e); + } catch (InvalidSessionException e) { + log.error("getUserId InvalidSessionException", e); - return "ZGGJP3N7FT"; + } + return userId; } public static List getRoleList() throws Exception {