|
|
@@ -114,18 +114,15 @@ func PayJSAPI(params *PayParams)(*JSAPIPayConfig, error){
|
|
|
func GetOAuthParams(paramMap map[string]string)(*WxOAuthConfig, error){
|
|
|
config := WxOAuthConfig{}
|
|
|
urlstr := wxConfig.RedirectUrl
|
|
|
- if strings.Index(urlstr, "?") > 0{
|
|
|
- for k, v := range paramMap{
|
|
|
- urlstr += fmt.Sprintf("&%s=%s", k, url.QueryEscape(v))
|
|
|
- }
|
|
|
- }else{
|
|
|
- urlstr += "?"
|
|
|
- for k, v := range paramMap{
|
|
|
- urlstr += fmt.Sprintf("%s=%s&", k, url.QueryEscape(v))
|
|
|
- }
|
|
|
+ paramstr := ""
|
|
|
+ for k, v := range paramMap{
|
|
|
+ paramstr += fmt.Sprintf("%s=%s", k, url.QueryEscape(v))
|
|
|
+ }
|
|
|
+ if strings.Index(urlstr, "%s") > 0{
|
|
|
+ urlstr = fmt.Sprintf(urlstr, paramstr)
|
|
|
}
|
|
|
|
|
|
- url, err := wxoauth.GetRedirectURL(urlstr, wxConfig.Scope, wxConfig.State)
|
|
|
+ url, err := wxoauth.GetRedirectURL(urlstr, wxConfig.Scope, url.QueryEscape(wxConfig.State))
|
|
|
if err != nil{
|
|
|
return nil, err
|
|
|
}
|