From 5a85e0c29fe837b5900312fe5fae68f432408fa3 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Wed, 14 Dec 2022 15:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/adc/da/login/util/CommonUtils.java    | 29 +++++++++----------
 1 file changed, 13 insertions(+), 16 deletions(-)

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<RoleEO> getRoleList() throws Exception {