From be5c3ba43f6b741c55bae31853fd9f967fc7570f Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Mon, 17 Apr 2023 15:05:05 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5a85e0c29fe837b5900312fe5fae68f432408fa3.
---
 .../com/adc/da/login/util/CommonUtils.java    | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 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 7cd4cfa..e834ff7 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,20 +50,23 @@ 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);
+//        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";//拆解管理员
 
-        }
-        return userId;
+        return  "ZGGJP3N7FT";
     }
 
     public static List<RoleEO> getRoleList() throws Exception {