From 1838e73b271d38defcd092e2448e95f8e664a585 Mon Sep 17 00:00:00 2001
From: wubijie <wubijie@kylinos.cn>
Date: Wed, 27 Mar 2024 17:39:17 +0800
Subject: [PATCH] Add batch_create interface permissions

---
 frontend/src/request/batch.ts         | 2 +-
 src/app/server/network/httpserver.go  | 4 ++--
 src/app/server/service/auth/casbin.go | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/frontend/src/request/batch.ts b/frontend/src/request/batch.ts
index e9bd3884..f4b28b5b 100644
--- a/frontend/src/request/batch.ts
+++ b/frontend/src/request/batch.ts
@@ -30,7 +30,7 @@ export function deleteBatch(data: any) {
 // 创建批次
 export function createBatch(data: any) {
     return request({
-        url: 'macList/createbatch',
+        url: 'batchmanager/createbatch',
         method: 'post',
         data
     })
diff --git a/src/app/server/network/httpserver.go b/src/app/server/network/httpserver.go
index f41e0da6..a1b97308 100644
--- a/src/app/server/network/httpserver.go
+++ b/src/app/server/network/httpserver.go
@@ -133,6 +133,7 @@ func registerAPIs(router *gin.Engine) {
 			batchmanager := authenApi.Group("batchmanager")
 			batchmanager.POST("/updatebatch", middleware.NeedPermission("batch_update", "button"), controller.UpdateBatchHandler)
 			batchmanager.POST("/deletebatch", middleware.NeedPermission("batch_delete", "button"), controller.DeleteBatchHandler)
+			batchmanager.POST("/createbatch", middleware.NeedPermission("batch_create", "button"), controller.CreateBatchHandler)
 		}
 		{
 			user := authenApi.Group("user")
@@ -175,7 +176,6 @@ func registerAPIs(router *gin.Engine) {
 		macList.POST("/deletemachine", controller.DeleteMachineHandler)
 		macList.GET("/depart", controller.DepartHandler)
 		macList.GET("/selectmachine", controller.MachineListHandler)
-		macList.POST("/createbatch", controller.CreateBatchHandler)
 		macList.GET("/machineinfo", controller.MachineInfoHandler)
 		macList.POST("/modifydepart", controller.ModifyMachineDepartHandler)
 		macList.GET("/sourcepool", controller.FreeMachineSource)
@@ -276,7 +276,7 @@ func registerAPIs(router *gin.Engine) {
 
 	userLog := api.Group("log") // 日志管理
 	{
-		userLog.GET("/log_all", controller.LogAllHandler)
+		userLog.GET("/log_all", middleware.NeedPermission("log", "menu"), controller.LogAllHandler)
 		userLog.GET("/log_child", controller.GetAuditLogByIdHandler)
 	}
 
diff --git a/src/app/server/service/auth/casbin.go b/src/app/server/service/auth/casbin.go
index 5d6bac91..3c0d532c 100644
--- a/src/app/server/service/auth/casbin.go
+++ b/src/app/server/service/auth/casbin.go
@@ -105,6 +105,7 @@ var (
 	PermissionList = []string{
 		"rpm_install",
 		"rpm_uninstall",
+		"batch_create",
 		"batch_update",
 		"batch_delete",
 		"user_add",
@@ -116,7 +117,6 @@ var (
 		"role_update",
 		"role_delete",
 		"role_modify",
-		"config_install",
 		"dept_change",
 		"machine_delete",
 	}
@@ -127,7 +127,6 @@ var (
 		"batch",
 		"usermanager",
 		"rolemanager",
-		"config",
 		"log",
 		"plugin",
 	}
-- 
Gitee