优化整体

dri/tencent/company.go

@@ -15,24 +15,40 @@ import (
 	"time"
 )
 
-func calcAuthorization(source string, secretId string, secretKey string) (auth string, datetime string, err error) {
+type company struct {
+	secretId  string
+	secretKey string
+}
+
+var Company = company{}
+
+func (that *company) Init(secretId, secretKey string) {
+	// 云市场分配的密钥Id
+	//secretId := "xxxx"
+	//// 云市场分配的密钥Key
+	//secretKey := "xxxx"
+	that.secretId = secretId
+	that.secretKey = secretKey
+}
+
+func (that *company) calcAuthorization(source string) (auth string, datetime string, err error) {
 
 	timeLocation, _ := time.LoadLocation("Etc/GMT")
 	datetime = time.Now().In(timeLocation).Format("Mon, 02 Jan 2006 15:04:05 GMT")
 	signStr := fmt.Sprintf("x-date: %s\nx-source: %s", datetime, source)
 
 	// hmac-sha1
-	mac := hmac.New(sha1.New, []byte(secretKey))
+	mac := hmac.New(sha1.New, []byte(that.secretKey))
 	mac.Write([]byte(signStr))
 	sign := base64.StdEncoding.EncodeToString(mac.Sum(nil))
 
 	auth = fmt.Sprintf("hmac id=\"%s\", algorithm=\"hmac-sha1\", headers=\"x-date x-source\", signature=\"%s\"",
-		secretId, sign)
+		that.secretId, sign)
 
 	return auth, datetime, nil
 }
 
-func urlencode(params map[string]string) string {
+func (that *company) urlencode(params map[string]string) string {
 	var p = gourl.Values{}
 	for k, v := range params {
 		p.Add(k, v)
@@ -40,7 +56,7 @@ func urlencode(params map[string]string) string {
 	return p.Encode()
 }
 
-func GetCompany(secretId, secretKey, name string) Map {
+func (that *company) GetCompany(name string) Map {
 	// 云市场分配的密钥Id
 	//secretId := "xxxx"
 	//// 云市场分配的密钥Key
@@ -48,7 +64,7 @@ func GetCompany(secretId, secretKey, name string) Map {
 	source := "market"
 
 	// 签名
-	auth, datetime, _ := calcAuthorization(source, secretId, secretKey)
+	auth, datetime, _ := that.calcAuthorization(source)
 
 	// 请求方法
 	method := "GET"
@@ -64,13 +80,13 @@ func GetCompany(secretId, secretKey, name string) Map {
 	// url参数拼接
 	url := "https://service-3jnh3ku8-1256140209.gz.apigw.tencentcs.com/release/business4/geet"
 	if len(queryParams) > 0 {
-		url = fmt.Sprintf("%s?%s", url, urlencode(queryParams))
+		url = fmt.Sprintf("%s?%s", url, that.urlencode(queryParams))
 	}
 
 	bodyMethods := map[string]bool{"POST": true, "PUT": true, "PATCH": true}
 	var body io.Reader = nil
 	if bodyMethods[method] {
-		body = strings.NewReader(urlencode(bodyParams))
+		body = strings.NewReader(that.urlencode(bodyParams))
 		headers["Content-Type"] = "application/x-www-form-urlencoded"
 	}
 

dri/tencent/tencent.go

@@ -8,16 +8,32 @@ import (
 	ocr "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ocr/v20181119"
 )
 
-var credential = common.NewCredential(
-	"AKIDOgT8cKCQksnY7yKATaYO7j9ORJzSYohP",
-	"GNXgjdN4czA9ya0FNMApVJzTmsmU0KSN",
-)
+type tencent struct {
+	secretId   string
+	secretKey  string
+	credential *common.Credential
+}
 
-func OCRCOMPANY(base64Str string) string {
+var Tencent = tencent{}
+
+func (that *tencent) Init(secretId, secretKey string) {
+	// 云市场分配的密钥Id
+	//secretId := "xxxx"
+	//// 云市场分配的密钥Key
+	//secretKey := "xxxx"
+	that.secretId = secretId
+	that.secretKey = secretKey
+	that.credential = common.NewCredential(
+		"AKIDOgT8cKCQksnY7yKATaYO7j9ORJzSYohP",
+		"GNXgjdN4czA9ya0FNMApVJzTmsmU0KSN",
+	)
+}
+
+func (that *tencent) OCRCOMPANY(base64Str string) string {
 
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
-	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
 
 	request := ocr.NewBizLicenseOCRRequest()
 
@@ -38,11 +54,11 @@ func OCRCOMPANY(base64Str string) string {
 	return response.ToJsonString()
 }
 
-func OCR(base64Str string) string {
+func (that *tencent) OCR(base64Str string) string {
 
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
-	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
 
 	request := ocr.NewGeneralAccurateOCRRequest()
 
@@ -63,11 +79,11 @@ func OCR(base64Str string) string {
 	return response.ToJsonString()
 }
 
-func Qrcode(base64Str string) string {
+func (that *tencent) Qrcode(base64Str string) string {
 
 	cpf := profile.NewClientProfile()
 	cpf.HttpProfile.Endpoint = "ocr.tencentcloudapi.com"
-	client, _ := ocr.NewClient(credential, "ap-guangzhou", cpf)
+	client, _ := ocr.NewClient(that.credential, "ap-guangzhou", cpf)
 
 	request := ocr.NewQrcodeOCRRequest()