Merge remote-tracking branch 'origin/main' into main

app/http/controllers/backend/cmd_controller.go

@@ -4,7 +4,7 @@ import (
 	"cron_admin/app/constants/errorcode"
 	"cron_admin/app/http/controllers"
 	"cron_admin/app/http/entities/backend"
-	"cron_admin/app/models/cronusermodel"
+	"cron_admin/app/models/croncmdmodel"
 	cmd_services "cron_admin/app/services/cmd_service"
 	"github.com/ahmetb/go-linq/v3"
 	"github.com/gin-gonic/gin"
@@ -16,12 +16,16 @@ func CmdList(c *gin.Context) {
 	if err != nil {
 		controllers.HandRes(c, nil, errorcode.NotFound)
 	} else {
-		ulist := make([]backend.UserListResponse, 0)
+		var (
-		linq.From(list).SelectT(func(in cronusermodel.CronUser) (d backend.UserListResponse) {
+			cmdList = make([]backend.CmdListResponse, 0)
+			//userIdList []int
+		)
+
+		linq.From(list).SelectT(func(in croncmdmodel.CronCmd) (d backend.CmdListResponse) {
 			d.ResponseFromDb(in)
 			return d
-		}).ToSlice(&ulist)
+		}).ToSlice(&cmdList)
-		controllers.HandRes(c, gin.H{"data": ulist, "count": count}, err)
+		controllers.HandRes(c, gin.H{"data": cmdList, "count": count}, err)
 	}
 }
 

app/http/entities/backend/cmd.go

@@ -18,7 +18,7 @@ type CmdInfoRequest struct {
 }
 
 type CmdListResponse struct {
-	CmdId           string                    `json:"cmd_id"`
+	CmdId           int                       `json:"cmd_id"`
 	CmdName         string                    `json:"cmd_name"`
 	UserIds         string                    `json:"user_ids"`
 	EntryId         int                       `json:"entry_id"`

app/models/croncmdmodel/cron_cmd.go

@@ -13,7 +13,7 @@ var (
 
 // 实体
 type CronCmd struct {
-	CmdId           string     `xorm:"'cmd_id' UNSIGNED INT"`
+	CmdId           int        `xorm:"'cmd_id' UNSIGNED INT"`
 	CmdName         string     `xorm:"'cmd_name' varchar(20)"`
 	UserIds         string     `xorm:"'user_ids' varchar(50)"`
 	EntryId         int        `xorm:"'entry_id' int(10)"`