edit

lib/Client.php

@@ -8,6 +8,12 @@ use Passport\Lib\Base;
 
 class Client extends Base
 {
+	/**
+	 * @desc prefix
+	 * @var string
+	 */
+	private $prefix = 'v1_';
+
 	/**
 	 * @desc account
 	 * @var int
@@ -69,32 +75,32 @@ class Client extends Base
 
 	private function initAccount()
 	{
-		$this->account = (isset($this->request['account']) && $this->request['account']) ? $this->request['account'] : $this->session->get('oauth_account');
-		$this->session->add('oauth_account', $this->account);
+		$this->account = (isset($this->request['account']) && $this->request['account']) ? $this->request['account'] : $this->session->get($this->prefix . 'oauth_account');
+		$this->session->add($this->prefix . 'oauth_account', $this->account);
 	}
 
 	private function initSystem()
 	{
-		$this->system = (isset($this->request['system']) && $this->request['system']) ? $this->request['system'] : $this->session->get('oauth_system');
-		$this->session->add('oauth_system', $this->system);
+		$this->system = (isset($this->request['system']) && $this->request['system']) ? $this->request['system'] : $this->session->get($this->prefix . 'oauth_system');
+		$this->session->add($this->prefix . 'oauth_system', $this->system);
 	}
 
 	private function initSourceType()
 	{
-		$this->source_type = (isset($this->request['source_type']) && $this->request['source_type']) ? $this->request['source_type'] : $this->session->get('oauth_source_type');
-		$this->session->add('oauth_source_type', $this->source_type);
+		$this->source_type = (isset($this->request['source_type']) && $this->request['source_type']) ? $this->request['source_type'] : $this->session->get($this->prefix . 'oauth_source_type');
+		$this->session->add($this->prefix . 'oauth_source_type', $this->source_type);
 	}
 
 	private function initSource()
 	{
-		$this->source = (isset($this->request['source']) && $this->request['source']) ? $this->request['source'] : $this->session->get('oauth_source');
-		$this->session->add('oauth_source', $this->source);
+		$this->source = (isset($this->request['source']) && $this->request['source']) ? $this->request['source'] : $this->session->get($this->prefix . 'oauth_source');
+		$this->session->add($this->prefix . 'oauth_source', $this->source);
 	}
 
 	private function initRefer()
 	{
-		$this->refer = (isset($this->request['refer']) && $this->request['refer']) ? $this->request['refer'] : $this->session->get('oauth_refer');
-		$this->session->add('oauth_refer', $this->refer);
+		$this->refer = (isset($this->request['refer']) && $this->request['refer']) ? $this->request['refer'] : $this->session->get($this->prefix . 'oauth_refer');
+		$this->session->add($this->prefix . 'oauth_refer', $this->refer);
 	}
 
 	private function initConfig()
@@ -121,7 +127,7 @@ class Client extends Base
 			}
 		}
 		$id = Dever::id();
-		$this->session->add('oauth_id', $id);
+		$this->session->add($this->prefix . 'oauth_id', $id);
 		$this->param('auth', 'appid', $this->config['appid']);
 		$this->param('auth', 'redirect_uri', Dever::url('request.callback?account=' . $this->account, 'oauth'));
 		$this->param('auth', 'state', $id);
@@ -147,9 +153,9 @@ class Client extends Base
 		if ($this->js == true && $url) {
 			return $this->output($url);
 		} else {
-			$id = $this->session->get('oauth_id');
+			$id = $this->session->get($this->prefix . 'oauth_id');
 			if (isset($this->config['token']['param'])) {
-				if (!$this->session->get('oauth_refresh')) {
+				if (!$this->session->get($this->prefix . 'oauth_refresh')) {
 					$this->param('token', 'code');
 					$this->param('token', 'appid', $this->config['appid']);
 					$this->param('token', 'secret', $this->config['appsecret']);