Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-php into dev
This commit is contained in:
commit
d39bedf170
@ -23,6 +23,8 @@ use think\exception\HttpResponseException;
|
||||
use think\exception\ValidateException;
|
||||
use think\Response;
|
||||
use Throwable;
|
||||
use Exception;
|
||||
use think\facade\Request;
|
||||
|
||||
/**
|
||||
* 应用异常处理类
|
||||
@ -50,8 +52,22 @@ class ExceptionHandle extends Handle
|
||||
*/
|
||||
public function report(Throwable $exception): void
|
||||
{
|
||||
$data = [
|
||||
'file' => $exception->getFile(),
|
||||
'line' => $exception->getLine(),
|
||||
'message' => $this->getMessage($exception),
|
||||
'code' => $this->getCode($exception),
|
||||
'http' =>Request::url()
|
||||
];
|
||||
$log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
|
||||
if ($this->app->config->get('log.record_trace')) {
|
||||
$log .= PHP_EOL . $exception->getTraceAsString();
|
||||
}
|
||||
try {
|
||||
$this->app->log->record($log, 'error');
|
||||
} catch (Exception $e) {}
|
||||
// 使用内置的方式记录异常日志
|
||||
parent::report($exception);
|
||||
// parent::report($exception);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -373,7 +373,7 @@ class Auth extends BaseController
|
||||
if ($mer_arr && $mer_arr['mer_avatar'] != '' && $mer_arr['mer_banner'] != '' && $mer_arr['mer_info'] && $mer_arr['service_phone'] != '' && $mer_arr['mer_address'] != '') {
|
||||
$data['is_wsxx'] = 1;
|
||||
}
|
||||
if($bank_info){
|
||||
if(count($bank_info)>0 && count($mer_arr)>0){
|
||||
$data['mer_info'] = array_merge($mer_arr,$bank_info);
|
||||
}else{
|
||||
$data['mer_info'] =$mer_arr;
|
||||
@ -734,6 +734,7 @@ class Auth extends BaseController
|
||||
if (!$sms_code && !env('APP_DEBUG')) return app('json')->fail('验证码不正确');
|
||||
$user = $repository->accountByUser($data['phone']);
|
||||
$auth = $this->parseAuthToken($data['auth_token']);
|
||||
$isNewUser = false;
|
||||
if (!$user) {
|
||||
$isNewUser = true;
|
||||
$user = $repository->registr($data['phone'], null, $data['user_type']);
|
||||
@ -747,7 +748,7 @@ class Auth extends BaseController
|
||||
$tokenInfo = $repository->createToken($user);
|
||||
$repository->loginAfter($user);
|
||||
|
||||
return app('json')->success(array_merge(['is_new_user' => $isNewUser ?? false], $repository->returnToken($user, $tokenInfo)));
|
||||
return app('json')->success(array_merge(['is_new_user' => $isNewUser], $repository->returnToken($user, $tokenInfo)));
|
||||
}
|
||||
|
||||
public function changePassword(ChangePasswordValidate $validate, UserRepository $repository)
|
||||
|
||||
@ -2,4 +2,4 @@
|
||||
document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')
|
||||
if(window.location.protocol == 'https:'){
|
||||
document.write('<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">')
|
||||
}</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c6349b23.js></script><script src=/static/js/index.19ab3404.js></script></body></html>
|
||||
}</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c6349b23.js></script><script src=/static/js/index.c19c6f8b.js></script></body></html>
|
||||
BIN
public/static/cloud_warehouse/dkbl.png
Normal file
BIN
public/static/cloud_warehouse/dkbl.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
BIN
public/static/cloud_warehouse/dw.png
Normal file
BIN
public/static/cloud_warehouse/dw.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.0 KiB |
BIN
public/static/images/dingwei.webp
Normal file
BIN
public/static/images/dingwei.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.6 KiB |
BIN
public/static/img/d-a.c4da7592.png
Normal file
BIN
public/static/img/d-a.c4da7592.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.9 KiB |
File diff suppressed because one or more lines are too long
1
public/static/js/index.c19c6f8b.js
Normal file
1
public/static/js/index.c19c6f8b.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-activity-topic-index.6f18c4dd.js
Normal file
1
public/static/js/pages-activity-topic-index.6f18c4dd.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-goods_details-index.790c107a.js
Normal file
1
public/static/js/pages-goods_details-index.790c107a.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-goods_details-index_v.b0480cf3.js
Normal file
1
public/static/js/pages-goods_details-index_v.b0480cf3.js
Normal file
File diff suppressed because one or more lines are too long
1
public/static/js/pages-index-index.2cba09d4.js
Normal file
1
public/static/js/pages-index-index.2cba09d4.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-payment-get_payment.707f0025.js
Normal file
1
public/static/js/pages-payment-get_payment.707f0025.js
Normal file
File diff suppressed because one or more lines are too long
1
public/static/js/pages-payment-settlement.7f7884fd.js
Normal file
1
public/static/js/pages-payment-settlement.7f7884fd.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-rich-mp4.433028ab.js
Normal file
1
public/static/js/pages-rich-mp4.433028ab.js
Normal file
File diff suppressed because one or more lines are too long
1
public/static/js/pages-rich-rich.2c282c08.js
Normal file
1
public/static/js/pages-rich-rich.2c282c08.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-room-index.44203bf6.js
Normal file
1
public/static/js/pages-room-index.44203bf6.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-store-home-index.b34541f7.js
Normal file
1
public/static/js/pages-store-home-index.b34541f7.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-store-index.29443376.js
Normal file
1
public/static/js/pages-store-index.29443376.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-store-settled-index.7f28dea7.js
Normal file
1
public/static/js/pages-store-settled-index.7f28dea7.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
1
public/static/js/pages-users-feedback-list.1ee87aa7.js
Normal file
1
public/static/js/pages-users-feedback-list.1ee87aa7.js
Normal file
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user