jimmyyem 2 mesi fa
parent
commit
ff8268e081

+ 7 - 7
hook/aliyun/avatar.go

@@ -14,10 +14,10 @@ import (
 	"wechat-api/internal/utils/jwt"
 )
 
-// CreateClient 使用AK&SK初始化账号Client
+// CreateAvatarClient 使用AK&SK初始化账号Client
 // @return Client
 // @throws Exception
-func CreateClient(accessKeyId, accessKeySecret string) (_result *avatar20220130.Client, _err error) {
+func CreateAvatarClient(accessKeyId, accessKeySecret string) (_result *avatar20220130.Client, _err error) {
 	// 工程代码泄露可能会导致 AccessKey 泄露,并威胁账号下所有资源的安全性。以下代码示例仅供参考。
 	// 建议使用更安全的 STS 方式,更多鉴权访问方式请参见:https://help.aliyun.com/document_detail/378661.html。
 	config := &openapi.Config{
@@ -43,7 +43,7 @@ func StartInstance(userId uint64, jsonData AiTypes) (*avatar20220130.StartInstan
 	bizId := GenerateBizID(userId)
 	userIdStr := strconv.Itoa(int(userId))
 
-	client, _err := CreateClient(accessKeyId, accessKeySecret)
+	client, _err := CreateAvatarClient(accessKeyId, accessKeySecret)
 	if _err != nil {
 		return nil, _err
 	}
@@ -76,7 +76,7 @@ func SendText(sessionId, text string, isStream bool, index int32, position strin
 	accessKeySecret := jsonData.AccessKeySecret
 	tenantId := jsonData.TenantId
 
-	client, _err := CreateClient(accessKeyId, accessKeySecret)
+	client, _err := CreateAvatarClient(accessKeyId, accessKeySecret)
 	if _err != nil {
 		return nil, _err
 	}
@@ -113,7 +113,7 @@ func StopInstance(sessionId string, jsonData AiTypes) (*avatar20220130.StopInsta
 	accessKeySecret := jsonData.AccessKeySecret
 	tenantId := jsonData.TenantId
 
-	client, _err := CreateClient(accessKeyId, accessKeySecret)
+	client, _err := CreateAvatarClient(accessKeyId, accessKeySecret)
 	if _err != nil {
 		return nil, _err
 	}
@@ -141,7 +141,7 @@ func QueryRunningInstance(jsonData AiTypes) (*avatar20220130.QueryRunningInstanc
 	appId := jsonData.AppId
 	tenantId := jsonData.TenantId
 
-	client, _err := CreateClient(accessKeyId, accessKeySecret)
+	client, _err := CreateAvatarClient(accessKeyId, accessKeySecret)
 	if _err != nil {
 		return nil, _err
 	}
@@ -165,7 +165,7 @@ func QueryRunningInstance(jsonData AiTypes) (*avatar20220130.QueryRunningInstanc
 }
 
 func _main(args []*string) (_err error) {
-	client, _err := CreateClient("", "")
+	client, _err := CreateAvatarClient("", "")
 	if _err != nil {
 		return _err
 	}

+ 1 - 1
internal/logic/whatsapp/create_whatsapp_logic.go

@@ -31,7 +31,7 @@ func NewCreateWhatsappLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Cr
 func (l *CreateWhatsappLogic) CreateWhatsapp(req *types.WhatsappInfo) (*types.BaseMsgResp, error) {
 	add, err := aliyun.AddCamsPhoneNumber(*req.PhoneName, *req.Cc, *req.WaId, *req.PhoneName)
 	//l.Logger.Infof("add=%v err=%v\n", add, err)
-	if *add.Body.Code == "OK" {
+	if err == nil && *add.Body.Code == "OK" {
 		var stringSlice []string
 
 		_, err := l.svcCtx.DB.Whatsapp.Query().