Browse Source

update dep

tags/v1.10.0^2
astaxie 1 year ago
parent
commit
b05f8ace9e

+ 15
- 15
generate/swaggergen/g_docs.go View File

@@ -353,21 +353,21 @@ func analyseNewNamespace(ce *ast.CallExpr) (first string, others []ast.Expr) {
353 353
 func analyseNSInclude(baseurl string, ce *ast.CallExpr) string {
354 354
 	cname := ""
355 355
 	for _, p := range ce.Args {
356
-               var x *ast.SelectorExpr
357
-               var p1 interface{} = p
358
-               if ident, ok := p1.(*ast.Ident); ok {
359
-                       if assign, ok := ident.Obj.Decl.(*ast.AssignStmt); ok {
360
-                               if len(assign.Rhs) > 0 {
361
-                                       p1 = assign.Rhs[0].(*ast.UnaryExpr)
362
-                               }
363
-                       }
364
-               }
365
-               if _, ok := p1.(*ast.UnaryExpr); ok {
366
-                       x = p1.(*ast.UnaryExpr).X.(*ast.CompositeLit).Type.(*ast.SelectorExpr)
367
-               } else {
368
-                       beeLogger.Log.Warnf("Couldn't determine type\n")
369
-                       continue
370
-               }
356
+		var x *ast.SelectorExpr
357
+		var p1 interface{} = p
358
+		if ident, ok := p1.(*ast.Ident); ok {
359
+			if assign, ok := ident.Obj.Decl.(*ast.AssignStmt); ok {
360
+				if len(assign.Rhs) > 0 {
361
+					p1 = assign.Rhs[0].(*ast.UnaryExpr)
362
+				}
363
+			}
364
+		}
365
+		if _, ok := p1.(*ast.UnaryExpr); ok {
366
+			x = p1.(*ast.UnaryExpr).X.(*ast.CompositeLit).Type.(*ast.SelectorExpr)
367
+		} else {
368
+			beeLogger.Log.Warnf("Couldn't determine type\n")
369
+			continue
370
+		}
371 371
 		if v, ok := importlist[fmt.Sprint(x.X)]; ok {
372 372
 			cname = v + x.Sel.Name
373 373
 		}

+ 0
- 13
vendor/github.com/astaxie/beego/LICENSE View File

@@ -1,13 +0,0 @@
1
-Copyright 2014 astaxie
2
-
3
-Licensed under the Apache License, Version 2.0 (the "License");
4
-you may not use this file except in compliance with the License.
5
-You may obtain a copy of the License at
6
-
7
-    http://www.apache.org/licenses/LICENSE-2.0
8
-
9
-Unless required by applicable law or agreed to in writing, software
10
-distributed under the License is distributed on an "AS IS" BASIS,
11
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12
-See the License for the specific language governing permissions and
13
-limitations under the License.

+ 3
- 1
vendor/github.com/astaxie/beego/swagger/swagger.go View File

@@ -121,6 +121,8 @@ type Schema struct {
121 121
 	Type        string               `json:"type,omitempty" yaml:"type,omitempty"`
122 122
 	Items       *Schema              `json:"items,omitempty" yaml:"items,omitempty"`
123 123
 	Properties  map[string]Propertie `json:"properties,omitempty" yaml:"properties,omitempty"`
124
+	Enum        []interface{}        `json:"enum,omitempty" yaml:"enum,omitempty"`
125
+	Example     interface{}          `json:"example,omitempty" yaml:"example,omitempty"`
124 126
 }
125 127
 
126 128
 // Propertie are taken from the JSON Schema definition but their definitions were adjusted to the Swagger Specification
@@ -130,7 +132,7 @@ type Propertie struct {
130 132
 	Description          string               `json:"description,omitempty" yaml:"description,omitempty"`
131 133
 	Default              interface{}          `json:"default,omitempty" yaml:"default,omitempty"`
132 134
 	Type                 string               `json:"type,omitempty" yaml:"type,omitempty"`
133
-	Example              string               `json:"example,omitempty" yaml:"example,omitempty"`
135
+	Example              interface{}          `json:"example,omitempty" yaml:"example,omitempty"`
134 136
 	Required             []string             `json:"required,omitempty" yaml:"required,omitempty"`
135 137
 	Format               string               `json:"format,omitempty" yaml:"format,omitempty"`
136 138
 	ReadOnly             bool                 `json:"readOnly,omitempty" yaml:"readOnly,omitempty"`

+ 3
- 3
vendor/vendor.json View File

@@ -3,10 +3,10 @@
3 3
 	"ignore": "test",
4 4
 	"package": [
5 5
 		{
6
-			"checksumSHA1": "OeOvZ+3A1tRBdMD8GuS6R9zcnqA=",
6
+			"checksumSHA1": "/ffb74fNK251iTEebGjybfFBAbs=",
7 7
 			"path": "github.com/astaxie/beego/swagger",
8
-			"revision": "323a1c4214101331a4b71922c23d19b7409ac71f",
9
-			"revisionTime": "2017-03-06T13:59:04Z"
8
+			"revision": "a09bafbf2ab483742b17bb352f95dbc0a597e720",
9
+			"revisionTime": "2018-07-21T07:55:28Z"
10 10
 		},
11 11
 		{
12 12
 			"checksumSHA1": "epd3Y7nD7QVzTW0ppwK+q4pKo/4=",

Loading…
Cancel
Save