- SendVerifyCode add params authToken

business/auth2/auth2.go

@@ -138,16 +138,25 @@ func CreateCaptcha(width, height, captchaLen int) (captchaInfo *CaptchaInfo, err
 	return captchaInfo, err
 }
 
-func SendVerifyCode(captchaID, captchaValue, authID string) (err error) {
-	if TestCaptchaMap[captchaID] == captchaValue || captcha.VerifyString(captchaID, captchaValue) {
+func SendVerifyCode(authToken, captchaID, captchaValue, authID string) (err error) {
+	if authToken != "" {
+		_, err = GetTokenInfo(authToken)
+	} else if captchaID != "" && captchaValue != "" {
+		if !(TestCaptchaMap[captchaID] == captchaValue || captcha.VerifyString(captchaID, captchaValue)) {
+			err = ErrCaptchaIsNotOk
+		}
+	} else {
+		err = errors.New("发送验证必须要有认证或CAPTCHA信息")
+	}
+	if err == nil {
 		authType := GuessAuthTypeFromAuthID(authID)
 		if handler := authers[authType]; handler == nil {
-			return ErrIllegalAuthType
+			err = ErrIllegalAuthType
 		} else {
-			return handler.SendVerifyCode(authID)
+			err = handler.SendVerifyCode(authID)
 		}
 	}
-	return ErrCaptchaIsNotOk
+	return err
 }
 
 // 账号密码时：authIDType可能是：UserIDID,UserIDID2,UserIDMobile,UserIDEmail，authSecret是密码的sha1
@@ -293,7 +302,7 @@ func createToken(user IUser) (token string, tokenType int) {
 		TokenVer,
 		time.Now().Format("20060102-150405"),
 		userID,
-		userID,
+		utils.GetUUID(),
 	}, TokenTypeSep), tokenType
 }