Merge remote-tracking branch 'origin/master' into master

main.go

@@ -90,6 +90,7 @@ func main() {
 		middleware.ErrorResponse(),
 		middleware.Logger(),
 		middleware.Session(),
+		middleware.Cors(),
 	)
 	r.AutoRegisterController("/v1", &controller.Auth{})
 	r.AutoRegisterController("/v1", &controller.HrSensors{})

middleware/cors.go

@@ -0,0 +1,28 @@
+/**
+ * @Author: JYQ
+ * @File： cors
+ * @Date: 2020/11/24 20:36
+ * @Desc:
+ */
+package middleware
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+func Cors() gin.HandlerFunc {
+	return func(context *gin.Context) {
+		method := context.Request.Method
+		context.Header("Access-Control-Allow-Origin", "*")
+		context.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token")
+		context.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS")
+		context.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type")
+		context.Header("Access-Control-Allow-Credentials", "true")
+		if method == "OPTIONS" {
+			context.AbortWithStatus(http.StatusNoContent)
+		}
+		context.Next()
+	}
+}

service/auth.go

@@ -110,11 +110,11 @@ func (a Auth) GenVFCode(codeTypeInt int, phone string, ip string, picCode string
 		err = errors.ErrSmsCodeRepeat
 		return
 	}
-	redisdb.Set(global.ProjectName+":"+global.AppName+":"+"smsCode:"+phone, []byte(smsCode), 3*time.Minute)
 
 	smDAO := short_msg.NewShortMsg()
 	smDAO.SendVFCode(phone, smsCode, codeType)
-
+	// 发送成功后保存到redis中
+	redisdb.Set(global.ProjectName+":"+global.AppName+":"+"smsCode:"+phone, []byte(smsCode), 3*time.Minute)
 	//vfcodeDao.Save(codeType, name, code, time.Now().Add(time.Minute*3), ip)
 	return