Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsSso/Controller/ControllerOauth2/ControllerOauth2.go

@@ -227,7 +227,6 @@ func accessToken(context *gin.Context) {
 		refreshToken := resp.Output["refresh_token"].(string)
 		tokenType := resp.Output["token_type"].(string)
 		identityIdInt, _ := strconv.Atoi(identityId)
-		//personIdInt, _ := strconv.Atoi(personId)
 		//记录refresh_token与identity_id,person_id关系
 		personStr := "{\"identity_id\":\"" + identityId + "\",\"person_id\":\"" + personId + "\",\"device_id\":\"" + deviceId + "\"}"
 		k := ConfigUtil.OAuth2RedisKeyPrefix + ":refresh_token_vs_person:" + refreshToken
@@ -507,9 +506,9 @@ func resetRemainCount(context *gin.Context) {
 // @Tags			登录验证类
 // @Accept application/x-www-form-urlencoded
 // @Produce  json
-// @Param code query string true "腾讯返回的code码"
+// @Param code formData string true "腾讯返回的code码"
 // @Success 200 {string} string
-// @Router /oauth2/wxLogin [get]
+// @Router /oauth2/wxLogin [post]
 // @X-EmptyLimit ["code"]
 func wxLogin(context *gin.Context) {
 	var code = context.PostForm("code")

dsSso/docs/docs.go

@@ -328,7 +328,7 @@ var doc = `{
             }
         },
         "/oauth2/wxLogin": {
-            "get": {
+            "post": {
                 "description": "微信登录",
                 "consumes": [
                     "application/x-www-form-urlencoded"
@@ -345,7 +345,7 @@ var doc = `{
                         "type": "string",
                         "description": "腾讯返回的code码",
                         "name": "code",
-                        "in": "query",
+                        "in": "formData",
                         "required": true
                     }
                 ],

dsSso/docs/swagger.json

@@ -312,7 +312,7 @@
             }
         },
         "/oauth2/wxLogin": {
-            "get": {
+            "post": {
                 "description": "微信登录",
                 "consumes": [
                     "application/x-www-form-urlencoded"
@@ -329,7 +329,7 @@
                         "type": "string",
                         "description": "腾讯返回的code码",
                         "name": "code",
-                        "in": "query",
+                        "in": "formData",
                         "required": true
                     }
                 ],

dsSso/docs/swagger.yaml

@@ -243,13 +243,13 @@ paths:
       x-emptylimit:
       - userName
   /oauth2/wxLogin:
-    get:
+    post:
       consumes:
       - application/x-www-form-urlencoded
       description: 微信登录
       parameters:
       - description: 腾讯返回的code码
-        in: query
+        in: formData
         name: code
         required: true
         type: string