sq

app/mobile/controllers/AuthController.php

@@ -17,14 +17,16 @@ use common\components\weixinUtil;
  */
 class AuthController extends PublicController
 {
-
+	
 	public $enableCsrfValidation = false;
-
+	
 	//准备授权 shish 2019.11.19
 	public function actionPrepare()
 	{
 		$get = Yii::$app->request->get();
 		$suffixUrl = isset($get['suffixUrl']) && !empty($get['suffixUrl']) ? $get['suffixUrl'] : '';
+		echo $suffixUrl;
+		die;
 		if (empty($suffixUrl)) {
 			util::fail('没有网址');
 		}
@@ -42,7 +44,8 @@ class AuthController extends PublicController
 		 */
 		$authScope = isset($get['authScope']) ? $get['authScope'] : 'snsapi_base';
 		$host = Yii::$app->request->getHostInfo();
-		$url = $host . '/auth/get-user-info?suffixUrl=' . $suffixUrl . '&authScope=' . $authScope;
+		$suffixUrlEncode = stringUtil::urlSafeB64Encode($suffixUrl);
+		$url = $host . '/auth/get-user-info?suffixUrl=' . $suffixUrlEncode . '&authScope=' . $authScope;
 		Yii::info($url);
 		weixinUtil::getToken($url, $merchant, $authScope);
 		util::success();
@@ -59,11 +62,10 @@ class AuthController extends PublicController
 		if (isset($get['state']) && $get['state'] == 'authdeny') {
 			util::fail('auth fail');
 		}
-		print_r($get);die;
 		$account = '';
 		//这里要换成根据前端的数据来转 todo
 		$suffixUrlEncode = $get['suffixUrl'];
-		$suffixUrl = urldecode($suffixUrlEncode);
+		$suffixUrl = stringUtil::urlSafeBase64Decode($suffixUrlEncode);
 		$parse = parse_url($suffixUrl);
 		if (isset($parse['query'])) {
 			parse_str($parse['query'], $queryArray);
@@ -87,6 +89,9 @@ class AuthController extends PublicController
 		}
 		$merchantId = $merchant['id'];
 		$authScope = isset($get['authScope']) ? $get['authScope'] : '';
+		
+		print_r($get);die;
+		
 		if (empty($authScope)) {
 			util::stop('没有授权类型');
 		}
@@ -134,7 +139,8 @@ class AuthController extends PublicController
 				}
 			}
 		}
-		print_r($user);die;
+		print_r($user);
+		die;
 		//这个登陆没有经过父类方法配置全局变量，这里重新设置一次
 		Yii::$app->params['userId'] = $user['id'];
 		Yii::$app->params['user'] = $user;