From 38281d9922432107ee3f5c9f7f282f9312e63750 Mon Sep 17 00:00:00 2001 From: huanghai <10402852@qq.com> Date: Wed, 1 Jul 2020 08:13:04 +0800 Subject: [PATCH] 'commit' --- dsBaseWeb/docs/docs.go | 346 ++++++++++++++++++------------------ dsBaseWeb/docs/swagger.json | 220 +++++++++++------------ dsBaseWeb/go.mod | 19 +- dsBaseWeb/go.sum | 30 ++++ dsBaseWeb/main.go | 5 + 5 files changed, 330 insertions(+), 290 deletions(-) diff --git a/dsBaseWeb/docs/docs.go b/dsBaseWeb/docs/docs.go index 7249ef94..ae6ecd66 100644 --- a/dsBaseWeb/docs/docs.go +++ b/dsBaseWeb/docs/docs.go @@ -1,18 +1,18 @@ -// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT -// This file was generated by swaggo/swag at -// 2020-05-20 14:45:12.3054401 +0800 CST m=+0.096772501 - -package docs - -import ( - "bytes" - "encoding/json" - "strings" - - "github.com/alecthomas/template" - "github.com/swaggo/swag" -) - +// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT +// This file was generated by swaggo/swag at +// 2020-05-20 14:45:12.3054401 +0800 CST m=+0.096772501 + +package docs + +import ( + "bytes" + "encoding/json" + "strings" + + "github.com/alecthomas/template" + "github.com/swaggo/swag" +) + var doc = `{ "definitions": { "Model.Res": { @@ -1897,6 +1897,49 @@ var doc = `{ "version": "1.0" }, "paths": { + "/base/business/DeleteBaseBusiness": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "删除业务系统信息", + "parameters": [ + { + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", + "required": true, + "type": "string" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "删除业务系统信息", + "tags": [ + "业务系统维护" + ], + "x-emptylimit": [ + "businessCode" + ], + "x-lengthlimit": [ + { + "businessCode": "6,6" + } + ], + "x-rolelimit": [ + "1" + ] + } + }, "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ @@ -1951,19 +1994,26 @@ var doc = `{ ] } }, - "/base/business/DeleteBaseBusiness": { - "post": { + "/base/business/PageBaseBusiness": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除业务系统信息", + "description": "获取业务系统信息(列表)", "parameters": [ { - "description": "业务系统编码", - "in": "formData", - "name": "businessCode", + "description": "第几页", + "in": "query", + "name": "page", "required": true, - "type": "string" + "type": "integer" + }, + { + "description": "一页显示多少条", + "in": "query", + "name": "limit", + "required": true, + "type": "integer" } ], "produces": [ @@ -1977,17 +2027,17 @@ var doc = `{ } } }, - "summary": "删除业务系统信息", + "summary": "获取业务系统信息(列表)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "page", + "limit" ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - } + "x-intlimit": [ + "page", + "limit" ], "x-rolelimit": [ "1" @@ -2091,56 +2141,6 @@ var doc = `{ ] } }, - "/base/business/PageBaseBusiness": { - "get": { - "consumes": [ - "application/x-www-form-urlencoded" - ], - "description": "获取业务系统信息(列表)", - "parameters": [ - { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", - "in": "query", - "name": "limit", - "required": true, - "type": "integer" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Model.Res" - } - } - }, - "summary": "获取业务系统信息(列表)", - "tags": [ - "业务系统维护" - ], - "x-emptylimit": [ - "page", - "limit" - ], - "x-intlimit": [ - "page", - "limit" - ], - "x-rolelimit": [ - "1" - ] - } - }, "/base/global/PageGlobalInfo": { "get": { "consumes": [ @@ -3466,12 +3466,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3498,7 +3498,7 @@ var doc = `{ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -3523,12 +3523,12 @@ var doc = `{ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3555,7 +3555,7 @@ var doc = `{ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -8756,16 +8756,30 @@ var doc = `{ ] } }, - "/base/area/DeleteGovArea": { - "post": { + "/base/area/PageGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除行政区划信息", + "description": "获取行政区划信息(列表)", "parameters": [ { - "description": "区域代码", - "in": "formData", + "description": "第几页", + "in": "query", + "name": "page", + "required": true, + "type": "integer" + }, + { + "description": "一页显示多少条", + "in": "query", + "name": "limit", + "required": true, + "type": "integer" + }, + { + "description": "行政区划码", + "in": "query", "name": "areaCode", "required": true, "type": "string" @@ -8778,15 +8792,22 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Model.Res" + "$ref": "#/definitions/base.area.PageGovArea" } } }, - "summary": "删除行政区划信息", + "summary": "获取行政区划信息(列表)", "tags": [ "行政区划" ], "x-emptylimit": [ + "page", + "limit", + "areaCode" + ], + "x-intlimit": [ + "page", + "limit", "areaCode" ], "x-lengthlimit": [ @@ -8802,19 +8823,22 @@ var doc = `{ "5", "6", "7" + ], + "x-tablename": [ + "t_gov_area" ] } }, - "/base/area/GetGovArea": { - "get": { + "/base/area/DeleteGovArea": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(单条)", + "description": "删除行政区划信息", "parameters": [ { - "description": "行政区划码", - "in": "query", + "description": "区域代码", + "in": "formData", "name": "areaCode", "required": true, "type": "string" @@ -8831,16 +8855,13 @@ var doc = `{ } } }, - "summary": "获取行政区划信息(单条)", + "summary": "删除行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ "areaCode" ], - "x-intlimit": [ - "areaCode" - ], "x-lengthlimit": [ { "areaCode": "6,6" @@ -8857,27 +8878,13 @@ var doc = `{ ] } }, - "/base/area/PageGovArea": { + "/base/area/GetGovArea": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(列表)", + "description": "获取行政区划信息(单条)", "parameters": [ - { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", - "in": "query", - "name": "limit", - "required": true, - "type": "integer" - }, { "description": "行政区划码", "in": "query", @@ -8893,22 +8900,18 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.area.PageGovArea" + "$ref": "#/definitions/Model.Res" } } }, - "summary": "获取行政区划信息(列表)", + "summary": "获取行政区划信息(单条)", "tags": [ "行政区划" ], "x-emptylimit": [ - "page", - "limit", "areaCode" ], "x-intlimit": [ - "page", - "limit", "areaCode" ], "x-lengthlimit": [ @@ -8924,9 +8927,6 @@ var doc = `{ "5", "6", "7" - ], - "x-tablename": [ - "t_gov_area" ] } }, @@ -9019,51 +9019,51 @@ var doc = `{ } }, "swagger": "2.0" -}` - -type swaggerInfo struct { - Version string - Host string - BasePath string - Schemes []string - Title string - Description string -} - -// SwaggerInfo holds exported Swagger Info so clients can modify it -var SwaggerInfo = swaggerInfo{ - Version: "1.0", - Host: "127.0.0.1:8002", - BasePath: "", - Schemes: []string{}, - Title: "基础数据API", - Description: "分布式，大并发，高可用", -} - -type s struct{} - -func (s *s) ReadDoc() string { - sInfo := SwaggerInfo - sInfo.Description = strings.Replace(sInfo.Description, "\n", "\\n", -1) - - t, err := template.New("swagger_info").Funcs(template.FuncMap{ - "marshal": func(v interface{}) string { - a, _ := json.Marshal(v) - return string(a) - }, - }).Parse(doc) - if err != nil { - return doc - } - - var tpl bytes.Buffer - if err := t.Execute(&tpl, sInfo); err != nil { - return doc - } - - return tpl.String() -} - -func init() { - swag.Register(swag.Name, &s{}) -} +}` + +type swaggerInfo struct { + Version string + Host string + BasePath string + Schemes []string + Title string + Description string +} + +// SwaggerInfo holds exported Swagger Info so clients can modify it +var SwaggerInfo = swaggerInfo{ + Version: "1.0", + Host: "127.0.0.1:8002", + BasePath: "", + Schemes: []string{}, + Title: "基础数据API", + Description: "分布式，大并发，高可用", +} + +type s struct{} + +func (s *s) ReadDoc() string { + sInfo := SwaggerInfo + sInfo.Description = strings.Replace(sInfo.Description, "\n", "\\n", -1) + + t, err := template.New("swagger_info").Funcs(template.FuncMap{ + "marshal": func(v interface{}) string { + a, _ := json.Marshal(v) + return string(a) + }, + }).Parse(doc) + if err != nil { + return doc + } + + var tpl bytes.Buffer + if err := t.Execute(&tpl, sInfo); err != nil { + return doc + } + + return tpl.String() +} + +func init() { + swag.Register(swag.Name, &s{}) +} diff --git a/dsBaseWeb/docs/swagger.json b/dsBaseWeb/docs/swagger.json index 1f49cdf4..151dcbbe 100644 --- a/dsBaseWeb/docs/swagger.json +++ b/dsBaseWeb/docs/swagger.json @@ -1882,6 +1882,49 @@ "version": "1.0" }, "paths": { + "/base/business/DeleteBaseBusiness": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "删除业务系统信息", + "parameters": [ + { + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", + "required": true, + "type": "string" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "删除业务系统信息", + "tags": [ + "业务系统维护" + ], + "x-emptylimit": [ + "businessCode" + ], + "x-lengthlimit": [ + { + "businessCode": "6,6" + } + ], + "x-rolelimit": [ + "1" + ] + } + }, "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ @@ -1936,19 +1979,26 @@ ] } }, - "/base/business/DeleteBaseBusiness": { - "post": { + "/base/business/PageBaseBusiness": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除业务系统信息", + "description": "获取业务系统信息(列表)", "parameters": [ { - "description": "业务系统编码", - "in": "formData", - "name": "businessCode", + "description": "第几页", + "in": "query", + "name": "page", "required": true, - "type": "string" + "type": "integer" + }, + { + "description": "一页显示多少条", + "in": "query", + "name": "limit", + "required": true, + "type": "integer" } ], "produces": [ @@ -1962,17 +2012,17 @@ } } }, - "summary": "删除业务系统信息", + "summary": "获取业务系统信息(列表)", "tags": [ "业务系统维护" ], "x-emptylimit": [ - "businessCode" + "page", + "limit" ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - } + "x-intlimit": [ + "page", + "limit" ], "x-rolelimit": [ "1" @@ -2076,56 +2126,6 @@ ] } }, - "/base/business/PageBaseBusiness": { - "get": { - "consumes": [ - "application/x-www-form-urlencoded" - ], - "description": "获取业务系统信息(列表)", - "parameters": [ - { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", - "in": "query", - "name": "limit", - "required": true, - "type": "integer" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Model.Res" - } - } - }, - "summary": "获取业务系统信息(列表)", - "tags": [ - "业务系统维护" - ], - "x-emptylimit": [ - "page", - "limit" - ], - "x-intlimit": [ - "page", - "limit" - ], - "x-rolelimit": [ - "1" - ] - } - }, "/base/global/PageGlobalInfo": { "get": { "consumes": [ @@ -3451,12 +3451,12 @@ ] } }, - "/base/student/ExportStudentExcel": { + "/base/student/ExportStudentAccountExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生信息到EXCEL", + "description": "导出本校学生账号信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3483,7 +3483,7 @@ } } }, - "summary": "导出本校学生信息到EXCEL", + "summary": "导出本校学生账号信息到EXCEL", "tags": [ "学生信息" ], @@ -3508,12 +3508,12 @@ ] } }, - "/base/student/ExportStudentAccountExcel": { + "/base/student/ExportStudentExcel": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "导出本校学生账号信息到EXCEL", + "description": "导出本校学生信息到EXCEL", "parameters": [ { "description": "学校ID", @@ -3540,7 +3540,7 @@ } } }, - "summary": "导出本校学生账号信息到EXCEL", + "summary": "导出本校学生信息到EXCEL", "tags": [ "学生信息" ], @@ -8741,16 +8741,30 @@ ] } }, - "/base/area/DeleteGovArea": { - "post": { + "/base/area/PageGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除行政区划信息", + "description": "获取行政区划信息(列表)", "parameters": [ { - "description": "区域代码", - "in": "formData", + "description": "第几页", + "in": "query", + "name": "page", + "required": true, + "type": "integer" + }, + { + "description": "一页显示多少条", + "in": "query", + "name": "limit", + "required": true, + "type": "integer" + }, + { + "description": "行政区划码", + "in": "query", "name": "areaCode", "required": true, "type": "string" @@ -8763,15 +8777,22 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/Model.Res" + "$ref": "#/definitions/base.area.PageGovArea" } } }, - "summary": "删除行政区划信息", + "summary": "获取行政区划信息(列表)", "tags": [ "行政区划" ], "x-emptylimit": [ + "page", + "limit", + "areaCode" + ], + "x-intlimit": [ + "page", + "limit", "areaCode" ], "x-lengthlimit": [ @@ -8787,19 +8808,22 @@ "5", "6", "7" + ], + "x-tablename": [ + "t_gov_area" ] } }, - "/base/area/GetGovArea": { - "get": { + "/base/area/DeleteGovArea": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(单条)", + "description": "删除行政区划信息", "parameters": [ { - "description": "行政区划码", - "in": "query", + "description": "区域代码", + "in": "formData", "name": "areaCode", "required": true, "type": "string" @@ -8816,16 +8840,13 @@ } } }, - "summary": "获取行政区划信息(单条)", + "summary": "删除行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ "areaCode" ], - "x-intlimit": [ - "areaCode" - ], "x-lengthlimit": [ { "areaCode": "6,6" @@ -8842,27 +8863,13 @@ ] } }, - "/base/area/PageGovArea": { + "/base/area/GetGovArea": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(列表)", + "description": "获取行政区划信息(单条)", "parameters": [ - { - "description": "第几页", - "in": "query", - "name": "page", - "required": true, - "type": "integer" - }, - { - "description": "一页显示多少条", - "in": "query", - "name": "limit", - "required": true, - "type": "integer" - }, { "description": "行政区划码", "in": "query", @@ -8878,22 +8885,18 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.area.PageGovArea" + "$ref": "#/definitions/Model.Res" } } }, - "summary": "获取行政区划信息(列表)", + "summary": "获取行政区划信息(单条)", "tags": [ "行政区划" ], "x-emptylimit": [ - "page", - "limit", "areaCode" ], "x-intlimit": [ - "page", - "limit", "areaCode" ], "x-lengthlimit": [ @@ -8909,9 +8912,6 @@ "5", "6", "7" - ], - "x-tablename": [ - "t_gov_area" ] } }, diff --git a/dsBaseWeb/go.mod b/dsBaseWeb/go.mod index 14065d15..f8b3cd1b 100644 --- a/dsBaseWeb/go.mod +++ b/dsBaseWeb/go.mod @@ -15,11 +15,12 @@ require ( github.com/atotto/clipboard v0.1.2 // indirect github.com/bluesky335/IDCheck v0.0.0-20200319021444-08ee85bfcb7b github.com/bndr/gotabulate v1.1.2 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/fatih/structs v1.1.0 // indirect github.com/frankban/quicktest v1.9.0 // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect github.com/gin-gonic/gin v1.6.3 - github.com/go-openapi/spec v0.19.7 // indirect + github.com/go-openapi/spec v0.19.8 // indirect github.com/go-openapi/swag v0.19.9 // indirect github.com/go-playground/validator/v10 v10.3.0 // indirect github.com/go-sql-driver/mysql v1.5.0 @@ -28,6 +29,7 @@ require ( github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 // indirect github.com/holdno/snowFlakeByGo v0.0.0-20180510033652-d23f8a8cadd7 // indirect github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 + github.com/json-iterator/go v1.1.10 // indirect github.com/klauspost/compress v1.10.5 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/lunny/log v0.0.0-20160921050905-7887c61bf0de // indirect @@ -41,22 +43,25 @@ require ( github.com/smartystreets/assertions v1.1.0 // indirect github.com/smartystreets/goconvey v1.6.4 // indirect github.com/swaggo/gin-swagger v1.2.0 - github.com/swaggo/swag v1.6.5 + github.com/swaggo/swag v1.6.7 github.com/syndtr/goleveldb v1.0.0 // indirect github.com/tealeg/xlsx v1.0.5 // indirect github.com/tidwall/gjson v1.6.0 github.com/tidwall/pretty v1.0.1 // indirect github.com/tracer0tong/kafkalogrus v0.0.0-20180816014403-290bb4d4d549 + github.com/urfave/cli v1.22.4 // indirect + github.com/urfave/cli/v2 v2.2.0 // indirect github.com/valyala/fasthttp v1.12.0 github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be // indirect github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31 github.com/xormplus/xorm v0.0.0-20200514184607-0f37421d8714 - golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc - golang.org/x/net v0.0.0-20200602114024-627f9648deb9 // indirect - golang.org/x/sys v0.0.0-20200523222454-059865788121 // indirect - golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59 + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 + golang.org/x/net v0.0.0-20200625001655-4c5254603344 // indirect + golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae // indirect + golang.org/x/text v0.3.3 // indirect + golang.org/x/tools v0.0.0-20200630223951-c138986dd9b9 google.golang.org/grpc v1.29.1 - google.golang.org/protobuf v1.24.0 + google.golang.org/protobuf v1.25.0 gopkg.in/flosch/pongo2.v3 v3.0.0-20141028000813-5e81b817a0c4 // indirect gopkg.in/ini.v1 v1.55.0 gopkg.in/yaml.v2 v2.3.0 // indirect diff --git a/dsBaseWeb/go.sum b/dsBaseWeb/go.sum index 7634b6f9..31b181f5 100644 --- a/dsBaseWeb/go.sum +++ b/dsBaseWeb/go.sum @@ -41,7 +41,10 @@ github.com/bndr/gotabulate v1.1.2/go.mod h1:0+8yUgaPTtLRTjf49E8oju7ojpU11YmXyvq1 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -97,6 +100,8 @@ github.com/go-openapi/spec v0.19.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsd github.com/go-openapi/spec v0.19.4/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.19.7 h1:0xWSeMd35y5avQAThZR2PkEuqSosoS5t6gDH4L8n11M= github.com/go-openapi/spec v0.19.7/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= +github.com/go-openapi/spec v0.19.8 h1:qAdZLh1r6QF/hI/gTq+TJTvsQUodZsM7KLqkAJdiJNg= +github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/swag v0.17.0 h1:iqrgMg7Q7SvtbWLlltPrkMs0UBJI6oTSs79JFRUi880= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -142,6 +147,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00 h1:l5lAOZEym3oK3SQ2HBHWsJUfbNBiTXJDeW2QDxw9AQ0= @@ -159,6 +165,8 @@ github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/klauspost/compress v1.9.8 h1:VMAMUUOh+gaxKTMk+zqbjsSjsIcUcL/LF4o63i82QyA= @@ -226,9 +234,11 @@ github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 h1:dY6ETXrvDG7 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.5.0 h1:1N5EYkVAPEywqZRJd7cwnRtCb6xJx7NH3T3WUTF980Q= github.com/sirupsen/logrus v1.5.0/go.mod h1:+F7Ogzej0PZc/94MaYx/nvG9jOFMD2osvC3s+Squfpo= @@ -253,6 +263,8 @@ github.com/swaggo/swag v1.5.1 h1:2Agm8I4K5qb00620mHq0VJ05/KT4FtmALPIcQR9lEZM= github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y= github.com/swaggo/swag v1.6.5 h1:2C+t+xyK6p1sujqncYO/VnMvPZcBJjNdKKyxbOdAW8o= github.com/swaggo/swag v1.6.5/go.mod h1:Y7ZLSS0d0DdxhWGVhQdu+Bu1QhaF5k0RD7FKdiAykeY= +github.com/swaggo/swag v1.6.7 h1:e8GC2xDllJZr3omJkm9YfmK0Y56+rMO3cg0JBKNz09s= +github.com/swaggo/swag v1.6.7/go.mod h1:xDhTyuFIujYiN3DKWC/H/83xcfHp+UE/IzWWampG7Zc= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE= @@ -276,7 +288,14 @@ github.com/ugorji/go/codec v1.1.5-pre/go.mod h1:tULtS6Gy1AE1yCENaw4Vb//HLH5njI2t github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= +github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/urfave/cli/v2 v2.1.1 h1:Qt8FeAtxE/vfdrLmR3rxR6JRE0RoVmbXu8+6kZtYU4k= +github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= +github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4= +github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.12.0 h1:TsB9qkSeiMXB40ELWWSRMjlsE+8IkqXHcs01y2d9aw0= @@ -300,6 +319,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc h1:ZGI/fILM2+ueot/UixBSoj9188jCAxVHEZEGhqq67I4= golang.org/x/crypto v0.0.0-20200427165652-729f1e841bcc/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a h1:gHevYm0pO4QUbwy8Dmdr01R5r1BuKtfYqRqF0h/Cbh0= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -335,6 +355,8 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f h1:QBjCr1Fz5kw158VqdE9JfI9cJ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM= golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -360,9 +382,13 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9 h1:YTzHMGlqJu67/uEo1lBv0n3wB golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae h1:Ih9Yo4hSPImZOpfGuA4bR/ORKTAbhZo2AbWNRCnevdo= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -376,6 +402,8 @@ golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200428021058-7ae4988eb4d9 h1:nSSuQTxk9hjYf2koTs9mHZtYm2pu7Yt8WuIeKOrCWNI= golang.org/x/tools v0.0.0-20200428021058-7ae4988eb4d9/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200630223951-c138986dd9b9 h1:CrrjeBLnUL9WPTAjIqIPdfEAAs5XNY+8A4/CNxRqmbI= +golang.org/x/tools v0.0.0-20200630223951-c138986dd9b9/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= @@ -405,6 +433,8 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= diff --git a/dsBaseWeb/main.go b/dsBaseWeb/main.go index 19bc733b..8f0c11d4 100644 --- a/dsBaseWeb/main.go +++ b/dsBaseWeb/main.go @@ -12,6 +12,11 @@ import ( ginSwagger "github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger/swaggerFiles" + //go get -u -v github.com/gin-gonic/gin + //go get -u github.com/swaggo/swag/cmd/swag + //go get -u -v github.com/swaggo/gin-swagger + //go get -u -v github.com/swaggo/gin-swagger/swaggerFiles + //这个不导入，会导致swagger的页面出错：Failed to load spec //http://www.freesion.com/article/3571182257/ _ "dsBaseWeb/docs"