Merge branch 'refs/heads/feat-cmd'

handler/shell.go

@@ -58,16 +58,16 @@ func (s *ShellHandler) CreateShell(c *gin.Context) {
 }
 
 func (s *ShellHandler) ListShell(c *gin.Context) {
-	user_id, _ := c.Get("id")
-	id := int(user_id.(float64))
+	userId, _ := c.Get("id")
+	id := int(userId.(float64))
 	shells := service.FindShellByAuthID(id)
 	c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "获取成功", "data": shells})
 }
 
 func (s *ShellHandler) UpdateShell(c *gin.Context) {
 	var req UpdateShellReqV2
-	user_id, _ := c.Get("id")
-	id := int(user_id.(float64))
+	userId, _ := c.Get("id")
+	id := int(userId.(float64))
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(200, gin.H{"code": proto.ShellUpdateFailed, "message": "参数错误", "data": err.Error()})
 	} else {
@@ -88,8 +88,8 @@ type ServerWillRunReq struct {
 }
 
 func (s *ShellHandler) ServerWillRun(c *gin.Context) {
-	user_id, _ := c.Get("id")
-	id := int(user_id.(float64))
+	userId, _ := c.Get("id")
+	id := int(userId.(float64))
 	var req ServerWillRunReq
 	if err := c.ShouldBindJSON(&req); err != nil {
 		c.JSON(200, gin.H{"code": proto.ShellUpdateFailed, "message": "参数错误", "data": err.Error()})

main.go

@@ -136,8 +136,8 @@ func JWTAuthMiddleware() gin.HandlerFunc {
 		}
 		//查看token是否在超级token中
 		if worker.IsContainSet("super_permission_tokens", tokenString) {
-			s_id := c.Request.Header.Get("super_id")
-			if s_id == "" {
+			sId := c.Request.Header.Get("super_id")
+			if sId == "" {
 				c.AbortWithStatus(200)
 				c.JSON(200, gin.H{
 					"message": "NOT_LOGIN",
@@ -146,10 +146,16 @@ func JWTAuthMiddleware() gin.HandlerFunc {
 				})
 				return
 			}
-			id, _ := strconv.Atoi(s_id)
-			id_float64 := float64(id)
+			if sId == "" {
+				sId = c.Query("super_id")
+			}
+			if sId == "" {
+				sId = "1"
+			}
+			id, _ := strconv.Atoi(sId)
+			idFloat64 := float64(id)
 			//查看s_id类型
-			c.Set("id", id_float64)
+			c.Set("id", idFloat64)
 			c.Next()
 			return
 		}

service/shellService.go

@@ -78,7 +78,7 @@ func ShellWillRunFromServer() {
 func GetShellWillRunFromMaster(server string) ([]dao.Shell, error) {
 	master := proto.Config.MASTER_SERVER_DOMAIN
 	//发起请求获取待执行的shell
-	url := "https://" + master + "/shell//server_will_run_list"
+	url := "https://" + master + "/shell/server_will_run_list"
 	var req proto.SyncUserShellReq
 	req.Server = server
 	req.Token = worker.GetRedisSetMembers("super_permission_tokens")[0]