From 57ac6c49858968e53a358b4f1157ea0bc98fe6dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8D=A3=E7=87=8A?= <757230079@qq.com>
Date: Tue, 12 Oct 2021 19:21:02 +0800
Subject: [PATCH] For 830

---
 .../dubbo/admin/DubboAdminApplication.java    |  4 +-
 .../authentication/impl/DefaultPreHandle.java |  7 ++--
 .../admin/controller/UserController.java      |  2 +
 .../dubbo/admin/utils/SpringBeanUtils.java    | 41 +++++++++++++++++++
 4 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 dubbo-admin-server/src/main/java/org/apache/dubbo/admin/utils/SpringBeanUtils.java

diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/DubboAdminApplication.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/DubboAdminApplication.java
index 4f73eae9b..ea63df8b7 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/DubboAdminApplication.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/DubboAdminApplication.java
@@ -17,6 +17,8 @@
 
 package org.apache.dubbo.admin;
 
+import org.apache.dubbo.admin.utils.SpringBeanUtils;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -28,6 +30,6 @@
 public class DubboAdminApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(DubboAdminApplication.class, args);
+		SpringBeanUtils.applicationContext = SpringApplication.run(DubboAdminApplication.class, args);
 	}
 }
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/authentication/impl/DefaultPreHandle.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/authentication/impl/DefaultPreHandle.java
index f9e4e0761..d66fd1f9e 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/authentication/impl/DefaultPreHandle.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/authentication/impl/DefaultPreHandle.java
@@ -21,8 +21,8 @@
 import org.apache.dubbo.admin.authentication.InterceptorAuthentication;
 import org.apache.dubbo.admin.interceptor.AuthInterceptor;
 import org.apache.dubbo.admin.utils.JwtTokenUtil;
+import org.apache.dubbo.admin.utils.SpringBeanUtils;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.method.HandlerMethod;
 
@@ -30,10 +30,9 @@
 import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
 
-
 public class DefaultPreHandle implements InterceptorAuthentication {
-    @Autowired
-    private JwtTokenUtil jwtTokenUtil;
+
+    private JwtTokenUtil jwtTokenUtil = SpringBeanUtils.getBean(JwtTokenUtil.class);
 
     @Override
     public boolean authentication(HttpServletRequest request, HttpServletResponse response, Object handler) {
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/UserController.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/UserController.java
index 96f33917b..9a10dfdf5 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/UserController.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/controller/UserController.java
@@ -56,6 +56,8 @@ public String login(HttpServletRequest httpServletRequest, HttpServletResponse r
         if (iterator != null && !iterator.hasNext()) {
             if (StringUtils.isBlank(rootUserName) || (rootUserName.equals(userName) && rootUserPassword.equals(password))) {
                 return jwtTokenUtil.generateToken(userName);
+            } else {
+                flag = false;
             }
         }
         while (iterator.hasNext()) {
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/utils/SpringBeanUtils.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/utils/SpringBeanUtils.java
new file mode 100644
index 000000000..9ec498e1b
--- /dev/null
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/utils/SpringBeanUtils.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.admin.utils;
+
+import org.springframework.context.ApplicationContext;
+
+
+/**
+ * get spring bean tool class.
+ */
+public class SpringBeanUtils {
+    /**
+     * spring applicationContext
+     */
+    public static ApplicationContext applicationContext;
+
+    /**
+     * get spring bean
+     *
+     * @return spring bean
+     * @param c
+     */
+    public static <T> T getBean(Class<T> c){
+        return applicationContext.getBean(c);
+    }
+}