refactor: move model struct to types

internal/version/VERSION

@@ -1 +1 @@
-v5.0.0-beta-2505242322
+v5.0.0-beta-2505242332

server/app.go

@@ -22,7 +22,7 @@ func (r *Router) foregroundAppHandler(c *gin.Context) {
 }
 
 func (r *Router) appInfoHandler(c *gin.Context) {
-	var appInfoReq AppInfoRequest
+	var appInfoReq types.AppInfoRequest
 	if err := c.ShouldBindQuery(&appInfoReq); err != nil {
 		RenderErrorValidateRequest(c, err)
 		return
@@ -106,7 +106,7 @@ func (r *Router) terminalAppHandler(c *gin.Context) {
 }
 
 func (r *Router) uninstallAppHandler(c *gin.Context) {
-	var appUninstallReq AppUninstallRequest
+	var appUninstallReq types.AppUninstallRequest
 	if err := c.ShouldBindJSON(&appUninstallReq); err != nil {
 		RenderErrorValidateRequest(c, err)
 		return

server/device.go

@@ -101,7 +101,6 @@ func createBrowserHandler(c *gin.Context) {
 		return
 	}
 	RenderSuccess(c, browserInfo)
-	return
 }
 
 func (r *Router) deleteBrowserHandler(c *gin.Context) {

server/key.go

@@ -4,6 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/httprunner/httprunner/v5/uixt"
+	"github.com/httprunner/httprunner/v5/uixt/types"
 )
 
 func (r *Router) unlockHandler(c *gin.Context) {
@@ -33,7 +34,7 @@ func (r *Router) homeHandler(c *gin.Context) {
 }
 
 func (r *Router) backspaceHandler(c *gin.Context) {
-	var deleteReq DeleteRequest
+	var deleteReq types.DeleteRequest
 	if err := c.ShouldBindJSON(&deleteReq); err != nil {
 		RenderErrorValidateRequest(c, err)
 		return
@@ -54,7 +55,7 @@ func (r *Router) backspaceHandler(c *gin.Context) {
 }
 
 func (r *Router) keycodeHandler(c *gin.Context) {
-	var keycodeReq KeycodeRequest
+	var keycodeReq types.KeycodeRequest
 	if err := c.ShouldBindJSON(&keycodeReq); err != nil {
 		RenderErrorValidateRequest(c, err)
 		return

server/model.go

@@ -11,43 +11,11 @@ type uploadRequest struct {
 	FileFormat string  `json:"file_format"`
 }
 
-type InputRequest struct {
-	Text      string `json:"text" binding:"required"`
-	Frequency int    `json:"frequency"` // only iOS
-}
-
-type DeleteRequest struct {
-	Count int `json:"count" binding:"required"`
-}
-
-type KeycodeRequest struct {
-	Keycode int `json:"keycode" binding:"required"`
-}
-
-type AppInstallRequest struct {
-	AppUrl             string `json:"appUrl" binding:"required"`
-	MappingUrl         string `json:"mappingUrl"`
-	ResourceMappingUrl string `json:"resourceMappingUrl"`
-	PackageName        string `json:"packageName"`
-}
-
-type AppInfoRequest struct {
-	PackageName string `form:"packageName" binding:"required"`
-}
-
-type AppUninstallRequest struct {
-	PackageName string `json:"packageName" binding:"required"`
-}
-
 type PushMediaRequest struct {
 	ImageUrl string `json:"imageUrl" binding:"required_without=VideoUrl"`
 	VideoUrl string `json:"videoUrl" binding:"required_without=ImageUrl"`
 }
 
-type OperateRequest struct {
-	StepText string `json:"stepText" binding:"required"`
-}
-
 type HttpResponse struct {
 	Code    int         `json:"errorCode"`
 	Message string      `json:"errorMsg"`

server/ui.go

@@ -162,7 +162,7 @@ func (r *Router) dragHandler(c *gin.Context) {
 }
 
 func (r *Router) inputHandler(c *gin.Context) {
-	var inputReq InputRequest
+	var inputReq types.InputRequest
 	if err := c.ShouldBindJSON(&inputReq); err != nil {
 		RenderErrorValidateRequest(c, err)
 		return

uixt/types/request.go

@@ -29,6 +29,40 @@ type SwipeRequest struct {
 	PressDuration float64 `json:"press_duration" desc:"Press duration in milliseconds (optional)"`
 }
 
+type InputRequest struct {
+	TargetDeviceRequest
+	Text      string `json:"text" binding:"required"`
+	Frequency int    `json:"frequency"` // only iOS
+}
+
+type DeleteRequest struct {
+	TargetDeviceRequest
+	Count int `json:"count" binding:"required"`
+}
+
+type KeycodeRequest struct {
+	TargetDeviceRequest
+	Keycode int `json:"keycode" binding:"required"`
+}
+
+type AppInstallRequest struct {
+	TargetDeviceRequest
+	AppUrl             string `json:"appUrl" binding:"required"`
+	MappingUrl         string `json:"mappingUrl"`
+	ResourceMappingUrl string `json:"resourceMappingUrl"`
+	PackageName        string `json:"packageName"`
+}
+
+type AppInfoRequest struct {
+	TargetDeviceRequest
+	PackageName string `form:"packageName" binding:"required"`
+}
+
+type AppUninstallRequest struct {
+	TargetDeviceRequest
+	PackageName string `json:"packageName" binding:"required"`
+}
+
 type AppClearRequest struct {
 	TargetDeviceRequest
 	PackageName string `json:"packageName" binding:"required"`