From ceee5a8d7ff4173efeb3412ec9a9b2939816b77c Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Thu, 4 Mar 2021 19:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E4=B8=AD=E9=97=B4=E4=BB=B6=E6=8B=A6=E6=88=AA=20=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E8=AF=AF=E6=93=8D=E4=BD=9C=E6=97=A0=E6=B3=95=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E5=88=9D=E5=A7=8B=E5=8C=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/router/sys_base.go |  3 ++-
 web/src/App.vue           | 10 +---------
 web/src/utils/request.js  | 11 +++++++++++
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/server/router/sys_base.go b/server/router/sys_base.go
index 20da80dc..da4159b8 100644
--- a/server/router/sys_base.go
+++ b/server/router/sys_base.go
@@ -2,11 +2,12 @@ package router
 
 import (
 	"gin-vue-admin/api/v1"
+	"gin-vue-admin/middleware"
 	"github.com/gin-gonic/gin"
 )
 
 func InitBaseRouter(Router *gin.RouterGroup) (R gin.IRoutes) {
-	BaseRouter := Router.Group("base")
+	BaseRouter := Router.Group("base").Use(middleware.NeedInit())
 	{
 		BaseRouter.POST("login", v1.Login)
 		BaseRouter.POST("captcha", v1.Captcha)
diff --git a/web/src/App.vue b/web/src/App.vue
index 252ddedf..356b6470 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -9,15 +9,7 @@ import { checkDB } from "@/api/initdb"
 export default {
   name: 'app',
   async created(){
-    const res = await checkDB()
-    if(res.code == 0 && res.data.needInit){
-      this.$message({
-        type:"info",
-        message:"您是第一次使用，请初始化"
-      })
-        this.$store.commit("user/NeedInit")
-        this.$router.push({name:"init"})
-    }
+    await checkDB()
   }  
 }
 </script>
diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index c92c4b76..576591dd 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -2,6 +2,8 @@ import axios from 'axios'; // 引入axios
 import { Message } from 'element-ui';
 import { store } from '@/store/index'
 import context from '@/main.js'
+import router from '@/router/index'
+
 const service = axios.create({
     baseURL: process.env.VUE_APP_BASE_API,
     timeout: 99999
@@ -59,10 +61,19 @@ service.interceptors.request.use(
 service.interceptors.response.use(
     response => {
         closeLoading()
+
         if (response.headers["new-token"]) {
             store.commit('user/setToken', response.headers["new-token"])
         }
         if (response.data.code == 0 || response.headers.success === "true") {
+            if(response.data.data.needInit){
+                Message({
+                    type:"info",
+                    message:"您是第一次使用，请初始化"
+                })
+                    store.commit("user/NeedInit")
+                    router.push({name:"init"})
+            }
             return response.data
         } else {
             Message({