From 9f817b5203f7f443299cb47a99260af9259cb196 Mon Sep 17 00:00:00 2001 From: shenjiachi Date: Fri, 8 Nov 2024 10:49:49 +0800 Subject: [PATCH] update --- .../public_platoon/hdl_basic.go | 9 ++++++ .../public_platoon/md_public_platoon.go | 6 ++++ app/router/router.go | 3 +- go.mod | 30 +++++++------------ 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/app/hdl/institutional_management/public_platoon/hdl_basic.go b/app/hdl/institutional_management/public_platoon/hdl_basic.go index 5a1e277..b3538f9 100644 --- a/app/hdl/institutional_management/public_platoon/hdl_basic.go +++ b/app/hdl/institutional_management/public_platoon/hdl_basic.go @@ -112,3 +112,12 @@ func UpdatePublicPlatoonBasic(c *gin.Context) { } e.OutSuc(c, "success", nil) } + +func GetRelationshipMap(c *gin.Context) { + var req *public_platoon.GetRelationshipMapReq + if err := c.ShouldBindJSON(&req); err != nil { + e.OutErr(c, e.ERR_INVALID_ARGS, err) + return + } + +} diff --git a/app/md/institutional_management/public_platoon/md_public_platoon.go b/app/md/institutional_management/public_platoon/md_public_platoon.go index 5398321..4e91d10 100644 --- a/app/md/institutional_management/public_platoon/md_public_platoon.go +++ b/app/md/institutional_management/public_platoon/md_public_platoon.go @@ -19,3 +19,9 @@ type UpdatePublicPlatoonBasicReq struct { SystemPunishReplaceValue int `json:"system_punish_replace_value"` IsSelfActiveGetTeamRevenue int `json:"is_self_active_get_team_revenue"` } + +type GetRelationshipMapReq struct { + Phone int `json:"phone"` + Uid int `json:"uid"` + InviteCode string `json:"invite_code"` +} diff --git a/app/router/router.go b/app/router/router.go index 6ae8716..515be17 100644 --- a/app/router/router.go +++ b/app/router/router.go @@ -60,7 +60,8 @@ func rInstitutionalManagement(r *gin.RouterGroup) { //制度管理 rPublicPlatoon := r.Group("/publicPlatoon") //公排设置 { rPublicPlatoon.GET("/getBasic", public_platoon.GetPublicPlatoonBasic) - rPublicPlatoon.PUT("/getBasic", public_platoon.UpdatePublicPlatoonBasic) + rPublicPlatoon.PUT("/updateBasic", public_platoon.UpdatePublicPlatoonBasic) + rPublicPlatoon.GET("/relationshipMap", public_platoon.GetRelationshipMap) } } diff --git a/go.mod b/go.mod index eb6ea65..58d2a42 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module applet go 1.19 replace code.fnuoos.com/EggPlanet/egg_models.git => E:/company/Egg/egg_models -//replace code.fnuoos.com/EggPlanet/egg_models.git => C:\Users\Administrator\GolandProjects\egg_models require ( github.com/boombuler/barcode v1.0.1 @@ -11,7 +10,7 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/forgoer/openssl v0.0.0-20201023062029-c3112b0c8700 github.com/gin-contrib/sessions v0.0.3 - github.com/gin-gonic/gin v1.9.1 + github.com/gin-gonic/gin v1.9.0 github.com/go-playground/locales v0.14.1 github.com/go-playground/universal-translator v0.18.1 github.com/go-playground/validator/v10 v10.20.0 @@ -42,10 +41,9 @@ require ( require ( filippo.io/edwards25519 v1.1.0 // indirect + github.com/BurntSushi/toml v1.4.0 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/PuerkitoBio/goquery v1.9.2 // indirect - github.com/PuerkitoBio/purell v1.2.1 // indirect - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/andybalholm/cascadia v1.3.2 // indirect github.com/antchfx/htmlquery v1.3.3 // indirect github.com/antchfx/xmlquery v1.4.2 // indirect @@ -54,13 +52,12 @@ require ( github.com/bytedance/sonic/loader v0.1.1 // indirect github.com/cloudwego/base64x v0.1.4 // indirect github.com/cloudwego/iasm v0.2.0 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-openapi/jsonpointer v0.21.0 // indirect - github.com/go-openapi/jsonreference v0.21.0 // indirect - github.com/go-openapi/spec v0.21.0 // indirect - github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.20.0 // indirect + github.com/go-openapi/spec v0.20.11 // indirect + github.com/go-openapi/swag v0.19.15 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -74,7 +71,6 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/kennygrant/sanitize v1.2.4 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect - github.com/kr/pretty v0.3.1 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -84,9 +80,7 @@ require ( github.com/onsi/gomega v1.19.0 // indirect github.com/pelletier/go-toml/v2 v2.2.1 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d // indirect - github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect github.com/streadway/amqp v1.0.0 // indirect github.com/syndtr/goleveldb v1.0.0 // indirect github.com/temoto/robotstxt v1.1.2 // indirect @@ -94,24 +88,20 @@ require ( github.com/tidwall/pretty v1.2.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect - github.com/urfave/cli/v2 v2.27.5 // indirect - github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect go.uber.org/atomic v1.7.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/arch v0.7.0 // indirect - golang.org/x/crypto v0.28.0 // indirect + golang.org/x/crypto v0.22.0 // indirect golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect - golang.org/x/net v0.30.0 // indirect + golang.org/x/net v0.24.0 // indirect golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.19.0 // indirect - golang.org/x/tools v0.26.0 // indirect + golang.org/x/text v0.15.0 // indirect + golang.org/x/tools v0.20.0 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect google.golang.org/appengine v1.4.0 // indirect google.golang.org/protobuf v1.34.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect gopkg.in/yaml.v3 v3.0.1 // indirect honnef.co/go/tools v0.0.1-2020.1.4 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect xorm.io/builder v0.3.13 // indirect )