From a5ebc5862cfbf1ff1c52cd5a36908c2e3f1c6682 Mon Sep 17 00:00:00 2001
From: wubijie <wubijie@kylinos.cn>
Date: Tue, 15 Nov 2022 14:42:13 +0800
Subject: [PATCH] Modify the interface definition

---
 pkg/app/server/initialization/router.go | 22 +++++++++++-----------
 vue/request/request.js                  |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkg/app/server/initialization/router.go b/pkg/app/server/initialization/router.go
index 6b85ab1a..3ebd8115 100644
--- a/pkg/app/server/initialization/router.go
+++ b/pkg/app/server/initialization/router.go
@@ -33,13 +33,13 @@ func SetupRouter() *gin.Engine {
 	// TODO: 此处绑定 http api handler
 	api := router.Group("/api/v1")
 
-	overview := router.Group("/overview")
+	overview := api.Group("/overview")
 	{
 		overview.GET("/info", controller.ClusterInfoHandler)
 		overview.GET("/depart_info", controller.DepartClusterInfoHandler)
 	}
 
-	macList := router.Group("cluster/macList")
+	macList := api.Group("cluster/macList")
 	{
 		macList.POST("/script_save", controller.AddScriptHandler)
 		macList.POST("/deletemachine", controller.DeleteMachineHandler)
@@ -51,7 +51,7 @@ func SetupRouter() *gin.Engine {
 		macList.GET("/sourcepool", controller.FreeMachineSource)
 	}
 
-	macDetails := router.Group("cluster/macList/api")
+	macDetails := api.Group("cluster/macList/api")
 	{
 		macDetails.GET("/agent_info", agentcontroller.AgentInfoHandler)
 		macDetails.GET("/agent_list", agentcontroller.AgentListHandler)
@@ -81,7 +81,7 @@ func SetupRouter() *gin.Engine {
 		macDetails.GET("/net", agentcontroller.GetAgentNetworkConnect)
 	}
 
-	macBasicModify := router.Group("cluster/macList/agent")
+	macBasicModify := api.Group("cluster/macList/agent")
 	{
 		macBasicModify.GET("/sysctl_change", agentcontroller.SysctlChangeHandler)
 		macBasicModify.POST("/service_stop", agentcontroller.ServiceStopHandler)
@@ -114,7 +114,7 @@ func SetupRouter() *gin.Engine {
 		macBasicModify.POST("/network", agentcontroller.ConfigNetworkConnect)
 	}
 
-	monitor := router.Group("prometheus")
+	monitor := api.Group("prometheus")
 	{
 		monitor.GET("/queryrange", controller.QueryRange)
 		monitor.GET("/query", controller.Query)
@@ -122,13 +122,13 @@ func SetupRouter() *gin.Engine {
 		monitor.POST("/alertmanager", controller.AlertMessageConfigHandler)
 	}
 
-	batchmanager := router.Group("batchmanager")
+	batchmanager := api.Group("batchmanager")
 	{
 		batchmanager.GET("/batchinfo", controller.BatchInfoHandler)
 		batchmanager.GET("/batchmachineinfo", controller.BatchMachineInfoHandler)
 	}
 
-	user := router.Group("user")
+	user := api.Group("user")
 	{
 		user.POST("/login", controller.LoginHandler)
 		user.GET("/logout", controller.Logout)
@@ -144,7 +144,7 @@ func SetupRouter() *gin.Engine {
 		user.POST("/roleChange", controller.RolePermissionChangeHandler)
 	}
 
-	configmanager := router.Group("config")
+	configmanager := api.Group("config")
 	{
 		configmanager.GET("/read_file", agentcontroller.ReadFile)
 		configmanager.POST("/fileSaveAdd", controller.SaveFileToDatabaseHandler)
@@ -157,7 +157,7 @@ func SetupRouter() *gin.Engine {
 		configmanager.POST("/file_broadcast", agentcontroller.FileBroadcastToAgents)
 	}
 
-	userLog := router.Group("log")
+	userLog := api.Group("log")
 	{
 		userLog.GET("/log_all", controller.LogAllHandler)
 		userLog.GET("/logs", controller.AgentLogsHandler)
@@ -165,14 +165,14 @@ func SetupRouter() *gin.Engine {
 	}
 
 	// 此处绑定casbin过滤规则
-	policy := router.Group("casbin")
+	policy := api.Group("casbin")
 	{
 		policy.GET("/get", controller.GetPolicy)
 		policy.POST("/delete", controller.PolicyDelete)
 		policy.POST("/add", controller.PolicyAdd)
 	}
 
-	Level := router.Group("")
+	Level := api.Group("")
 	Level.Use(middleware.CasbinHandler())
 	{
 		user.POST("/register", controller.RegisterHandler)
diff --git a/vue/request/request.js b/vue/request/request.js
index 97a49b82..bc4895b6 100644
--- a/vue/request/request.js
+++ b/vue/request/request.js
@@ -20,7 +20,7 @@ import { getToken } from '@/utils/auth'
 
 // 1.创建axios实例
 const request = axios.create({
-  baseURL: '',
+  baseURL: '/api/v1',
   timeOut: 5000
 })
 
-- 
Gitee