aa

controllers/auth2.go

@@ -354,21 +354,18 @@ type UserInfoWithWeixin struct {
 // @Param	iv				formData			string		true	"iv"
 // @Param	jsCode			formData			string		false	"小程序jsCode"
 // @Param	authType		formData			string		false	"authType"
+// @Param	appID			formData			string		false	"appID"
 // @Success 200 {object} controllers.CallResult
 // @Failure 200 {object} controllers.CallResult
 // @router /GetUserByMiniInfo [post]
 func (c *Auth2Controller) GetUserByMiniInfo() {
 	c.callGetUserByMiniInfo(func(params *tAuth2GetUserByMiniInfoParams) (retVal interface{}, errCode string, err error) {
 		authInfo := &auth2.AuthInfo{}
-		// result := api.Cacher.Get(params.Token)
-		// utils.Map2StructByJson(result.(map[string]interface{}), &authInfo, false)
-		jsCode := ""
-		// if params.AuthType == weixin.AuthTypeMini {
-		// 	jsCode = GetComposedCode(&c.Controller, params.JsCode)
-		// }
-		// if params.AuthType == weixin.AuthTypeWxApp {
-		jsCode = GetComposedCode2(&c.Controller, params.JsCode)
-		// }
+		str := []string{
+			params.AppID,
+			params.JsCode,
+		}
+		jsCode := strings.Join(str, ",")
 		if err == nil {
 			decryptedDataBase64, err2 := weixin.AutherObjMini.DecryptData(authInfo, jsCode, params.Data, params.Iv)
 			if err = err2; err == nil {