mirror of
https://github.com/httprunner/httprunner.git
synced 2026-07-12 16:01:27 +08:00
feat: add right clcik and webid
This commit is contained in:
@@ -1 +1 @@
|
|||||||
v5.0.0+2502192152
|
v5.3.4
|
||||||
@@ -223,7 +223,7 @@ func (wd *BrowserWebDriver) tapBySelector(selector string, options ...option.Act
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
func (wd *BrowserWebDriver) RightClick(x, y int) (err error) {
|
func (wd *BrowserWebDriver) RightClick(x, y float64) (err error) {
|
||||||
data := map[string]interface{}{
|
data := map[string]interface{}{
|
||||||
"x": x,
|
"x": x,
|
||||||
"y": y,
|
"y": y,
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ type IXTDriver interface {
|
|||||||
type IBrowserWebDriver interface {
|
type IBrowserWebDriver interface {
|
||||||
IDriver
|
IDriver
|
||||||
Hover(x, y float64) (err error)
|
Hover(x, y float64) (err error)
|
||||||
RightClick(x, y int) (err error)
|
RightClick(x, y float64) (err error)
|
||||||
Scroll(delta int) (err error)
|
Scroll(delta int) (err error)
|
||||||
UploadFile(x, y float64, FileUrl, FileFormat string) (err error)
|
UploadFile(x, y float64, FileUrl, FileFormat string) (err error)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -124,14 +124,15 @@ func (wd *StubBrowserDriver) LoginNoneUI(packageName, phoneNumber string, captch
|
|||||||
"url": packageName,
|
"url": packageName,
|
||||||
"web_cookie": password,
|
"web_cookie": password,
|
||||||
}
|
}
|
||||||
_, err = wd.HttpPOST(data, wd.sessionId, "stub/login")
|
resp, err := wd.HttpPOST(data, wd.sessionId, "stub/login")
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return info, err
|
return info, err
|
||||||
}
|
}
|
||||||
|
respdata := resp.Data.(map[string]interface{})
|
||||||
loginSuccss := AppLoginInfo{
|
loginSuccss := AppLoginInfo{
|
||||||
IsLogin: true,
|
IsLogin: true,
|
||||||
Uid: wd.sessionId,
|
Uid: respdata["webid"].(string),
|
||||||
Did: password,
|
Did: password,
|
||||||
}
|
}
|
||||||
return loginSuccss, err
|
return loginSuccss, err
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ func (r *Router) Init() {
|
|||||||
|
|
||||||
// UI operations
|
// UI operations
|
||||||
apiV1PlatformSerial.POST("/ui/tap", r.tapHandler)
|
apiV1PlatformSerial.POST("/ui/tap", r.tapHandler)
|
||||||
|
apiV1PlatformSerial.POST("/ui/right_click", r.rightClickHandler)
|
||||||
apiV1PlatformSerial.POST("/ui/double_tap", r.doubleTapHandler)
|
apiV1PlatformSerial.POST("/ui/double_tap", r.doubleTapHandler)
|
||||||
apiV1PlatformSerial.POST("/ui/drag", r.dragHandler)
|
apiV1PlatformSerial.POST("/ui/drag", r.dragHandler)
|
||||||
apiV1PlatformSerial.POST("/ui/input", r.inputHandler)
|
apiV1PlatformSerial.POST("/ui/input", r.inputHandler)
|
||||||
|
|||||||
18
server/ui.go
18
server/ui.go
@@ -29,6 +29,24 @@ func (r *Router) tapHandler(c *gin.Context) {
|
|||||||
RenderSuccess(c, true)
|
RenderSuccess(c, true)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *Router) rightClickHandler(c *gin.Context) {
|
||||||
|
var rightClickReq TapRequest
|
||||||
|
if err := c.ShouldBindJSON(&rightClickReq); err != nil {
|
||||||
|
RenderErrorValidateRequest(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
driver, err := r.GetDriver(c)
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = driver.GetWebDriver().RightClick(rightClickReq.X, rightClickReq.Y)
|
||||||
|
if err != nil {
|
||||||
|
RenderError(c, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
RenderSuccess(c, true)
|
||||||
|
}
|
||||||
|
|
||||||
func (r *Router) uploadHandler(c *gin.Context) {
|
func (r *Router) uploadHandler(c *gin.Context) {
|
||||||
var uploadRequest uploadRequest
|
var uploadRequest uploadRequest
|
||||||
if err := c.ShouldBindJSON(&uploadRequest); err != nil {
|
if err := c.ShouldBindJSON(&uploadRequest); err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user