|
|
@@ -60,20 +60,21 @@ class AuthController extends PublicController
|
|
|
if (isset($get['state']) && $get['state'] == 'authdeny') {
|
|
|
util::fail('auth fail');
|
|
|
}
|
|
|
- $account = '';
|
|
|
//这里要换成根据前端的数据来转 todo
|
|
|
$suffixUrlEncode = $get['suffixUrl'];
|
|
|
$suffixUrl = stringUtil::urlSafeBase64Decode($suffixUrlEncode);
|
|
|
- $parse = parse_url($suffixUrl);
|
|
|
+ $newSuffixUrl = str_replace("#","",$suffixUrl);
|
|
|
+ $parse = parse_url($newSuffixUrl);
|
|
|
if (isset($parse['query'])) {
|
|
|
parse_str($parse['query'], $queryArray);
|
|
|
if (isset($queryArray['account']) && !empty($queryArray['account'])) {
|
|
|
$account = $queryArray['account'];
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- print_r($get);die;
|
|
|
-
|
|
|
+ print_r($get);
|
|
|
+ print_r($parse);
|
|
|
+ die;
|
|
|
+
|
|
|
//获取m.xx.com/account/12358这类链接的商家id
|
|
|
if (empty($account) && preg_match('/\/account\/(\d+)/', $suffixUrl, $match)) {
|
|
|
$account = $match[1];
|
shish