解决新装后插入用户无法登陆的问题

This commit is contained in:
2020-04-20 13:13:09 +08:00
parent 1a68cddd1c
commit ed57619b65
5 changed files with 24 additions and 27 deletions

View File

@@ -15,9 +15,9 @@ class Application {
* @var array
*/
private $providers = [
'qq' => 'Qq',
'weibo' => 'Weibo',
'wechat' => 'Wechat',
'qq' => 'Qq',
'weibo' => 'Weibo',
'wechat' => 'Wechat',
];
/**
@@ -26,15 +26,14 @@ class Application {
*/
protected $services = [];
public function __construct($options = [])
{
public function __construct($options = []) {
$options = array_intersect_key($options, $this->providers);
$options = array_merge($this->config, is_array($options) ? $options : []);
foreach ($options as $key => &$option) {
$option['app_id'] = isset($option['app_id']) ? $option['app_id'] : '';
$option['app_secret'] = isset($option['app_secret']) ? $option['app_secret'] : '';
// 如果未定义回调地址则自动生成
$option['callback'] = isset($option['callback']) && $option['callback'] ? $option['callback'] : addon_url('syslogin/index/callback', [':platform' => $key], false, true);
$option['callback'] = isset($option['callback']) && $option['callback'] ? $option['callback'] : addons_url('syslogin/index/callback', [':platform' => $key], false, true);
}
$this->config = $options;
//注册服务器提供者
@@ -44,8 +43,7 @@ class Application {
/**
* 注册服务提供者
*/
private function registerProviders()
{
private function registerProviders() {
foreach ($this->providers as $k => $v) {
$this->services[$k] = function () use ($k, $v) {
$options = $this->config[$k];
@@ -55,13 +53,11 @@ class Application {
}
}
public function __set($key, $value)
{
public function __set($key, $value) {
$this->services[$key] = $value;
}
public function __get($key)
{
public function __get($key) {
return isset($this->services[$key]) ? $this->services[$key]($this) : null;
}
}