From 1f45bda6b036e4641e8f434f3d7f02e3ea1637f5 Mon Sep 17 00:00:00 2001
From: "wangkangit@163.com" <wk19890105wk>
Date: Thu, 22 Apr 2021 20:40:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/config/dev.env.js                                |  2 +-
 admin/config/prod.env.js                               |  2 +-
 admin/config/test.env.js                               |  2 +-
 .../java/org/itkk/udf/api/page/web/HomeController.java | 10 ++++++++++
 .../src/main/resources/templates/common.html           |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/admin/config/dev.env.js b/admin/config/dev.env.js
index 9abbb04..b8bb666 100644
--- a/admin/config/dev.env.js
+++ b/admin/config/dev.env.js
@@ -6,5 +6,5 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   VUE_APP_TITLE: '"ITKK控制台"',
   VUE_APP_BASE_URL:'"/"',
-  VUE_APP_ADMIN_BASE_URL:'"/admin"'
+  VUE_APP_ADMIN_BASE_URL:'"/admin/"'
 })
diff --git a/admin/config/prod.env.js b/admin/config/prod.env.js
index 2371305..a858867 100644
--- a/admin/config/prod.env.js
+++ b/admin/config/prod.env.js
@@ -3,5 +3,5 @@ module.exports = {
   NODE_ENV: '"production"',
   VUE_APP_TITLE: '"ITKK控制台"',
   VUE_APP_BASE_URL:'"/"',
-  VUE_APP_ADMIN_BASE_URL:'"/admin"'
+  VUE_APP_ADMIN_BASE_URL:'"/admin/"'
 }
diff --git a/admin/config/test.env.js b/admin/config/test.env.js
index 3fcf220..5d48125 100644
--- a/admin/config/test.env.js
+++ b/admin/config/test.env.js
@@ -6,5 +6,5 @@ module.exports = merge(devEnv, {
   NODE_ENV: '"testing"',
   VUE_APP_TITLE: '"ITKK控制台"',
   VUE_APP_BASE_URL:'"/"',
-  VUE_APP_ADMIN_BASE_URL:'"/admin"'
+  VUE_APP_ADMIN_BASE_URL:'"/admin/"'
 })
diff --git a/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/web/HomeController.java b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/web/HomeController.java
index 8510b7d..da4417a 100644
--- a/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/web/HomeController.java
+++ b/udf-api/udf-api-page/src/main/java/org/itkk/udf/api/page/web/HomeController.java
@@ -55,4 +55,14 @@ public class HomeController {
         }
         return "login";
     }
+
+    /**
+     * 跳转/admin/
+     *
+     * @return String
+     */
+    @GetMapping("/admin")
+    public String admin() {
+        return "redirect:/admin/";
+    }
 }
diff --git a/udf-api/udf-api-server/src/main/resources/templates/common.html b/udf-api/udf-api-server/src/main/resources/templates/common.html
index b509d87..3e26946 100644
--- a/udf-api/udf-api-server/src/main/resources/templates/common.html
+++ b/udf-api/udf-api-server/src/main/resources/templates/common.html
@@ -568,7 +568,7 @@
             //头像按钮点击事件
             $('.header-right-bar-user-div').on('click', function () {
                 //跳转控制台
-                window.location.href = '/admin';
+                window.location.href = '/admin/';
             });
         });
         //设置(全局)的AJAX请求默认选项