Merge branch 'dev_qr' into 'master' (merge request !85)

添加方法

Author: lilang

ci.go

@@ -1265,6 +1265,37 @@ func (s *CIService) GetQRcode(ctx context.Context, name string, cover int, opt *
 	return &res, resp, err
 }
 
+type GetQRcodeResultV2 struct {
+	XMLName     xml.Name    `xml:"Response"`
+	CodeStatus  int         `xml:"CodeStatus,omitempty"`
+	QRcodeInfo  []QRcodeInfo `xml:"QRcodeInfo,omitempty"`
+	ResultImage string      `xml:"ResultImage,omitempty"`
+}
+
+// 二维码识别-下载时识别 https://cloud.tencent.com/document/product/436/54070
+func (s *CIService) GetQRcodeV2(ctx context.Context, name string, cover int, opt *ObjectGetOptions, id ...string) (*GetQRcodeResultV2, *Response, error) {
+	var u string
+	if len(id) == 1 {
+		u = fmt.Sprintf("/%s?versionId=%s&ci-process=QRcode&cover=%v", encodeURIComponent(name), id[0], cover)
+	} else if len(id) == 0 {
+		u = fmt.Sprintf("/%s?ci-process=QRcode&cover=%v", encodeURIComponent(name), cover)
+	} else {
+		return nil, nil, errors.New("wrong params")
+	}
+
+	var res GetQRcodeResultV2
+	sendOpt := sendOptions{
+		baseURL:   s.client.BaseURL.BucketURL,
+		uri:       u,
+		method:    http.MethodGet,
+		optQuery:  opt,
+		optHeader: opt,
+		result:    &res,
+	}
+	resp, err := s.client.send(ctx, &sendOpt)
+	return &res, resp, err
+}
+
 type GenerateQRcodeOptions struct {
 	QRcodeContent string `url:"qrcode-content,omitempty"`
 	Mode          int    `url:"mode,omitempty"`

ci_test.go

@@ -874,6 +874,61 @@ func TestCIService_GetQRcode(t *testing.T) {
 	}
 }
 
+func TestCIService_GetQRcodeV2(t *testing.T) {
+	{
+		setup()
+		mux.HandleFunc("/test.jpg", func(w http.ResponseWriter, r *http.Request) {
+			testMethod(t, r, http.MethodGet)
+			vs := values{
+				"ci-process": "QRcode",
+				"cover":      "1",
+			}
+			testFormValues(t, r, vs)
+		})
+
+		_, _, err := client.CI.GetQRcodeV2(context.Background(), "test.jpg", 1, nil)
+		if err != nil {
+			t.Fatalf("CI.GetQRcodeV2 returned error: %v", err)
+		}
+		teardown()
+	}
+
+	{
+		setup()
+		mux.HandleFunc("/test.jpg", func(w http.ResponseWriter, r *http.Request) {
+			testMethod(t, r, http.MethodGet)
+			vs := values{
+				"ci-process": "QRcode",
+				"cover":      "1",
+				"versionId":  "1.1",
+			}
+			testFormValues(t, r, vs)
+		})
+		_, _, err := client.CI.GetQRcodeV2(context.Background(), "test.jpg", 1, nil, "1.1")
+		if err != nil {
+			t.Fatalf("CI.GetQRcodeV2 returned error: %v", err)
+		}
+		teardown()
+	}
+
+	{
+		setup()
+		mux.HandleFunc("/test.jpg", func(w http.ResponseWriter, r *http.Request) {
+			testMethod(t, r, http.MethodGet)
+			vs := values{
+				"ci-process": "QRcode",
+				"cover":      "1",
+			}
+			testFormValues(t, r, vs)
+		})
+		_, _, err := client.CI.GetQRcodeV2(context.Background(), "test.jpg", 1, nil, "1.1", "1.2")
+		if err == nil || err.Error() != "wrong params" {
+			t.Fatalf("CI.GetQRcodeV2 returned error: %v", err)
+		}
+		teardown()
+	}
+}
+
 func TestCIService_GenerateQRcode(t *testing.T) {
 	setup()
 	defer teardown()

example/CI/ai_recognition/qrcode.go

@@ -91,7 +91,7 @@ func qRcodeRecognitionWhenDownload() {
 	})
 
 	name := "pic/qrcode.jpg"
-	res, _, err := c.CI.GetQRcode(context.Background(), name, 1, nil)
+	res, _, err := c.CI.GetQRcodeV2(context.Background(), name, 1, nil)
 	log_status(err)
 	fmt.Printf("%+v\n", res)
 }