From 2c40265ea8879baffdc69a888cd4ab2fac2a5a0d Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Wed, 5 Aug 2020 15:56:47 +0800
Subject: [PATCH] 'commit'

---
 dsSso/Controller/ControllerOauth2/ControllerOauth2.go | 7 +++++++
 dsSso/docs/docs.go                                    | 4 ++--
 dsSso/docs/swagger.json                               | 4 ++--
 dsSso/docs/swagger.yaml                               | 4 ++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dsSso/Controller/ControllerOauth2/ControllerOauth2.go b/dsSso/Controller/ControllerOauth2/ControllerOauth2.go
index 2164b11c..30a87a0a 100644
--- a/dsSso/Controller/ControllerOauth2/ControllerOauth2.go
+++ b/dsSso/Controller/ControllerOauth2/ControllerOauth2.go
@@ -697,6 +697,13 @@ func bindWxUser(context *gin.Context) {
 		return
 	}
 	decryptPwd, err := RsaUtil.RsaDecrypt(b)
+	if err != nil {
+		context.JSON(http.StatusOK, Model.Res{
+			Code: http.StatusNotImplemented,
+			Msg:  "密码不是系统允许的加密方式！",
+		})
+		return
+	}
 	//是否能登录
 	success, identityId, personId, _, _, wxOpenId := ServiceLoginPerson.Login(username, string(decryptPwd), ip)
 	//2、如果匹配了，那么这个登录名是不是已经绑定过openId了
diff --git a/dsSso/docs/docs.go b/dsSso/docs/docs.go
index fc9baae4..1f4adced 100644
--- a/dsSso/docs/docs.go
+++ b/dsSso/docs/docs.go
@@ -230,8 +230,8 @@ var doc = `{
                     },
                     {
                         "type": "string",
-                        "description": "openid",
-                        "name": "openid",
+                        "description": "openId",
+                        "name": "openId",
                         "in": "formData",
                         "required": true
                     }
diff --git a/dsSso/docs/swagger.json b/dsSso/docs/swagger.json
index 71b24dd4..eaddccae 100644
--- a/dsSso/docs/swagger.json
+++ b/dsSso/docs/swagger.json
@@ -214,8 +214,8 @@
                     },
                     {
                         "type": "string",
-                        "description": "openid",
-                        "name": "openid",
+                        "description": "openId",
+                        "name": "openId",
                         "in": "formData",
                         "required": true
                     }
diff --git a/dsSso/docs/swagger.yaml b/dsSso/docs/swagger.yaml
index 282e4832..d88930bc 100644
--- a/dsSso/docs/swagger.yaml
+++ b/dsSso/docs/swagger.yaml
@@ -176,9 +176,9 @@ paths:
         name: password
         required: true
         type: string
-      - description: openid
+      - description: openId
         in: formData
-        name: openid
+        name: openId
         required: true
         type: string
       produces: