提交
This commit is contained in:
parent
59d2245d8a
commit
56404736b9
6
.env
6
.env
|
|
@ -6,9 +6,9 @@ DEFAULT_TIMEZONE = Asia/Shanghai
|
|||
[DATABASE]
|
||||
TYPE = mysql
|
||||
HOSTNAME = 127.0.0.1
|
||||
DATABASE = youda_test
|
||||
USERNAME = youda_test
|
||||
PASSWORD = youda_test
|
||||
DATABASE = youda
|
||||
USERNAME = youda
|
||||
PASSWORD = youda
|
||||
HOSTPORT = 3306
|
||||
CHARSET = utf8
|
||||
DEBUG = false
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class Config extends Base
|
|||
return $this->renderSuccess('获取成功', [
|
||||
'good_type' => $goodsTypeList,
|
||||
'app_setting' => $app_setting,
|
||||
'version' => '100'
|
||||
'version' => '101'
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ class Login extends Base
|
|||
$user['id'],
|
||||
'wechat',
|
||||
$last_login_ip1,
|
||||
$ip_province . $ip_city
|
||||
''//$ip_province . $ip_city
|
||||
);
|
||||
|
||||
return $this->renderSuccess("登录成功", $account_token);
|
||||
|
|
@ -380,7 +380,7 @@ class Login extends Base
|
|||
$user_id,
|
||||
'wechat:v1.0.0',
|
||||
$last_login_ip1,
|
||||
$ip_province . $ip_city
|
||||
''//$ip_province . $ip_city
|
||||
);
|
||||
|
||||
Db::commit();
|
||||
|
|
@ -391,9 +391,9 @@ class Login extends Base
|
|||
}
|
||||
}
|
||||
} catch (\Exception $e) {
|
||||
Log::error('错误信息' . $e->getMessage());
|
||||
Log::error('错误行数' . $e->getLine());
|
||||
|
||||
Log::error('登录失败->错误信息' . $e->getMessage());
|
||||
Log::error('登录失败->错误行数' . $e->getLine());
|
||||
return $this->renderError("登录失败");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -748,7 +748,7 @@ class Login extends Base
|
|||
$ip_province = $result['province'];
|
||||
$ip_city = $result['city'];
|
||||
$ip_adcode = $result['adcode'];
|
||||
$location = $ip_province . $ip_city;
|
||||
$location ="";// $ip_province . $ip_city;
|
||||
}
|
||||
$user_id = $user['id'];
|
||||
$isTest = \app\common\helper\ConfigHelper::getSystemTestKey("enable_test");
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user