From 5242f0ee0ccf530975a5014a78c9b64f5ed17bb6 Mon Sep 17 00:00:00 2001 From: wubin Date: Fri, 11 Sep 2020 11:28:42 +0800 Subject: [PATCH 1/2] update --- .../SysLoginpersonController.go | 35 +++++++++++++++++++ .../SysLoginpersonProtoService.go | 5 +++ .../SysLoginpersonProtoServiceRpc.go | 21 +++++++++++ 3 files changed, 61 insertions(+) diff --git a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonController/SysLoginpersonController.go b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonController/SysLoginpersonController.go index 47733287..fade3ce6 100644 --- a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonController/SysLoginpersonController.go +++ b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonController/SysLoginpersonController.go @@ -27,6 +27,8 @@ func Routers(r *gin.RouterGroup) { rr.GET("/RemoveCookie", RemoveCookie) rr.POST("/UpdateLoginPassWordInfo", UpdateLoginPassWordInfo) + rr.GET("/GetBindAuthorizationInfo", GetBindAuthorizationInfo) + return } @@ -439,3 +441,36 @@ func UpdateLoginPassWordInfo(c *gin.Context) { Message: r.Message, }) } + + +// @Summary 获取已绑定的第三方授权 +// @Description 获取已绑定的第三方授权 +// @Tags 登录信息 +// @Accept application/x-www-form-urlencoded +// @Produce json +// @Success 200 {object} Model.Res +// @Router /base/loginperson/GetBindAuthorizationInfo [get] +// @X-Sort [12] +func GetBindAuthorizationInfo(c *gin.Context) { + personId, err := c.Cookie("person_id") + if err != nil { + c.JSON(http.StatusOK, Model.Res{ + Success: false, + Message: "未获取到Cookie中的人员编码！", + }) + return + } + r, err := SysLoginpersonService.GetBindAuthorizationInfo(personId) + if err != nil { + c.JSON(http.StatusOK, Model.Res{ + Success: false, + Message: "调用RPC服务失败！", + }) + return + } + c.JSON(http.StatusOK, Model.Res{ + Success: r.Success, + Message: r.Message, + List: CommonUtil.ConvertJsonStringToMapArray(r.List), + }) +} \ No newline at end of file diff --git a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoService.go b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoService.go index 9845027f..82ba80ad 100644 --- a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoService.go +++ b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoService.go @@ -53,3 +53,8 @@ func UpdateLoginPassWordInfo(personId string, identityId int32, oldPassWord stri Reply, err := UpdateLoginPassWord(SysLoginpersonProto.UpdateLoginPassWordArg{PersonId: personId, IdentityId: identityId, OldPassWord: oldPassWord, NewPassWord: newPassWord, ActionPersonId: actionPersonId, ActionIpAddress: actionIpAddress}) return Reply, err } + +func GetBindAuthorizationInfo(personId string) (*SysLoginpersonProto.Reply, error) { + Reply, err := GetBindAuthorization(SysLoginpersonProto.GetBindAuthorizationArg{PersonId: personId}) + return Reply, err +} diff --git a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoServiceRpc.go b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoServiceRpc.go index feab54e8..2caa78a9 100644 --- a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoServiceRpc.go +++ b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoServiceRpc.go @@ -183,5 +183,26 @@ func UpdateLoginPassWord(updateLoginPassWordArg SysLoginpersonProto.UpdateLoginP LogUtil.Error("修改登录密码错误: ", err.Error()) } return Reply, err +} +/** +功能：获取已绑定的第三方授权 +作者：吴缤 +时间：2020-09-09 11:30:20 +*/ +func GetBindAuthorization(arg SysLoginpersonProto.GetBindAuthorizationArg) (*SysLoginpersonProto.Reply, error) { + //1、准备动作：连接服务器 + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + conn := GRpcUtil.GetConnection() + if conn == nil { + return nil, errors.New("RPC服务未启动！") + } + //2、业务传参 + c := SysLoginpersonProto.NewSysLoginpersonManageClient(conn) + Reply, err := c.GetBindAuthorization(ctx, &arg) + if err != nil { + LogUtil.Error("获取已绑定的第三方授权错误: ", err.Error()) + } + return Reply, err } From 734ca912f6aac1c9652032185d652da4e231c6c1 Mon Sep 17 00:00:00 2001 From: wubin Date: Mon, 14 Sep 2020 08:18:58 +0800 Subject: [PATCH 2/2] update --- .../SysLoginpersonController.go | 42 +++++++++++++++++-- .../SysLoginpersonProtoService.go | 5 +++ .../SysLoginpersonProtoServiceRpc.go | 22 ++++++++++ dsBaseWeb/Utils/CommonUtil/CommonUtil.go | 1 + 4 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonController/SysLoginpersonController.go b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonController/SysLoginpersonController.go index fade3ce6..a223e8a7 100644 --- a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonController/SysLoginpersonController.go +++ b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonController/SysLoginpersonController.go @@ -28,6 +28,7 @@ func Routers(r *gin.RouterGroup) { rr.POST("/UpdateLoginPassWordInfo", UpdateLoginPassWordInfo) rr.GET("/GetBindAuthorizationInfo", GetBindAuthorizationInfo) + rr.POST("/UnbindAuthorizationInfo", UnbindAuthorizationInfo) return } @@ -442,7 +443,6 @@ func UpdateLoginPassWordInfo(c *gin.Context) { }) } - // @Summary 获取已绑定的第三方授权 // @Description 获取已绑定的第三方授权 // @Tags 登录信息 @@ -451,7 +451,7 @@ func UpdateLoginPassWordInfo(c *gin.Context) { // @Success 200 {object} Model.Res // @Router /base/loginperson/GetBindAuthorizationInfo [get] // @X-Sort [12] -func GetBindAuthorizationInfo(c *gin.Context) { +func GetBindAuthorizationInfo(c *gin.Context) { personId, err := c.Cookie("person_id") if err != nil { c.JSON(http.StatusOK, Model.Res{ @@ -471,6 +471,40 @@ func GetBindAuthorizationInfo(c *gin.Context) { c.JSON(http.StatusOK, Model.Res{ Success: r.Success, Message: r.Message, - List: CommonUtil.ConvertJsonStringToMapArray(r.List), + List: CommonUtil.ConvertStringArrayToArray(r.List), }) -} \ No newline at end of file +} + +// @Summary 解除绑定第三方授权 +// @Description 解除绑定第三方授权 +// @Tags 登录信息 +// @Accept application/x-www-form-urlencoded +// @Produce json +// @Param typeName formData string true "第三方授权类型名 qq:QQ wx:微信" +// @Success 200 {object} Model.Res +// @Router /base/loginperson/UnbindAuthorizationInfo [post] +// @X-Sort [13] +func UnbindAuthorizationInfo(c *gin.Context) { + typeName := c.PostForm("typeName") + + personId, err := c.Cookie("person_id") + if err != nil { + c.JSON(http.StatusOK, Model.Res{ + Success: false, + Message: "未获取到Cookie中的人员编码！", + }) + return + } + r, err := SysLoginpersonService.UnbindAuthorizationInfo(personId, typeName) + if err != nil { + c.JSON(http.StatusOK, Model.Res{ + Success: false, + Message: "调用RPC服务失败！", + }) + return + } + c.JSON(http.StatusOK, Model.Res{ + Success: r.Success, + Message: r.Message, + }) +} diff --git a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoService.go b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoService.go index 82ba80ad..99d10bd0 100644 --- a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoService.go +++ b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoService.go @@ -58,3 +58,8 @@ func GetBindAuthorizationInfo(personId string) (*SysLoginpersonProto.Reply, erro Reply, err := GetBindAuthorization(SysLoginpersonProto.GetBindAuthorizationArg{PersonId: personId}) return Reply, err } + +func UnbindAuthorizationInfo(personId string, typeName string) (*SysLoginpersonProto.Reply, error) { + Reply, err := UnbindAuthorization(SysLoginpersonProto.UnbindAuthorizationArg{PersonId: personId, TypeName: typeName}) + return Reply, err +} diff --git a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoServiceRpc.go b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoServiceRpc.go index 2caa78a9..0f8942ea 100644 --- a/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoServiceRpc.go +++ b/dsBaseWeb/Business/SysLoginPerson/SysLoginpersonService/SysLoginpersonProtoServiceRpc.go @@ -206,3 +206,25 @@ func GetBindAuthorization(arg SysLoginpersonProto.GetBindAuthorizationArg) (*Sys } return Reply, err } + +/** +功能：解除绑定第三方授权 +作者：吴缤 +时间：2020-09-14 11:30:20 +*/ +func UnbindAuthorization(arg SysLoginpersonProto.UnbindAuthorizationArg) (*SysLoginpersonProto.Reply, error) { + //1、准备动作：连接服务器 + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + conn := GRpcUtil.GetConnection() + if conn == nil { + return nil, errors.New("RPC服务未启动！") + } + //2、业务传参 + c := SysLoginpersonProto.NewSysLoginpersonManageClient(conn) + Reply, err := c.UnbindAuthorization(ctx, &arg) + if err != nil { + LogUtil.Error("获取已绑定的第三方授权错误: ", err.Error()) + } + return Reply, err +} diff --git a/dsBaseWeb/Utils/CommonUtil/CommonUtil.go b/dsBaseWeb/Utils/CommonUtil/CommonUtil.go index 93ad9677..e09ed27d 100644 --- a/dsBaseWeb/Utils/CommonUtil/CommonUtil.go +++ b/dsBaseWeb/Utils/CommonUtil/CommonUtil.go @@ -509,6 +509,7 @@ func ConvertJsonStringToMapArray(data string) []map[string]interface{} { func ConvertStringArrayToArray(data string) []string { data = strings.ReplaceAll(data, "[", "") data = strings.ReplaceAll(data, "]", "") + data = strings.ReplaceAll(data, "\"", "") if len(data) > 0 { return strings.Split(data, ",") } else {