update

@@ -32,8 +32,6 @@ func aes_CBC_Encrypt(data []byte, key, iv []byte) (string, error) {
 		return "", err
 	}
 	origData := padding([]byte(data), block.BlockSize())
-	println("block ", block.BlockSize())
-	println("block2 ", len(iv))
 	blockMode := cipher.NewCBCEncrypter(block, iv)
 	crypted := make([]byte, len(origData))
 	blockMode.CryptBlocks(crypted, origData)

@@ -35,6 +35,7 @@ KmUhzAS0v+cvRYEBdiD+ckC1i80KaGPsiSvKSgJIxEEo1urgsrGJBGP0uBMM50Bm
 -----END PUBLIC KEY-----`
 	IP = "http://47.110.250.177:20000/"
 	//IP  = "http://127.0.0.1:51393/"
+	PTCODE = "730088256896503808"
 	STR = `{"response_type":"code","client_id":"432437055486697481","redirect_uri":"https://dev3.workai.com.cn/wso-workai?state=socialwork_strait_certification_list","state":"client_credential","scope":"global_access:end_user","user_mobile":"13301169757","user_name":"sasl_dispose","callback":"","certification":"0","ptcode":"730088256896503808","path_type":"","path":""}`
 
 	V1DATA = "Wxy8h961GO12QmdOdwOYaUZdy6P+o67Olid6YbbjP+SiZNKYofmbQ33eyixsWXIP33sLIrrUrYZ/BNd1+iC8Bng9itBpIcJEfO7fJX9+8Sgp+5hORLESdPRoiyIjeQMX1JKpBk0Uiu7eSsxRRepi33oMi1+580LtFa91lc44PAwnrAEPoTZbEpPQQQmNPrGM0DzmZRUxEIT/SajlwoNg34DvKrGpsb2g8GZ7wUR8GuTOYUg2odF8WjTWNj2GWuzCUw8WPN8FGXdgTzRMn0glivn5SizGmJn0oOJZxo4JRG0Q6h0hV3xi8nPtvwjyOdy0Wspjcd4jQny1jaOKCaPg/5CRLWdmQKLE9d7UhSyQoQ6jzNxEkd/r7vAbtuvRfwvB6zN7NKODjVc/kJf7qovou8u6k2xBGQ7C1CT8wULjqRy3bAYfJ4A5YYWIwtMPJ/l1swlEYsalq5M4Y1g5RjnX1auMczdhnTCOzNeXm2tTJSQ="
@@ -44,7 +45,7 @@ KmUhzAS0v+cvRYEBdiD+ckC1i80KaGPsiSvKSgJIxEEo1urgsrGJBGP0uBMM50Bm
 var client *OrderClient
 
 func init() {
-	client = NewOrderClient(KEY, IV, PRIVATEKEY, PUBLICKEY, IP)
+	client = NewOrderClient(KEY, IV, PRIVATEKEY, PUBLICKEY, IP,PTCODE)
 }
 
 func TestCheckParams(t *testing.T) {

@@ -83,9 +83,6 @@ func makeHttpRequestV4(method, url string, headers map[string]string, entity map
 			Jar: jar,
 		}
 	}
-	//	client.Transport = tr
-
-	fmt.Printf("xuht================Request: %+v\n", *req)
 	res, err := client.Do(req)
 	if err != nil {
 		fmt.Println("faild to do the request with error ", err)

+package main
+
+import (
+	"bufio"
+	"crypto/rand"
+	"crypto/rsa"
+	"crypto/x509"
+	"encoding/pem"
+	"flag"
+	socialwork_sdk "gitlab.workai.com.cn/chenang/socialwork-sdk"
+	"io/ioutil"
+	"os"
+)
+
+
+/*func init(){
+	var bits int
+	flag.IntVar(&bits, "b", 1024, "密钥长度，默认为1024位")
+	flag.Parse()
+
+	if err := GenRsaKey(bits); err != nil {
+		log.Fatal("密钥文件生成失败！")
+	}
+	log.Println("密钥文件生成成功！")
+}
+*/
+func main() {
+	var key string
+	var iv string
+	var privateKeyPath string
+	var publicKeyPath string
+	var ip string
+	var bussinessCode string
+	var ptCode string
+	var reqBody string
+	var errFilePath string
+	var resultFilePath string
+	flag.StringVar(&key, "key", "", "key")
+	flag.StringVar(&iv, "iv", "", "iv")
+	flag.StringVar(&privateKeyPath, "privateKeyPath", "", "privateKeyPath")
+	flag.StringVar(&publicKeyPath, "publicKeyPath", "", "publicKeyPath")
+	flag.StringVar(&ip, "ip", "", "ip")
+	flag.StringVar(&bussinessCode, "bussiness_code", "", "bussiness_code")
+	flag.StringVar(&ptCode, "ptCode", "", "ptCode")
+	flag.StringVar(&reqBody, "reqBody", "", "reqBody")
+	flag.StringVar(&errFilePath, "errFilePath", "", "errFilePath")
+	flag.StringVar(&resultFilePath, "resultFilePath", "", "resultFilePath")
+	flag.Parse()
+
+
+	fd, _ := os.OpenFile(errFilePath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
+	defer fd.Close()
+
+	publicKey, err := ioutil.ReadFile(publicKeyPath)
+	if err != nil {
+		write := bufio.NewWriter(fd)
+		write.WriteString("命令行执行错误:" + err.Error() + "\r\n")
+		write.Flush()
+		return
+	}
+	privateKey, err := ioutil.ReadFile(privateKeyPath)
+	if err != nil {
+		write := bufio.NewWriter(fd)
+		write.WriteString("命令行执行错误:" + err.Error() + "\r\n")
+		write.Flush()
+		return
+	}
+
+	client := socialwork_sdk.NewOrderClient(key, iv, string(privateKey), string(publicKey), ip, ptCode)
+	req, err := client.SendRequest(bussinessCode, reqBody)
+	if err != nil {
+		write := bufio.NewWriter(fd)
+		write.WriteString("命令行执行错误:" + err.Error() + "\r\n")
+		write.Flush()
+		return
+	} else {
+		file, err := os.Create(resultFilePath)
+		defer file.Close()
+
+		if err != nil {
+			write := bufio.NewWriter(fd)
+			write.WriteString("命令行执行错误:" + err.Error() + "\r\n")
+			write.Flush()
+			return
+		}
+		file.WriteString(req)
+		return
+	}
+}
+
+func GenRsaKey(bits int) error {
+	// 生成私钥文件
+	privateKey, err := rsa.GenerateKey(rand.Reader, bits)
+	if err != nil {
+		return err
+	}
+	derStream := x509.MarshalPKCS1PrivateKey(privateKey)
+	block := &pem.Block{
+		Type:  "私钥",
+		Bytes: derStream,
+	}
+	file, err := os.Create("private.pem")
+	if err != nil {
+		return err
+	}
+	err = pem.Encode(file, block)
+	if err != nil {
+		return err
+	}
+	// 生成公钥文件
+	publicKey := &privateKey.PublicKey
+	derPkix, err := x509.MarshalPKIXPublicKey(publicKey)
+	if err != nil {
+		return err
+	}
+	block = &pem.Block{
+		Type:  "公钥",
+		Bytes: derPkix,
+	}
+	file, err = os.Create("public.pem")
+	if err != nil {
+		return err
+	}
+	err = pem.Encode(file, block)
+	if err != nil {
+		return err
+	}
+	return nil
+}

+-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAL+HIjm9wYlMx5dR
+hCGw9Uw5X1ZKPUfOvKXq/8mIuNVtH2ls6jz1fBlhoSHrYMjxY5t7EPSRZzOLeqGI
+7FKbwlHPLAC4cN3njho8TE4Ao7EqipG7L81qHL6Wll/NrziP67+dDROG0ozscmNh
+kq0JFxIkxQn3aKGbeEdJbLcLRRM7AgMBAAECgYEAn72Rah89v8nt3eL7FS6GKGDh
+hxK8MZvX83oghHIn1roArOlOJDGKo5Ct16B9RJsvvInUBmcPcAow6XFNyUhntGnk
+evnBZSPz8SJlwGMTTz/P4ebQURrcup5UejQzmBOSXrIXsrW4Ty0AdvnwM1OB/lmz
+tQZyU3xMzK6QbXJkCgECQQDqWeR9/gBwWZLkZBPQASxWbb7NKwyCNN7clzMZv6MN
+ea8sR7Zp6cNfPtfcVVTeHRX/sXRhB7inRyLi/ec3dSJBAkEA0TiGYiTv1l5prTCC
+PK6lyShDK9SR8ZBcSxO5KsttFeOs3f9l2uU0ddd8fAuLJPm2xjd3RAbnH9dAfEC1
+GXoeewJBAJ/aB0iFnIkGIHNXbEhCtJqTq0VJavPZ2nZ/UCTtGexUJ0+97shZ4qEy
+PY2WSxhioKHTyn1xBdxcYoiRBklGxcECQAqDOZVi3744vjyajGC6MdBauo1QQAkQ
+ROLs2cgBsrh/2SbKd3a5P5qQOkwNVG+GMJ3jGZYMdr6N1UqpAbCHB1MCQH1aSvf2
++CXW9fbkUz+qyjIWLN0pDyI+uh+zAHRRs9sL5UVOLfyU03W3120bUL7aekrbynP8
+1+ihe8QolWZgvUk=
+-----END PRIVATE KEY-----

+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHk0VRd3+CqwUHA2jC4dzrqe7/
+pjX8BTbC7T7DnzAGO7iN09kf2abbzudLTM+xbOKr2wSTLkhffBhycZ4zlf3PuVu/
+KmUhzAS0v+cvRYEBdiD+ckC1i80KaGPsiSvKSgJIxEEo1urgsrGJBGP0uBMM50Bm
+3YZBKCNST3LB1JNSeQIDAQAB
+-----END PUBLIC KEY-----

@@ -21,13 +21,14 @@ func HelloWorld() {
 	fmt.Println("欢迎使用小爱，socialwork-sdk")
 }
 
-func NewOrderClient(key, iv, customerPrivateKey, publicKey, ip string) *OrderClient {
+func NewOrderClient(key, iv, customerPrivateKey, publicKey, ip, ptCode string) *OrderClient {
 	return &OrderClient{
 		Key:                key,
 		IV:                 iv,
 		PublicKey:          publicKey,
 		CustomerPrivateKey: customerPrivateKey,
 		IP:                 ip,
+		PtCode:             ptCode,
 	}
 }
 
@@ -79,7 +80,6 @@ func (o *OrderClient) SendRequest(businessCode, reqBody string) (string, error)
 		PtCode:       o.PtCode,
 		BusinessCode: businessCode,
 	}
-
 	_orderModel, err := json.Marshal(orderModel)
 	if err != nil {
 		return "", err
@@ -102,98 +102,98 @@ func (o *OrderClient) checkParams(businessCode, reqBody string) error {
 	switch businessCode {
 	case "AUTHORIZE":
 		var authorize model.Authorize
-		if err := json.Unmarshal([]byte(reqBody),&authorize); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &authorize); err != nil {
 			return err
 		}
 		return nil
 	case "CREATEORDER":
 		var createOrder model.CreateOrder
-		if err := json.Unmarshal([]byte(reqBody),&createOrder); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &createOrder); err != nil {
 			return err
 		}
 		return nil
 	case "ADDFREEDOMEEMP":
 		var freedomEmps model.FreedomEmps
-		if err := json.Unmarshal([]byte(reqBody),&freedomEmps); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &freedomEmps); err != nil {
 			return err
 		}
 		return nil
 	case "UPLOADATTACHMENT":
 		var uploadFreedomEmps model.UploadFreedomEmps
-		if err := json.Unmarshal([]byte(reqBody),&uploadFreedomEmps); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &uploadFreedomEmps); err != nil {
 			return err
 		}
 		return nil
 	case "UPLOADATTACHMENTBYURL":
 		var uploadFreedomEmpsByUrl model.UploadFreedomEmpsByUrl
-		if err := json.Unmarshal([]byte(reqBody),&uploadFreedomEmpsByUrl); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &uploadFreedomEmpsByUrl); err != nil {
 			return err
 		}
 		return nil
 	case "ORDERINFO":
 		var simpleOrderInfo model.SimpleOrderInfo
-		if err := json.Unmarshal([]byte(reqBody),&simpleOrderInfo); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &simpleOrderInfo); err != nil {
 			return err
 		}
 		return nil
 	case "FREEDOMEMOSTATUS":
 		var freedomEmpStatus model.FreedomEmpStatus
-		if err := json.Unmarshal([]byte(reqBody),&freedomEmpStatus); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &freedomEmpStatus); err != nil {
 			return err
 		}
 		return nil
 	case "SUBACCOUNTBALANCE":
 		var subAccountBalance model.SubAccountBalance
-		if err := json.Unmarshal([]byte(reqBody),&subAccountBalance); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &subAccountBalance); err != nil {
 			return err
 		}
 		return nil
 	case "UPDATEORDERDETAIL":
 		var updateOrderDetail model.UpdateOrderDetail
-		if err := json.Unmarshal([]byte(reqBody),&updateOrderDetail); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &updateOrderDetail); err != nil {
 			return err
 		}
 		return nil
 	case "EXISTRECEIPT":
 		var receipt model.Receipt
-		if err := json.Unmarshal([]byte(reqBody),&receipt); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &receipt); err != nil {
 			return err
 		}
 		return nil
 	case "DOWNLOADRECEIPT":
 		var downloadReceipt model.DownloadReceipt
-		if err := json.Unmarshal([]byte(reqBody),&downloadReceipt); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &downloadReceipt); err != nil {
 			return err
 		}
 		return nil
 	case "PAYORDER":
 		var payOrder model.PayOrder
-		if err := json.Unmarshal([]byte(reqBody),&payOrder); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &payOrder); err != nil {
 			return err
 		}
 		return nil
 	case "USERINFO":
 		var getUserInfo model.GetUserInfo
-		if err := json.Unmarshal([]byte(reqBody),&getUserInfo); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &getUserInfo); err != nil {
 			return err
 		}
 		return nil
 	case "PAYORDERV1":
 		var mergeCreateOrder model.MergeCreateOrder
-		if err := json.Unmarshal([]byte(reqBody),&mergeCreateOrder); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &mergeCreateOrder); err != nil {
 			return err
 		}
 		return nil
 	case "UPDATEMOBILE":
 		var updateMobile model.UpdateMobile
-		if err := json.Unmarshal([]byte(reqBody),&updateMobile); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &updateMobile); err != nil {
 			return err
 		}
 		return nil
 
 	case "CREATEEMPLOYMENTPOOL":
 		var createEmploymentPool model.CreateEmploymentPool
-		if err := json.Unmarshal([]byte(reqBody),&createEmploymentPool); err != nil  {
+		if err := json.Unmarshal([]byte(reqBody), &createEmploymentPool); err != nil {
 			return err
 		}
 		return nil