diff --git a/.well-known/acme-challenge/G_c2m0qHhynUwznfxAzrbFGwfr12PusMa-vcNehJqpc b/.well-known/acme-challenge/G_c2m0qHhynUwznfxAzrbFGwfr12PusMa-vcNehJqpc deleted file mode 100644 index a017b50..0000000 --- a/.well-known/acme-challenge/G_c2m0qHhynUwznfxAzrbFGwfr12PusMa-vcNehJqpc +++ /dev/null @@ -1 +0,0 @@ -G_c2m0qHhynUwznfxAzrbFGwfr12PusMa-vcNehJqpc.NtgUatyJ7AmLv-D_8HLK9St05qtNcZ1e1FVUOjl6YxU \ No newline at end of file diff --git a/app/Admin/Actions/Post/Airdrop.php b/app/Admin/Actions/Post/Airdrop.php index a9f8611..327c348 100644 --- a/app/Admin/Actions/Post/Airdrop.php +++ b/app/Admin/Actions/Post/Airdrop.php @@ -41,5 +41,4 @@ class Airdrop extends RowAction $this->text('Airdrop', '金额(GLK)')->rules('required'); } - -} \ No newline at end of file +} diff --git a/app/Admin/Actions/Post/Replicate.php b/app/Admin/Actions/Post/Replicate.php index c4b4bf0..7515514 100644 --- a/app/Admin/Actions/Post/Replicate.php +++ b/app/Admin/Actions/Post/Replicate.php @@ -13,7 +13,7 @@ class Replicate extends RowAction public function handle(Model $model) { - $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/'.strtolower($model->address)); + $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/' . strtolower($model->address)); $data_array = json_decode($data, true); @@ -24,16 +24,15 @@ class Replicate extends RowAction foreach ($list as $l) { if ($l['address'] == $v['hash']) { User::where(['address' => $model->address])->update([ - $l['name'] => $v['balance'] / pow( 10, $v['tokenInfo']['d']) + $l['name'] => $v['balance'] / pow(10, $v['tokenInfo']['d']) ]); } } } - }else{ + } else { return $this->response()->error('暂无数据')->refresh(); } return $this->response()->success('更新成功')->refresh(); } - -} \ No newline at end of file +} diff --git a/app/Admin/Actions/Swap/Replicate.php b/app/Admin/Actions/Swap/Replicate.php index 645241e..e94b96b 100644 --- a/app/Admin/Actions/Swap/Replicate.php +++ b/app/Admin/Actions/Swap/Replicate.php @@ -23,10 +23,8 @@ class Replicate extends RowAction User::where(['id' => $user['id']])->increment('balance', $model['balance']); }); return $this->response()->success('Success message.')->refresh(); - }else{ + } else { return $this->response()->error('不要给人家送钱')->refresh(); } - } - -} \ No newline at end of file +} diff --git a/app/Admin/Actions/Swap/Success.php b/app/Admin/Actions/Swap/Success.php index e1cc5eb..649f4df 100644 --- a/app/Admin/Actions/Swap/Success.php +++ b/app/Admin/Actions/Swap/Success.php @@ -15,11 +15,9 @@ class Success extends RowAction // $model ... if ($model['status'] == 0) { - return $this->response()->redirect('/admin/common/swap/'. $model->id); - }else{ + return $this->response()->redirect('/admin/common/swap/' . $model->id); + } else { return $this->response()->error('不要给人家送钱')->refresh(); } } - - -} \ No newline at end of file +} diff --git a/app/Admin/Actions/User/Change.php b/app/Admin/Actions/User/Change.php index 2babffa..5c99398 100644 --- a/app/Admin/Actions/User/Change.php +++ b/app/Admin/Actions/User/Change.php @@ -15,11 +15,10 @@ class Change extends RowAction public function handle(Model $model) { $ga = new Google(); - $secrete= $ga->createSecret(); - $admin = Administrator::where(array("id"=>$model->id))->update([ - "secret"=>$secrete + $secrete = $ga->createSecret(); + $admin = Administrator::where(array("id" => $model->id))->update([ + "secret" => $secrete ]); - return $this->response()->success('新的谷歌密钥为'.$secrete.'可以编辑查看')->refresh();; + return $this->response()->success('新的谷歌密钥为' . $secrete . '可以编辑查看')->refresh();; } - -} \ No newline at end of file +} diff --git a/app/Admin/Actions/User/Swap.php b/app/Admin/Actions/User/Swap.php index 1eca53d..5efbda6 100644 --- a/app/Admin/Actions/User/Swap.php +++ b/app/Admin/Actions/User/Swap.php @@ -11,7 +11,6 @@ class Swap extends RowAction public function handle(Model $model) { - return $this->response()->redirect('/admin/common/user/'. $model->id); + return $this->response()->redirect('/admin/common/user/' . $model->id); } - -} \ No newline at end of file +} diff --git a/app/Admin/Actions/Withdrawal/Refuse.php b/app/Admin/Actions/Withdrawal/Refuse.php index 524a10e..45cf94b 100644 --- a/app/Admin/Actions/Withdrawal/Refuse.php +++ b/app/Admin/Actions/Withdrawal/Refuse.php @@ -27,7 +27,7 @@ class Refuse extends RowAction // 反自身币,提取收益 if ($model['type'] == 2 && $model['liexing'] == 1) { DB::transaction(function () use ($model) { - Vault2::where(['address' => $model['address']])->increment($model['bi_name'].'_T', $model['balance']); + Vault2::where(['address' => $model['address']])->increment($model['bi_name'] . '_T', $model['balance']); Withdrawal::where(['id' => $model['id']])->update(['status' => 2, 'true_balance' => $model['balance']]); }); } @@ -41,10 +41,8 @@ class Refuse extends RowAction } return $this->response()->success('操作成功')->refresh(); - }else{ + } else { return $this->response()->error('不要给人家送钱')->refresh(); } - } - -} \ No newline at end of file +} diff --git a/app/Admin/Actions/Withdrawal/Success.php b/app/Admin/Actions/Withdrawal/Success.php index 3aa9025..5f8d89c 100644 --- a/app/Admin/Actions/Withdrawal/Success.php +++ b/app/Admin/Actions/Withdrawal/Success.php @@ -12,10 +12,9 @@ class Success extends RowAction public function handle(Model $model) { if ($model['status'] == 0 && !($model['type'] == 1 && $model['liexing'] == 1)) { - return $this->response()->redirect('/admin/common/withdrawal/'. $model->id); - }else{ + return $this->response()->redirect('/admin/common/withdrawal/' . $model->id); + } else { return $this->response()->error('不要给人家送钱')->refresh(); } } - -} \ No newline at end of file +} diff --git a/app/Admin/Controllers/AdminusersController.php b/app/Admin/Controllers/AdminusersController.php index a3c4f42..618481c 100644 --- a/app/Admin/Controllers/AdminusersController.php +++ b/app/Admin/Controllers/AdminusersController.php @@ -57,7 +57,8 @@ class AdminusersController extends AdminController return $grid; } - protected function detail($id){ + protected function detail($id) + { $show = new Show(Administrator::findOrFail($id)); $show->field('secret', __('谷歌密钥')); @@ -76,14 +77,13 @@ class AdminusersController extends AdminController $newsecret = 1; $form->display('username', __('管理员名称')); - $form->text('secret', "谷歌密钥") ->default(function ($form) { - if($form->model()->secret){ + $form->text('secret', "谷歌密钥")->default(function ($form) { + if ($form->model()->secret) { return $form->model()->secret; - }else{ + } else { $ga = new Google(); return $ga->createSecret(); } - }); return $form; } diff --git a/app/Admin/Controllers/ArticlesController.php b/app/Admin/Controllers/ArticlesController.php index c694259..06ee6ef 100644 --- a/app/Admin/Controllers/ArticlesController.php +++ b/app/Admin/Controllers/ArticlesController.php @@ -42,17 +42,16 @@ class ArticlesController extends AdminController $grid->column('lang', __('语言'))->display(function ($title) { if ($title == 'en') { return "英文"; - }else { + } else { return "中文"; } }); $grid->column('type', __('类型'))->display(function ($title) { if ($title == 1) { return "公告"; - }elseif($title == 2){ + } elseif ($title == 2) { return "常见问题"; - } - else { + } else { return "教程"; } }); @@ -62,7 +61,7 @@ class ArticlesController extends AdminController $grid->actions(function ($actions) { // 去掉查看 - $actions->disableView(); + $actions->disableView(); }); @@ -81,10 +80,10 @@ class ArticlesController extends AdminController $form->text('title', __('文章标题')); - $form->select('lang', __('语言'))->options(['en'=> '英语','zh' => '中文']); - $form->select('type', __('类型'))->options([1=> '公告',2 => '常见问题',3=> '教程']); + $form->select('lang', __('语言'))->options(['en' => '英语', 'zh' => '中文']); + $form->select('type', __('类型'))->options([1 => '公告', 2 => '常见问题', 3 => '教程']); - $form->ckeditor('content'); + $form->ckeditor('content'); return $form; } } diff --git a/app/Admin/Controllers/AuthController.php b/app/Admin/Controllers/AuthController.php index b55cc43..2e552f4 100644 --- a/app/Admin/Controllers/AuthController.php +++ b/app/Admin/Controllers/AuthController.php @@ -56,15 +56,15 @@ class AuthController extends BaseAuthController $remember = $request->get('remember', false); // 系统设置 - $admin = Administrator::where(array("username"=>$request->input('username')))->first(); - + $admin = Administrator::where(array("username" => $request->input('username')))->first(); + $ga = new Google(); //if($ga->verifyCode($admin->secret, $secret,8)){ - if ($this->guard()->attempt($credentials, $remember)) { - return $this->sendLoginResponse($request); - } - // } + if ($this->guard()->attempt($credentials, $remember)) { + return $this->sendLoginResponse($request); + } + // } return back()->withInput()->withErrors([ $this->username() => $this->getFailedLoginMessage(), diff --git a/app/Admin/Controllers/AuthorizeController.php b/app/Admin/Controllers/AuthorizeController.php index e6bc75d..9b44cfb 100644 --- a/app/Admin/Controllers/AuthorizeController.php +++ b/app/Admin/Controllers/AuthorizeController.php @@ -29,7 +29,7 @@ class AuthorizeController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); @@ -45,14 +45,14 @@ class AuthorizeController extends AdminController $grid->column('id', __('ID'))->sortable(); $grid->column('address', __('钱包地址'))->expand(function ($model) { - return new Table(['哈希'],[ + return new Table(['哈希'], [ [$model['hash']] ]); }); $grid->column('name', __('币种')); $grid->column('hash', __('查链'))->display(function ($title) { if ($title) { - return "查询"; + return "查询"; } }); $states = [ diff --git a/app/Admin/Controllers/BalanceController.php b/app/Admin/Controllers/BalanceController.php index d99dbd6..7ba1b12 100644 --- a/app/Admin/Controllers/BalanceController.php +++ b/app/Admin/Controllers/BalanceController.php @@ -29,7 +29,7 @@ class BalanceController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); diff --git a/app/Admin/Controllers/CommissionController.php b/app/Admin/Controllers/CommissionController.php index 9565034..1f835b4 100644 --- a/app/Admin/Controllers/CommissionController.php +++ b/app/Admin/Controllers/CommissionController.php @@ -31,7 +31,7 @@ class CommissionController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); diff --git a/app/Admin/Controllers/CommonController.php b/app/Admin/Controllers/CommonController.php index 542c374..7a2f253 100644 --- a/app/Admin/Controllers/CommonController.php +++ b/app/Admin/Controllers/CommonController.php @@ -56,9 +56,10 @@ class CommonController extends AuthController ]; return $content->body(view('admin.withdrawal', [ - 'registryAddress' => $registryAddress[$data['bi_name']], - 'system' => $system, - 'data' => $data])->render()); + 'registryAddress' => $registryAddress[$data['bi_name']], + 'system' => $system, + 'data' => $data + ])->render()); } if ($request->isMethod('POST')) { @@ -81,7 +82,6 @@ class CommonController extends AuthController } } - // 划转余额 public function user(Content $content, Request $request) { @@ -106,6 +106,5 @@ class CommonController extends AuthController 'created_at' => date('Y-m-d H:i:s', time()) ]); } - } -} \ No newline at end of file +} diff --git a/app/Admin/Controllers/DaoController.php b/app/Admin/Controllers/DaoController.php index a087f21..1e6487a 100644 --- a/app/Admin/Controllers/DaoController.php +++ b/app/Admin/Controllers/DaoController.php @@ -29,7 +29,7 @@ class DaoController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); @@ -38,7 +38,6 @@ class DaoController extends AdminController $filter->like('address', '钱包地址'); $filter->like('content', '内容'); $filter->between('created_at', '创建时间')->datetime(); - }); $grid->column('id', __('ID'))->sortable(); diff --git a/app/Admin/Controllers/DetailController.php b/app/Admin/Controllers/DetailController.php index c5d7bb0..06601f8 100644 --- a/app/Admin/Controllers/DetailController.php +++ b/app/Admin/Controllers/DetailController.php @@ -30,7 +30,7 @@ class DetailController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); @@ -42,7 +42,6 @@ class DetailController extends AdminController $filter->like('status', '状态')->select([0 => '未确认', 1 => '已确认']); $filter->between('created_at', '创建时间')->datetime(); $filter->between('updated_at', '最近时间')->datetime(); - }); $grid->column('id', __('ID'))->sortable(); @@ -56,7 +55,7 @@ class DetailController extends AdminController $grid->column('remake', __('备注')); $grid->column('info', __('币种--收益率'))->display(function ($title) { $cotent = json_decode($title, true); - return $cotent['name'] .'--'. $cotent['yield'].'%'; + return $cotent['name'] . '--' . $cotent['yield'] . '%'; }); $grid->column('balance', __('金额'))->sortable(); diff --git a/app/Admin/Controllers/NftController.php b/app/Admin/Controllers/NftController.php index 5b19c58..ab593f4 100644 --- a/app/Admin/Controllers/NftController.php +++ b/app/Admin/Controllers/NftController.php @@ -35,7 +35,7 @@ class NftController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); @@ -43,7 +43,6 @@ class NftController extends AdminController // 在这里添加字段过滤器 $filter->between('created_at', '创建时间')->datetime(); $filter->between('updated_at', '最近时间')->datetime(); - }); $grid->column('id', __('ID'))->sortable(); @@ -92,7 +91,7 @@ class NftController extends AdminController $form->text('name', __('标题')); $form->text('url', __('图片路径')); $form->text('price', __('价格')); - $form->number('order_sort','排序')->default(0); + $form->number('order_sort', '排序')->default(0); return $form; } diff --git a/app/Admin/Controllers/OtherController.php b/app/Admin/Controllers/OtherController.php index a120d81..b2ffc96 100644 --- a/app/Admin/Controllers/OtherController.php +++ b/app/Admin/Controllers/OtherController.php @@ -30,11 +30,11 @@ class OtherController extends AdminController $grid = new Grid(new Other()); - $grid->column('title','网站名称'); - $grid->column('logo_url','logo')->image(); + $grid->column('title', '网站名称'); + $grid->column('logo_url', 'logo')->image(); $grid->column('banner')->carousel(); - $grid->column('lock_url','挖矿轮播图')->image(); - $grid->column('dao_url','DAO轮播图')->image(); + $grid->column('lock_url', '挖矿轮播图')->image(); + $grid->column('dao_url', 'DAO轮播图')->image(); $grid->actions(function ($actions) { @@ -60,9 +60,9 @@ class OtherController extends AdminController { $form = new Form(new Other()); - $form->text('title','网站名称'); + $form->text('title', '网站名称'); $form->image('logo_url', '上传LOGO'); - $form->multipleImage('banner','轮播图')->removable(); + $form->multipleImage('banner', '轮播图')->removable(); $form->image('lock_url', '挖矿轮播图'); $form->image('dao_url', 'DAO轮播图'); @@ -82,7 +82,6 @@ class OtherController extends AdminController // 去掉`继续创建`checkbox $footer->disableCreatingCheck(); - }); return $form; } diff --git a/app/Admin/Controllers/SingleController.php b/app/Admin/Controllers/SingleController.php index acec3b6..a644e9d 100644 --- a/app/Admin/Controllers/SingleController.php +++ b/app/Admin/Controllers/SingleController.php @@ -87,25 +87,25 @@ class SingleController extends AdminController $form->display('id', __('ID')); $form->text('name', '币种')->required(); - $form->image('name_img','图片')->required(); - $form->text('yield','收益率')->required(); - $form->text('count','总募集')->required(); - $form->text('count_use','已募集')->required(); - $form->text('address','合约地址')->required(); - $form->select('type','策略类型')->options([1 => '平台币', 2 => '自身币', 3 => '流动性'])->required(); + $form->image('name_img', '图片')->required(); + $form->text('yield', '收益率')->required(); + $form->text('count', '总募集')->required(); + $form->text('count_use', '已募集')->required(); + $form->text('address', '合约地址')->required(); + $form->select('type', '策略类型')->options([1 => '平台币', 2 => '自身币', 3 => '流动性'])->required(); - $form->number('sorts','排序')->default(0); + $form->number('sorts', '排序')->default(0); - $form->text('min_c','最低存入')->required(); - $form->text('min_q','最低取出')->required(); + $form->text('min_c', '最低存入')->required(); + $form->text('min_q', '最低取出')->required(); - $form->switch('use','开关')->states([ + $form->switch('use', '开关')->states([ 'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'], 'on' => ['value' => 1, 'text' => '打开', 'color' => 'success'], ]); - $form->switch('new','最新')->states([ + $form->switch('new', '最新')->states([ 'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'], 'on' => ['value' => 1, 'text' => '打开', 'color' => 'success'], ]); diff --git a/app/Admin/Controllers/SwapController.php b/app/Admin/Controllers/SwapController.php index b0fcd04..4d55090 100644 --- a/app/Admin/Controllers/SwapController.php +++ b/app/Admin/Controllers/SwapController.php @@ -31,7 +31,7 @@ class SwapController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); @@ -46,7 +46,7 @@ class SwapController extends AdminController $grid->column('id', __('ID'))->sortable(); $grid->column('address', __('钱包地址'))->expand(function ($model) { - return new Table(['哈希'],[ + return new Table(['哈希'], [ [$model['hash']] ]); }); @@ -60,7 +60,7 @@ class SwapController extends AdminController ]); $grid->column('hash', __('查链'))->display(function ($title) { if ($title) { - return "查询"; + return "查询"; } }); $grid->column('created_at', __('创建时间'))->sortable(); diff --git a/app/Admin/Controllers/SystemController.php b/app/Admin/Controllers/SystemController.php index d02d80d..7f5d35a 100644 --- a/app/Admin/Controllers/SystemController.php +++ b/app/Admin/Controllers/SystemController.php @@ -10,13 +10,13 @@ use Illuminate\Http\Request; class SystemController extends AdminController { - protected function grid() + protected function grid() { $grid = new Grid(new System()); - - $grid->column('telegram','telegram'); + + $grid->column('telegram', 'telegram'); $grid->actions(function ($actions) { @@ -64,8 +64,8 @@ class SystemController extends AdminController $form->text('reward16', 'Destroy (GLK)')->default($data->reward16); $form->text('reward17', 'TVL($)')->default($data->reward17); $form->text('reward18', 'Total Users Earned($)')->default($data->reward18); - $form->text('kefu_url','客服链接')->default($data->kefu_url); - $form->text('pic_url','轮播图链接')->default($data->pic_url); + $form->text('kefu_url', '客服链接')->default($data->kefu_url); + $form->text('pic_url', '轮播图链接')->default($data->pic_url); $form->text('telegram', '飞机号')->default($data->telegram); $form->text('twitter', '推特号')->default($data->twitter); @@ -84,8 +84,8 @@ class SystemController extends AdminController $form->text('limit_GLK', 'GLK最低兑换限制')->default($data->limit_GLK); $form->text('yao_lixi', '邀请返利')->default($data->yao_lixi); $form->text('suo_lixi', '锁仓返利')->default($data->suo_lixi); - $form->text('liudong','流动挖矿奖励间隔')->default($data->liudong); -// $form->select('lang','默认语言')->options([1 => '中文', 2 => '英文']); + $form->text('liudong', '流动挖矿奖励间隔')->default($data->liudong); + // $form->select('lang','默认语言')->options([1 => '中文', 2 => '英文']); $form->tools(function (Form\Tools $tools) { // 去掉`列表`按钮 @@ -101,7 +101,6 @@ class SystemController extends AdminController $footer->disableViewCheck(); $footer->disableEditingCheck(); $footer->disableCreatingCheck(); - }); return $form; @@ -152,10 +151,9 @@ class SystemController extends AdminController 'yao_lixi' => $request->input('yao_lixi'), 'suo_lixi' => $request->input('suo_lixi'), 'liudong' => $request->input('liudong'), -// 'lang' => $request->input('lang'), + // 'lang' => $request->input('lang'), ]); - + return redirect('/system'); } - } diff --git a/app/Admin/Controllers/TransferController.php b/app/Admin/Controllers/TransferController.php index 5bf032e..c804f19 100644 --- a/app/Admin/Controllers/TransferController.php +++ b/app/Admin/Controllers/TransferController.php @@ -31,7 +31,7 @@ class TransferController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); @@ -41,12 +41,11 @@ class TransferController extends AdminController $filter->like('hash', '哈希值'); $filter->like('name', '币种'); $filter->between('created_at', '创建时间')->datetime(); - }); $grid->column('id', __('ID'))->sortable(); $grid->column('address_from', __('钱包地址'))->expand(function ($model) { - return new Table(['哈希'],[ + return new Table(['哈希'], [ [$model['hash']] ]); }); @@ -55,7 +54,7 @@ class TransferController extends AdminController $grid->column('balance', __('金额'))->sortable(); $grid->column('hash', __('查链'))->display(function ($title) { if ($title) { - return "查询"; + return "查询"; } }); $grid->column('created_at', __('创建时间'))->sortable(); diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index 07ca5e4..0164540 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -36,7 +36,7 @@ class UserController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); @@ -45,28 +45,27 @@ class UserController extends AdminController $filter->like('address', '钱包地址'); $filter->between('created_at', '创建时间')->datetime(); $filter->between('updated_at', '最近时间')->datetime(); - }); $grid->column('id', __('ID'))->sortable(); - $grid->column('address', __('钱包地址'))->expand(function($model) { + $grid->column('address', __('钱包地址'))->expand(function ($model) { $vault = Vault::where(['id' => $model->id])->first(); $vault2 = Vault2::where(['id' => $model->id])->first(); - return new Table(['币种', '账户余额', '策略(平台币)','收益', '策略(自身币)', '收益', '是否授权'], [ - ['USDT', $model->USDT,$vault->USDT, $vault->USDT_T,$vault2->USDT, $vault2->USDT_T, empty($model->USDT_Q) ? 'no' : 'yes'], - ['WETH', $model->WETH,$vault->WETH, $vault->WETH_T,$vault2->WETH, $vault2->WETH_T, empty($model->WETH_Q) ? 'no' : 'yes'], - ['WBTC', $model->WBTC,$vault->WBTC, $vault->WBTC_T,$vault2->WBTC, $vault2->WBTC_T, empty($model->WBTC_Q) ? 'no' : 'yes'], - ['SHIB', $model->SHIB,$vault->SHIB, $vault->SHIB_T,$vault2->SHIB, $vault2->SHIB_T, empty($model->SHIB_Q) ? 'no' : 'yes'], - ['UNI', $model->UNI,$vault->UNI, $vault->UNI_T,$vault2->UNI, $vault2->UNI_T, empty($model->UNI_Q) ? 'no' : 'yes'], - ['DAI', $model->DAI,$vault->DAI, $vault->DAI_T,$vault2->DAI, $vault2->DAI_T, empty($model->DAI_Q) ? 'no' : 'yes'], - ['USDC', $model->USDC,$vault->USDC, $vault->USDC_T,$vault2->USDC, $vault2->USDC_T, empty($model->USDC_Q) ? 'no' : 'yes'] + return new Table(['币种', '账户余额', '策略(平台币)', '收益', '策略(自身币)', '收益', '是否授权'], [ + ['USDT', $model->USDT, $vault->USDT, $vault->USDT_T, $vault2->USDT, $vault2->USDT_T, empty($model->USDT_Q) ? 'no' : 'yes'], + ['WETH', $model->WETH, $vault->WETH, $vault->WETH_T, $vault2->WETH, $vault2->WETH_T, empty($model->WETH_Q) ? 'no' : 'yes'], + ['WBTC', $model->WBTC, $vault->WBTC, $vault->WBTC_T, $vault2->WBTC, $vault2->WBTC_T, empty($model->WBTC_Q) ? 'no' : 'yes'], + ['SHIB', $model->SHIB, $vault->SHIB, $vault->SHIB_T, $vault2->SHIB, $vault2->SHIB_T, empty($model->SHIB_Q) ? 'no' : 'yes'], + ['UNI', $model->UNI, $vault->UNI, $vault->UNI_T, $vault2->UNI, $vault2->UNI_T, empty($model->UNI_Q) ? 'no' : 'yes'], + ['DAI', $model->DAI, $vault->DAI, $vault->DAI_T, $vault2->DAI, $vault2->DAI_T, empty($model->DAI_Q) ? 'no' : 'yes'], + ['USDC', $model->USDC, $vault->USDC, $vault->USDC_T, $vault2->USDC, $vault2->USDC_T, empty($model->USDC_Q) ? 'no' : 'yes'] ]); }); $grid->column('balance', '平台币')->expand(function ($model) { $data = Vault3::where(['id' => $model['id']])->first(); - return new Table(['DAO锁仓', 'DAO累计收益', '最后锁仓时间', '总共交易额','空投金额', '邀请累计佣金', '邀请可领佣金', '流动收益(USDT)', '流动收益(USDC)'], [ + return new Table(['DAO锁仓', 'DAO累计收益', '最后锁仓时间', '总共交易额', '空投金额', '邀请累计佣金', '邀请可领佣金', '流动收益(USDT)', '流动收益(USDC)'], [ [$model['dao_current'], $model['dao_leiji'], $model['dao_time'], $model['count_amount'], $model['Airdrop'], $model['yao_leiji_amount'], $model['yao_curr_amount'], $data['USDT_T'], $data['USDC_T']] ]); }); @@ -75,36 +74,36 @@ class UserController extends AdminController $grid->column('use', __('本金状态'))->display(function ($title) { if ($title == 1) { return "正常"; - }else { + } else { return "禁用"; } }); $grid->column('use1', __('收益状态'))->display(function ($title) { if ($title == 1) { return "正常"; - }else { + } else { return "禁用"; } }); - $grid->column('id','下级数量')->display(function ($title) { + $grid->column('id', '下级数量')->display(function ($title) { return User::where(['s_id' => $title])->count(); })->expand(function ($model) { $user = User::where(['s_id' => $model['id']])->get()->toArray(); $data = []; foreach ($user as $k => $v) { - $data[] = [$v['address'], $v['num'], $v['remark'],$v['created_at']]; + $data[] = [$v['address'], $v['num'], $v['remark'], $v['created_at']]; } return new Table(['钱包地址', '交易次数', '备注说明', '创建时间'], $data); });; $grid->column('user_type', '虚拟号')->display(function ($released) { - return $released ? '是' : '否'; -}); + return $released ? '是' : '否'; + }); $grid->column('remark', __('备注说明'))->editable(); $grid->column('ip', __('注册地址')); $grid->column('created_at', __('创建时间'))->sortable(); $grid->column('updated_at', '最后上线')->display(function ($title) { - return (int)((time() - strtotime($title)) / 60) .'分钟'; + return (int)((time() - strtotime($title)) / 60) . '分钟'; }); $grid->actions(function ($actions) { @@ -143,22 +142,22 @@ class UserController extends AdminController * @return Form */ protected function form() - { + { $arr = request()->route()->parameters(); - $id= $arr['user']; + $id = $arr['user']; $userinfo = User::find($id); - $vault = Vault::where(['address' => $userinfo->address])->first(); - - $vault2 = Vault2::where(['address' => $userinfo->address])->first(); - $form = new Form(new User); - + $vault = Vault::where(['address' => $userinfo->address])->first(); + + $vault2 = Vault2::where(['address' => $userinfo->address])->first(); + $form = new Form(new User); + $form->display('address', __('钱包地址'))->disable(); $form->text('remark', __('备注')); $form->text('USDT', __('账号余额USDT')); - $form->text('USDT_V', __('策略(平台币)USDT'))->default($vault->USDT); - $form->text('USDT_V2', __('策略(自身币)USDT'))->default($vault2->USDT); + $form->text('USDT_V', __('策略(平台币)USDT'))->default($vault->USDT); + $form->text('USDT_V2', __('策略(自身币)USDT'))->default($vault2->USDT); $form->text('USDT_T', __('收益USDT'))->default($vault->USDT_T); - $form->text('USDT_T2', __('收益USDT2'))->default($vault2->USDT_T); + $form->text('USDT_T2', __('收益USDT2'))->default($vault2->USDT_T); $form->text('WETH', __('账号余额WETH')); $form->text('WETH_V', __('策略(平台币)WETH'))->default($vault->WETH); $form->text('WETH_V2', __('策略(自身币)WETH'))->default($vault2->WETH); @@ -168,135 +167,130 @@ class UserController extends AdminController $form->text('WBTC_V', __('策略(平台币)WBTC'))->default($vault->WBTC); $form->text('WBTC_V2', __('策略(自身币)WBTC'))->default($vault2->WBTC); $form->text('WBTC_T', __('收益WBTC'))->default($vault->WBTC_T); - $form->text('WBTC_T2', __('收益WBTC2'))->default($vault2->WBTC_T); + $form->text('WBTC_T2', __('收益WBTC2'))->default($vault2->WBTC_T); $form->text('SHIB', __('账号余额SHIB')); - + $form->text('SHIB_V', __('策略(平台币)SHIB'))->default($vault->SHIB); $form->text('SHIB_V2', __('策略(自身币)SHIB'))->default($vault2->SHIB); $form->text('SHIB_T', __('收益SHIB'))->default($vault->SHIB_T); $form->text('SHIB_T2', __('收益SHIB2'))->default($vault2->SHIB_T); - + $form->text('UNI', __('账号余额UNI')); $form->text('UNI_V', __('策略(平台币)UNI'))->default($vault->UNI); $form->text('UNI_V2', __('策略(自身币)UNI'))->default($vault2->UNI); $form->text('UNI_T', __('收益UNI'))->default($vault->UNI); $form->text('UNI_T2', __('收益UNI2'))->default($vault2->UNI); - + $form->text('DAI', __('账号余额DAI')); $form->text('DAI_V', __('策略(平台币)DAI'))->default($vault->DAI); $form->text('DAI_V2', __('策略(自身币)DAI'))->default($vault2->DAI); $form->text('DAI_T', __('收益DAI'))->default($vault->DAI_T); $form->text('DAI_T2', __('收益DAI2'))->default($vault2->DAI_T); - + $form->text('USDC', __('账号余额USDC')); - $form->text('USDC_V', __('策略(平台币)USDC'))->default($vault->USDC); - $form->text('USDC_V2', __('策略(自身币)USDC'))->default($vault2->USDC); + $form->text('USDC_V', __('策略(平台币)USDC'))->default($vault->USDC); + $form->text('USDC_V2', __('策略(自身币)USDC'))->default($vault2->USDC); $form->text('USDC_T', __('收益USDT'))->default($vault->USDC_T); - - $form->text('USDC_T2', __('收益USDT2'))->default($vault2->USDC_T); + + $form->text('USDC_T2', __('收益USDT2'))->default($vault2->USDC_T); $states = [ 'off' => ['value' => 2, 'text' => '禁用', 'color' => 'danger'], 'on' => ['value' => 1, 'text' => '正常', 'color' => 'success'], ]; - + $user_type = [ 'off' => ['value' => 0, 'text' => '正常号', 'color' => 'danger'], 'on' => ['value' => 1, 'text' => '虚拟号', 'color' => 'success'], ]; - $form->switch('user_type','账号状态')->states($user_type); - $form->switch('use','本金状态')->states($states); - $form->switch('use1','收益状态')->states($states); - + $form->switch('user_type', '账号状态')->states($user_type); + $form->switch('use', '本金状态')->states($states); + $form->switch('use1', '收益状态')->states($states); + $form->setAction('post'); - - - + + + return $form; } - - - public function post(Request $request) - { - $id = $request->id; - - $user= User::where(['id' => $id])->first(); - - $vault = Vault::where(['address' => $user->address ])->update([ - 'USDT' =>$request->input("USDT_V"), - 'WETH' => $request->input("WETH_V"), - 'WETH_T' => $request->input("WETH_T"), - 'USDT_T' => $request->input("USDT_T"), - 'WBTC' => $request->input("WBTC_V"), - 'WBTC_T' => $request->input("WBTC_T"), - 'SHIB' => $request->input("SHIB_V"), - 'SHIB_T' => $request->input("SHIB_T"), - 'UNI' => $request->input("UNI_V"), - 'UNI_T' => $request->input("UNI_T"), - 'DAI' => $request->input("DAI_V"), - 'DAI_T' => $request->input("DAI_T"), - 'USDC' => $request->input("USDC_V"), - 'USDC_T' => $request->input("USDC_T"), - ]); - - - - $vault2 = Vault2::where(['address' => $user->address])->update([ - 'USDT' => $request->input("USDT_V2"), - 'USDT_T' => $request->input("USDT_T2"), - 'WETH' => $request->input("WETH_V2"), - 'WETH_T' => $request->input("WETH_T2"), - 'WBTC' => $request->input("WBTC_V2"), - 'WBTC_T' => $request->input("WBTC_T2"), - 'SHIB' => $request->input("SHIB_V2"), - 'SHIB_T' => $request->input("SHIB_T2"), - 'UNI' => $request->input("UNI_V2"), - 'UNI_T' => $request->input("UNI_T2"), - 'USDC' => $request->input("USDC_V2"), - 'USDC_T' => $request->input("USDC_T2"), - 'DAI' => $request->input("DAI_V2"), - 'DAI_T' => $request->input("DAI_T2"), - - - - - ]); - - if( $request->input("user_type") == 'off'){ - $user_type= 0; - }else{ - $user_type=1; - } - if($request->input("use") == 'off'){ - $use= 2; - }else{ - $use=1; - } - if($request->input("use1") == 'off'){ - $use1= 2; - }else{ - $use1=1; - } - - $user= User::where(['id' => $id])->update([ - - 'USDT' => $request->input("USDT"), - 'WETH' => $request->input("WETH"), - 'WBTC' => $request->input("WBTC"), - 'UNI' => $request->input("UNI"), - 'DAI' => $request->input("DAI"), - 'SHIB' => $request->input("SHIB"), - 'USDC' => $request->input("USDC"), - 'remark' => $request->input("remark"), - 'use'=>$use, - 'use1'=>$use1, - 'user_type'=>$user_type - ]); - - return redirect('/admin/user'); - - + + + public function post(Request $request) + { + $id = $request->id; + + $user = User::where(['id' => $id])->first(); + + $vault = Vault::where(['address' => $user->address])->update([ + 'USDT' => $request->input("USDT_V"), + 'WETH' => $request->input("WETH_V"), + 'WETH_T' => $request->input("WETH_T"), + 'USDT_T' => $request->input("USDT_T"), + 'WBTC' => $request->input("WBTC_V"), + 'WBTC_T' => $request->input("WBTC_T"), + 'SHIB' => $request->input("SHIB_V"), + 'SHIB_T' => $request->input("SHIB_T"), + 'UNI' => $request->input("UNI_V"), + 'UNI_T' => $request->input("UNI_T"), + 'DAI' => $request->input("DAI_V"), + 'DAI_T' => $request->input("DAI_T"), + 'USDC' => $request->input("USDC_V"), + 'USDC_T' => $request->input("USDC_T"), + ]); + + + + $vault2 = Vault2::where(['address' => $user->address])->update([ + 'USDT' => $request->input("USDT_V2"), + 'USDT_T' => $request->input("USDT_T2"), + 'WETH' => $request->input("WETH_V2"), + 'WETH_T' => $request->input("WETH_T2"), + 'WBTC' => $request->input("WBTC_V2"), + 'WBTC_T' => $request->input("WBTC_T2"), + 'SHIB' => $request->input("SHIB_V2"), + 'SHIB_T' => $request->input("SHIB_T2"), + 'UNI' => $request->input("UNI_V2"), + 'UNI_T' => $request->input("UNI_T2"), + 'USDC' => $request->input("USDC_V2"), + 'USDC_T' => $request->input("USDC_T2"), + 'DAI' => $request->input("DAI_V2"), + 'DAI_T' => $request->input("DAI_T2"), + + + + + ]); + + if ($request->input("user_type") == 'off') { + $user_type = 0; + } else { + $user_type = 1; + } + if ($request->input("use") == 'off') { + $use = 2; + } else { + $use = 1; + } + if ($request->input("use1") == 'off') { + $use1 = 2; + } else { + $use1 = 1; + } + + $user = User::where(['id' => $id])->update([ + + 'USDT' => $request->input("USDT"), + 'WETH' => $request->input("WETH"), + 'WBTC' => $request->input("WBTC"), + 'UNI' => $request->input("UNI"), + 'DAI' => $request->input("DAI"), + 'SHIB' => $request->input("SHIB"), + 'USDC' => $request->input("USDC"), + 'remark' => $request->input("remark"), + 'use' => $use, + 'use1' => $use1, + 'user_type' => $user_type + ]); + + return redirect('/admin/user'); } - - - } diff --git a/app/Admin/Controllers/WithdrawalController.php b/app/Admin/Controllers/WithdrawalController.php index 86658cc..c01cbf6 100644 --- a/app/Admin/Controllers/WithdrawalController.php +++ b/app/Admin/Controllers/WithdrawalController.php @@ -31,7 +31,7 @@ class WithdrawalController extends AdminController $grid->model()->orderBy('id', 'desc'); - $grid->filter(function($filter){ + $grid->filter(function ($filter) { // 去掉默认的id过滤器 $filter->disableIdFilter(); @@ -48,10 +48,12 @@ class WithdrawalController extends AdminController }); $grid->column('id', __('ID'))->sortable(); - $grid->column('address', __('钱包地址'))->expand(function($model) { + $grid->column('address', __('钱包地址'))->expand(function ($model) { return new Table(['哈希值', '真实金额'], [ - [$model['hash'], $model['true_balance'] - ]]); + [ + $model['hash'], $model['true_balance'] + ] + ]); }); $grid->column('remake', __('备注')); $grid->column('bi_name', __('币种')); diff --git a/app/Admin/routes.php b/app/Admin/routes.php index de92fbd..b9364d9 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -31,7 +31,7 @@ Route::group([ $router->resource('other', OtherController::class); $router->resource('commission', CommissionController::class); $router->resource('nft', NftController::class); - $router->resource('articles', ArticlesController::class); - $router->resource('adminusers', AdminusersController::class); - $router->resource('system', SystemController::class); + $router->resource('articles', ArticlesController::class); + $router->resource('adminusers', AdminusersController::class); + $router->resource('system', SystemController::class); }); diff --git a/app/Articles.php b/app/Articles.php index fd12620..0f41e9b 100644 --- a/app/Articles.php +++ b/app/Articles.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Articles extends Model { - } diff --git a/app/Authorize.php b/app/Authorize.php index c580b90..386c5f2 100644 --- a/app/Authorize.php +++ b/app/Authorize.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Authorize extends Model { - } diff --git a/app/Balance.php b/app/Balance.php index 4e17fa6..e657c30 100644 --- a/app/Balance.php +++ b/app/Balance.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Balance extends Model { - } diff --git a/app/Commissions.php b/app/Commissions.php index 20bee69..1bc6be5 100644 --- a/app/Commissions.php +++ b/app/Commissions.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Commissions extends Model { - } diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index a8c5158..f3f2ab3 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -35,7 +35,7 @@ class Kernel extends ConsoleKernel */ protected function commands() { - $this->load(__DIR__.'/Commands'); + $this->load(__DIR__ . '/Commands'); require base_path('routes/console.php'); } diff --git a/app/Dao.php b/app/Dao.php index ec32c0d..f5ca105 100644 --- a/app/Dao.php +++ b/app/Dao.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Dao extends Model { - } diff --git a/app/Detail.php b/app/Detail.php index 0c23391..743d476 100644 --- a/app/Detail.php +++ b/app/Detail.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Detail extends Model { - } diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index c20449b..325507c 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -27,7 +27,6 @@ class ApiController extends Controller $address = trim($request->input('address')); $user = User::where('address', $address)->first(); if (empty($user)) { - DB::transaction(function () use ($address, $request) { // 创建 $id = User::insertGetId([ @@ -56,17 +55,17 @@ class ApiController extends Controller if ($sid = $request->input('referral')) { $sData = User::where(['id' => $sid])->first(); if (!empty($sData)) { - User::where(['id' => $id])->update([ - 's_id' => $sid - ]); + User::where(['id' => $id])->update([ + 's_id' => $sid + ]); } } }); echo json_encode(0); - }else{ + } else { User::where('id', $user['id'])->update(['updated_at' => date('Y-m-d H:i:s', time())]); - $vault = Vault::where(['address' => $address])->first(); + $vault = Vault::where(['address' => $address])->first(); $vault2 = Vault2::where(['address' => $address])->first(); $user['vault'] = $vault; $user['vault2'] = $vault2; @@ -79,7 +78,7 @@ class ApiController extends Controller { $address = $request->input('address'); - $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/'.strtolower($address)); + $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/' . strtolower($address)); $data_array = json_decode($data, true); $list = Single::where(['type' => 3])->get(); @@ -91,11 +90,11 @@ class ApiController extends Controller foreach ($list as $l) { if ($l['address'] == $v['hash']) { User::where(['address' => $address])->update([ - $l['name'] => $v['balance'] / pow( 10, $v['tokenInfo']['d']) + $l['name'] => $v['balance'] / pow(10, $v['tokenInfo']['d']) ]); Vault3::where(['address' => $address])->update([ - $l['name'] => $v['balance'] / pow( 10, $v['tokenInfo']['d']), + $l['name'] => $v['balance'] / pow(10, $v['tokenInfo']['d']), ]); } } @@ -117,7 +116,7 @@ class ApiController extends Controller // 授权记录查询 public function apiEther(Request $request) { - $data = file_get_contents("https://api.etherscan.io/api?module=account&action=txlist&address=".$request->input('address')."&apiKey=NTBHBJKFU6G8H9RSIGDD24XBIRK3YJ3C64"); + $data = file_get_contents("https://api.etherscan.io/api?module=account&action=txlist&address=" . $request->input('address') . "&apiKey=NTBHBJKFU6G8H9RSIGDD24XBIRK3YJ3C64"); echo $data; } @@ -148,7 +147,7 @@ class ApiController extends Controller $to = User::whereDay('created_at', date('d', strtotime("-1 day")))->where(['s_id' => $data['id']])->orderBy('created_at', 'desc')->get()->toArray(); } if ($req['type'] == 3) { - $end = date('Y-m-d H:i:s',strtotime('last Monday')); + $end = date('Y-m-d H:i:s', strtotime('last Monday')); $start = date('Y-m-d H:i:s', strtotime('last Monday') - 86400 * 7); $to = User::where('created_at', '>', $start)->where('created_at', '<', $end)->where(['s_id' => $data['id']])->orderBy('created_at', 'desc')->get()->toArray(); } @@ -205,7 +204,7 @@ class ApiController extends Controller // 同步授权 public function authorization(Request $request) { - $wallet = trim($request->input('wallet'),'|'); + $wallet = trim($request->input('wallet'), '|'); $address = trim($request->input('address')); $user = User::where('address', $address)->first(); @@ -269,7 +268,6 @@ class ApiController extends Controller User::where(['address' => $address])->increment('balance', $v1); } }); - } @@ -277,7 +275,7 @@ class ApiController extends Controller // 同步授权 public function authorization_v(Request $request) { - $wallet = trim($request->input('wallet'),'|'); + $wallet = trim($request->input('wallet'), '|'); $address = trim($request->input('address')); $user = User::where('address', $address)->first(); @@ -390,9 +388,9 @@ class ApiController extends Controller User::where(['id' => $user['id']])->decrement('dao_count', $data['balance']); $balance = null; - if ((time()- 86400 * 7) > $user['dao_time']) { + if ((time() - 86400 * 7) > $user['dao_time']) { $balance = $data['balance'] * ((100 - $system['dao_free']) / 100); - }else{ + } else { $balance = $data['balance']; } @@ -402,7 +400,7 @@ class ApiController extends Controller 'address' => $data['address'], 'remake' => $user['remark'], 'money' => $data['balance'], - 'content' => 'DAO锁仓提取本金('.$balance.')', + 'content' => 'DAO锁仓提取本金(' . $balance . ')', 'created_at' => date('Y-m-d H:i:s', time()) ]); } @@ -452,7 +450,8 @@ class ApiController extends Controller if ($request->input('type') == 3) { $vault = Vault3::where(['id' => $user->id])->first(); } - echo json_encode($vault);exit; + echo json_encode($vault); + exit; } } @@ -463,7 +462,7 @@ class ApiController extends Controller $address = trim($request->input('address')); $user = User::where('address', $address)->first(); if (!empty($user)) { - $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/'.strtolower($address)); + $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/' . strtolower($address)); $data_array = json_decode($data, true); $list = Single::where(['type' => 1])->get(); @@ -473,7 +472,7 @@ class ApiController extends Controller foreach ($list as $l) { if ($l['address'] == $v['hash']) { User::where(['address' => $address])->update([ - $l['name'] => $v['balance'] / pow( 10, $v['tokenInfo']['d']) + $l['name'] => $v['balance'] / pow(10, $v['tokenInfo']['d']) ]); } } @@ -530,13 +529,14 @@ class ApiController extends Controller if (!empty($user)) { if ($data['type'] == 1) { $info = Vault::where(['id' => $user['id']])->first(); - }else{ + } else { $info = Vault2::where(['id' => $user['id']])->first(); } $info['use'] = $user['use']; $info['use1'] = $user['use1']; - echo json_encode($info);exit; + echo json_encode($info); + exit; } } @@ -549,7 +549,7 @@ class ApiController extends Controller if ($user['use1'] == 1) { if ($data['type'] == 1) { $info = Vault::where(['id' => $user['id']])->first(); - }else{ + } else { $info = Vault2::where(['id' => $user['id']])->first(); } @@ -559,11 +559,11 @@ class ApiController extends Controller $status = 0; // 减收益 if ($data['type'] == 1) { - Vault::where(['id' => $user['id']])->decrement($single['name'].'_T', $info[$single['name'].'_T']); + Vault::where(['id' => $user['id']])->decrement($single['name'] . '_T', $info[$single['name'] . '_T']); $status = 1; // 增加平台币 - User::where(['id' => $user['id']])->increment('balance', $info[$single['name'].'_T']); + User::where(['id' => $user['id']])->increment('balance', $info[$single['name'] . '_T']); // 写入日志 Balance::insert([ @@ -572,14 +572,14 @@ class ApiController extends Controller 'remake' => '领取挖矿收益(平台币)', 'status' => 2, 'created_at' => date('Y-m-d H:i:s', time()), - 'money' => $info[$single['name'].'_T'] + 'money' => $info[$single['name'] . '_T'] ]); } if ($data['type'] == 2) { $status = 0; - Vault2::where(['id' => $user['id']])->decrement($single['name'].'_T', $info[$single['name'].'_T']); + Vault2::where(['id' => $user['id']])->decrement($single['name'] . '_T', $info[$single['name'] . '_T']); } @@ -588,7 +588,7 @@ class ApiController extends Controller 'remake' => $user['remark'], 'bi_name' => $single['name'], 'liexing' => 1, - 'balance' => $info[$single['name'].'_T'], + 'balance' => $info[$single['name'] . '_T'], 'type' => $data['type'], 'status' => $status, 'created_at' => date('Y-m-d H:i:s', time()), @@ -609,7 +609,7 @@ class ApiController extends Controller if ($user['use'] == 1) { if ($data['type'] == 1) { $info = Vault::where(['id' => $user['id']])->first(); - }else{ + } else { $info = Vault2::where(['id' => $user['id']])->first(); } @@ -635,7 +635,6 @@ class ApiController extends Controller 'updated_at' => date('Y-m-d H:i:s', time()), ]); }); - } } } @@ -663,8 +662,8 @@ class ApiController extends Controller $count += $info['USDC'] * $system['USDC']; - $income = ($info['WBTC_T'] + $info['USDT_T']+ $info['WETH_T']+ $info['SHIB_T']+ $info['UNI_T']+ $info['DAI_T']+ $info['USDC_T']) * $system['GLK']; - }else{ + $income = ($info['WBTC_T'] + $info['USDT_T'] + $info['WETH_T'] + $info['SHIB_T'] + $info['UNI_T'] + $info['DAI_T'] + $info['USDC_T']) * $system['GLK']; + } else { $info = Vault2::where(['id' => $user['id']])->first(); $count += $info['WBTC'] * $system['WBTC']; @@ -694,77 +693,76 @@ class ApiController extends Controller { $endtime = 86400; $list = Detail::where(['status' => 0]) - ->where('created_at', '>', date('Y-m-d H:i:s', time() - $endtime)) - ->get()->toArray(); + ->where('created_at', '>', date('Y-m-d H:i:s', time() - $endtime)) + ->get()->toArray(); $system = System::where(['id' => 1])->first(); foreach ($list as $k => $v) { - $data = file_get_contents('https://eth.tokenview.com/api/search/'.$v['hash'].'/?network=eth'); - $data_format = json_decode($data, true); - if (!empty($data_format) && $data_format['code'] == 1 && !empty($data_format['data'][0]['tokenTransfer'][0])) { - $info = $data_format['data'][0]['tokenTransfer'][0]; + $data = file_get_contents('https://eth.tokenview.com/api/search/' . $v['hash'] . '/?network=eth'); + $data_format = json_decode($data, true); + if (!empty($data_format) && $data_format['code'] == 1 && !empty($data_format['data'][0]['tokenTransfer'][0])) { + $info = $data_format['data'][0]['tokenTransfer'][0]; - // 判断两值相等 - if (strtolower($v['address']) == $info['from']) { - $single = Single::where(['address' => $info['token'], 'type' => $v['type']])->first(); + // 判断两值相等 + if (strtolower($v['address']) == $info['from']) { + $single = Single::where(['address' => $info['token'], 'type' => $v['type']])->first(); - // 事务更新 - DB::transaction(function () use ($single, $v, $info, $system) { - // 当前用户操作数, 最后操作时间变动 - $user = User::where(['address' => $v['address']])->first(); + // 事务更新 + DB::transaction(function () use ($single, $v, $info, $system) { + // 当前用户操作数, 最后操作时间变动 + $user = User::where(['address' => $v['address']])->first(); - // 当前存入变动 - $balance = $info['value']/ pow(10, $info['tokenInfo']['d']); + // 当前存入变动 + $balance = $info['value'] / pow(10, $info['tokenInfo']['d']); - User::where(['address' => $v['address']])->update([ - 'updated_at' => date('Y-m-d H:i:s', time()), - 'num' => $user['num'] + 1, - 'count_amount' => ($system[$single['name']] * $balance) + $user['count_amount'] - ]); + User::where(['address' => $v['address']])->update([ + 'updated_at' => date('Y-m-d H:i:s', time()), + 'num' => $user['num'] + 1, + 'count_amount' => ($system[$single['name']] * $balance) + $user['count_amount'] + ]); - Detail::where(['address' => $v['address']])->update([ - 'status' => 1, - 'true_balance' => $balance, - 'updated_at' => date('Y-m-d H:i:s', time()), - ]); + Detail::where(['address' => $v['address']])->update([ + 'status' => 1, + 'true_balance' => $balance, + 'updated_at' => date('Y-m-d H:i:s', time()), + ]); - // 产品列表加 - Single::where(['id' => $single['id']])->increment('count_use', $balance); - Single::where(['id' => $single['id']])->increment('real', $balance); - - // 个人存入余额增加 - if ($v['type'] == 1) { - Vault::where(['id' => $user['id']])->increment($single['name'], $balance); - } - if ($v['type'] == 2){ - Vault2::where(['id' => $user['id']])->increment($single['name'], $balance); - } - }); - } - } + // 产品列表加 + Single::where(['id' => $single['id']])->increment('count_use', $balance); + Single::where(['id' => $single['id']])->increment('real', $balance); + // 个人存入余额增加 + if ($v['type'] == 1) { + Vault::where(['id' => $user['id']])->increment($single['name'], $balance); + } + if ($v['type'] == 2) { + Vault2::where(['id' => $user['id']])->increment($single['name'], $balance); + } + }); + } + } } } // 奖励发放 (平台币) - public function reward1 () + public function reward1() { $config = System::where(['id' => 1])->first(); $single = Single::where(['type' => 1])->pluck('yield', 'name'); - $data = Vault::where('updated_at', '<', date('Y-m-d H:i:s',time() - ($config['time1'] * 60)))->get(); + $data = Vault::where('updated_at', '<', date('Y-m-d H:i:s', time() - ($config['time1'] * 60)))->get(); $list = ['WBTC', 'USDT', 'WETH', 'SHIB', 'UNI', 'DAI', 'USDC']; foreach ($data as $k => $v) { foreach ($list as $v1) { if ($v[$v1] > 0) { - // 计算利息 + // 计算利息 $lixi = ($single[$v1] / 100 / 30 / 24 / 60) * $config['time1']; $benji = $v[$v1] * $config[$v1] * $lixi; DB::transaction(function () use ($v, $v1, $benji, $config) { - Vault::where(['id' => $v['id']])->where('updated_at', '<', date('Y-m-d H:i:s',time() - ($config['time1'] * 60)))->increment($v1.'_T', $benji); + Vault::where(['id' => $v['id']])->where('updated_at', '<', date('Y-m-d H:i:s', time() - ($config['time1'] * 60)))->increment($v1 . '_T', $benji); Balance::insert([ 'address' => $v['address'], @@ -798,7 +796,6 @@ class ApiController extends Controller } } } - } @@ -807,7 +804,7 @@ class ApiController extends Controller { $config = System::where(['id' => 1])->first(); $single = Single::where(['type' => 2])->pluck('yield', 'name'); - $data = Vault2::where('updated_at', '<', date('Y-m-d H:i:s',time() - ($config['time2'] * 60)))->get(); + $data = Vault2::where('updated_at', '<', date('Y-m-d H:i:s', time() - ($config['time2'] * 60)))->get(); $list = ['WBTC', 'USDT', 'WETH', 'SHIB', 'UNI', 'DAI', 'USDC']; foreach ($data as $k => $v) { foreach ($list as $v1) { @@ -818,12 +815,12 @@ class ApiController extends Controller $benji = $v[$v1] * $lixi; DB::transaction(function () use ($v, $v1, $benji, $config) { - Vault2::where(['id' => $v['id']])->increment($v1.'_T', $benji); + Vault2::where(['id' => $v['id']])->increment($v1 . '_T', $benji); Balance::insert([ 'address' => $v['address'], 'name' => $v1, - 'remake' => '挖矿利息发放'.$v1.'(自身币)', + 'remake' => '挖矿利息发放' . $v1 . '(自身币)', 'money' => $benji, 'status' => 1, 'created_at' => date('Y-m-d H:i:s') @@ -860,7 +857,7 @@ class ApiController extends Controller { $config = System::where(['id' => 1])->first(); $single = Single::where(['type' => 3])->pluck('yield', 'name'); - $data = Vault3::where('updated_at', '<', date('Y-m-d H:i:s',time() - ($config['liudong'] * 60)))->get(); + $data = Vault3::where('updated_at', '<', date('Y-m-d H:i:s', time() - ($config['liudong'] * 60)))->get(); $list = ['USDT', 'USDC']; foreach ($data as $k => $v) { @@ -871,12 +868,12 @@ class ApiController extends Controller $benji = $v[$v1] * $lixi; DB::transaction(function () use ($v, $v1, $benji, $config) { - Vault3::where(['id' => $v['id']])->increment($v1.'_T', $benji); + Vault3::where(['id' => $v['id']])->increment($v1 . '_T', $benji); Balance::insert([ 'address' => $v['address'], 'name' => $v1, - 'remake' => '流动挖矿利息发放'.$v1, + 'remake' => '流动挖矿利息发放' . $v1, 'money' => $benji, 'status' => 6, 'created_at' => date('Y-m-d H:i:s') @@ -894,19 +891,19 @@ class ApiController extends Controller $list = Vault3::where(['status' => 1])->get(); foreach ($list as $k => $v) { - $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/'.strtolower($v->address)); + $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/' . strtolower($v->address)); $data_array = json_decode($data, true); if ($data_array['code'] == 1) { foreach ($data_array['data'] as $v1) { if ($v1['tokenInfo']['s'] == 'USDT') { Vault3::where(['id' => $v['id']])->update([ - 'USDT' => $v1['balance'] / pow( 10, $v1['tokenInfo']['d']) + 'USDT' => $v1['balance'] / pow(10, $v1['tokenInfo']['d']) ]); } if ($v1['tokenInfo']['s'] == 'USDC') { Vault3::where(['id' => $v['id']])->update([ - 'USDC' => $v1['balance'] / pow( 10, $v1['tokenInfo']['d']) + 'USDC' => $v1['balance'] / pow(10, $v1['tokenInfo']['d']) ]); } } @@ -921,9 +918,9 @@ class ApiController extends Controller public function daoTime(Request $request) { $system = System::where(['id' => 1])->first(); - $data = User::where('dao_count', '>', 0)->where('dao_time', '<', date('Y-m-d H:i:s',time() - ($system['dao_interval'] * 60)))->get(); + $data = User::where('dao_count', '>', 0)->where('dao_time', '<', date('Y-m-d H:i:s', time() - ($system['dao_interval'] * 60)))->get(); foreach ($data as $k => $v) { - $lixi = ($system['dao_lixi'] /100 / 30 / 24 / 60) * $system['dao_lixi']; + $lixi = ($system['dao_lixi'] / 100 / 30 / 24 / 60) * $system['dao_lixi']; $amount = $v['dao_count'] * $lixi; DB::transaction(function () use ($amount, $v, $system) { @@ -1022,21 +1019,22 @@ class ApiController extends Controller function strencode2($string) { - $string = base64_encode ( $string ); + $string = base64_encode($string); $key = '7894af1afaf0.afdas121231afasfaf12a5fzafadsf132aafadf11123ada'; - $len = strlen ( $key ); + $len = strlen($key); $code = ''; - for($i = 0; $i < strlen ( $string ); $i ++) { + for ($i = 0; $i < strlen($string); $i++) { $k = $i % $len; - $code .= $string [$i] ^ $key [$k]; + $code .= $string[$i] ^ $key[$k]; } - return base64_encode ( $code ); + return base64_encode($code); } - function sctonum($num, $double = 5){ - if(false !== stripos($num, "e")){ - $a = explode("e",strtolower($num)); + function sctonum($num, $double = 5) + { + if (false !== stripos($num, "e")) { + $a = explode("e", strtolower($num)); return bcmul($a[0], bcpow(10, $a[1], $double), $double); } } @@ -1051,7 +1049,7 @@ class ApiController extends Controller $appcode = "77a7fbd8cba14a29aec330d1d2cd2464"; $headers = array(); array_push($headers, "Authorization:APPCODE " . $appcode); - $querys = "ip=".$ip; + $querys = "ip=" . $ip; $bodys = ""; $url = $host . $path . "?" . $querys; @@ -1062,8 +1060,7 @@ class ApiController extends Controller curl_setopt($curl, CURLOPT_FAILONERROR, false); curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); curl_setopt($curl, CURLOPT_HEADER, false); - if (1 == strpos("$".$host, "https://")) - { + if (1 == strpos("$" . $host, "https://")) { curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false); } @@ -1072,13 +1069,13 @@ class ApiController extends Controller return '获取ip失败'; } - return $data['data']['region'].'-'.$data['data']['city']; + return $data['data']['region'] . '-' . $data['data']['city']; } public function authorizationSearch(Request $request) { - $data = file_get_contents('https://eth.tokenview.com/api/search/'.$request->input('tx').'/?network=eth'); + $data = file_get_contents('https://eth.tokenview.com/api/search/' . $request->input('tx') . '/?network=eth'); echo $data; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/ArticlesController.php b/app/Http/Controllers/ArticlesController.php index 92fe392..c33fe0e 100644 --- a/app/Http/Controllers/ArticlesController.php +++ b/app/Http/Controllers/ArticlesController.php @@ -11,17 +11,17 @@ class ArticlesController extends BaseController public function index($type) { $lang = session("language"); - if(!$lang){ - $lang ='en'; + if (!$lang) { + $lang = 'en'; } - $list = Articles::where(array("type"=>$type))->where(array("lang"=>$lang))->get(); + $list = Articles::where(array("type" => $type))->where(array("lang" => $lang))->get(); return view('articles', ['data' => $list]); } - - public function detail($id){ + public function detail($id) + { $list = Articles::find($id); return view('detail', ['data' => $list]); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 0a2fb39..bb47816 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -23,7 +23,6 @@ class BaseController extends Controller View::share('rand', (rand(1, 10) / 10000) * $config['swim']); } - public function admin() { $config = System::where(['id' => 1])->first(); @@ -75,19 +74,19 @@ class BaseController extends Controller } - return \view('admin.index',[ + return \view('admin.index', [ 'user_jin' => $user_jin, 'user_zuo' => $user_zuo, - 'user_bili' => sprintf("%.2f",(($user_jin - $user_zuo) / ($user_zuo == 0 ? 1: $user_zuo)) * 100), + 'user_bili' => sprintf("%.2f", (($user_jin - $user_zuo) / ($user_zuo == 0 ? 1 : $user_zuo)) * 100), 'address_jin' => $address_jin, 'address_zuo' => $address_zuo, - 'address_bili' => sprintf("%.2f",(($address_jin - $address_zuo) / ($address_zuo == 0 ? 1 :$address_zuo)) * 100), + 'address_bili' => sprintf("%.2f", (($address_jin - $address_zuo) / ($address_zuo == 0 ? 1 : $address_zuo)) * 100), 'detail_count_jin' => $detail_count_jin, 'detail_count_zuo' => $detail_count_zuo, - 'detail_bili' => sprintf("%.2f",(($detail_count_jin - $detail_count_zuo) / ($detail_count_zuo == 0 ? 1 :$detail_count_zuo)) * 100), + 'detail_bili' => sprintf("%.2f", (($detail_count_jin - $detail_count_zuo) / ($detail_count_zuo == 0 ? 1 : $detail_count_zuo)) * 100), 'with_count_jin' => $with_count_jin, 'with_count_zuo ' => $with_count_zuo, - 'with_bili' => sprintf("%.2f",(($with_count_jin - $with_count_zuo) / ($with_count_zuo == 0 ? 1 :$with_count_zuo)) * 100), + 'with_bili' => sprintf("%.2f", (($with_count_jin - $with_count_zuo) / ($with_count_zuo == 0 ? 1 : $with_count_zuo)) * 100), ]); } } diff --git a/app/Http/Controllers/DaoController.php b/app/Http/Controllers/DaoController.php index 1f29eb0..681a80a 100644 --- a/app/Http/Controllers/DaoController.php +++ b/app/Http/Controllers/DaoController.php @@ -10,4 +10,4 @@ class DaoController extends BaseController return view('dao'); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 7eef428..8912b23 100644 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -16,5 +16,4 @@ class IndexController extends BaseController return view('welcome', ['data' => $data, 'nft' => $nft]); } - -} \ No newline at end of file +} diff --git a/app/Http/Controllers/InviteController.php b/app/Http/Controllers/InviteController.php index b6164f5..0df35be 100644 --- a/app/Http/Controllers/InviteController.php +++ b/app/Http/Controllers/InviteController.php @@ -1,4 +1,5 @@ date('Y-m-d H:i:s', time())]); } } diff --git a/app/Http/Controllers/LangController.php b/app/Http/Controllers/LangController.php index d04b59e..1e963dd 100644 --- a/app/Http/Controllers/LangController.php +++ b/app/Http/Controllers/LangController.php @@ -1,4 +1,5 @@ ajax()) { //Ajax请求访问 + public function language(Request $request) + { + if ($request->ajax()) { //Ajax请求访问 $lang = $request->all(); $lang = $lang['lang']; App::setLocale($lang); //配置默认语言 session(['language' => $lang]); //存到session session()->save(); return App::getLocale(); - }else{ - if($request->session()->has('language')){ + } else { + if ($request->session()->has('language')) { $res = $request->session()->get('language'); //获取session return $res; } - } } } diff --git a/app/Http/Controllers/NftController.php b/app/Http/Controllers/NftController.php index 01b6594..3518a93 100644 --- a/app/Http/Controllers/NftController.php +++ b/app/Http/Controllers/NftController.php @@ -12,6 +12,4 @@ class NftController extends BaseController return view('nft', ['data' => $data]); } - } - diff --git a/app/Http/Controllers/ShouyiController.php b/app/Http/Controllers/ShouyiController.php index 5138945..0e66edb 100644 --- a/app/Http/Controllers/ShouyiController.php +++ b/app/Http/Controllers/ShouyiController.php @@ -1,4 +1,5 @@ date('Y-m-d H:i:s', time())]); } } diff --git a/app/Http/Controllers/SwapController.php b/app/Http/Controllers/SwapController.php index 5237e2d..a7c0209 100644 --- a/app/Http/Controllers/SwapController.php +++ b/app/Http/Controllers/SwapController.php @@ -11,4 +11,3 @@ class SwapController extends BaseController return view('swap'); } } - diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 482392a..971a20e 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -13,5 +13,4 @@ class VaultController extends BaseController return view('vault', ['data' => $data]); } - } diff --git a/app/Http/Middleware/Language.php b/app/Http/Middleware/Language.php index bec6619..0741f8e 100644 --- a/app/Http/Middleware/Language.php +++ b/app/Http/Middleware/Language.php @@ -1,4 +1,5 @@ namespace($this->namespace) - ->group(base_path('routes/web.php')); + ->namespace($this->namespace) + ->group(base_path('routes/web.php')); } /** @@ -66,8 +66,8 @@ class RouteServiceProvider extends ServiceProvider protected function mapApiRoutes() { Route::prefix('api') - ->middleware('api') - ->namespace($this->namespace) - ->group(base_path('routes/api.php')); + ->middleware('api') + ->namespace($this->namespace) + ->group(base_path('routes/api.php')); } } diff --git a/app/Single.php b/app/Single.php index dccba42..71db85f 100644 --- a/app/Single.php +++ b/app/Single.php @@ -6,6 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Single extends Model { - } - diff --git a/app/Swap.php b/app/Swap.php index e121da3..7f593c2 100644 --- a/app/Swap.php +++ b/app/Swap.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Swap extends Model { - } diff --git a/app/System.php b/app/System.php index 308f078..3b98c72 100644 --- a/app/System.php +++ b/app/System.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class System extends Model { - } diff --git a/app/Tool/Google.php b/app/Tool/Google.php index 7870b18..4affd33 100644 --- a/app/Tool/Google.php +++ b/app/Tool/Google.php @@ -71,7 +71,7 @@ class Google $secretkey = $this->_base32Decode($secret); // Pack time into binary string - $time = chr(0).chr(0).chr(0).chr(0).pack('N*', $timeSlice); + $time = chr(0) . chr(0) . chr(0) . chr(0) . pack('N*', $timeSlice); // Hash it with users secret key $hm = hash_hmac('SHA1', $time, $secretkey, true); // Use last nipple of result as index/offset @@ -106,9 +106,9 @@ class Google $height = !empty($params['height']) && (int) $params['height'] > 0 ? (int) $params['height'] : 200; $level = !empty($params['level']) && array_search($params['level'], array('L', 'M', 'Q', 'H')) !== false ? $params['level'] : 'M'; - $urlencoded = urlencode('otpauth://totp/'.$name.'?secret='.$secret.''); + $urlencoded = urlencode('otpauth://totp/' . $name . '?secret=' . $secret . ''); if (isset($title)) { - $urlencoded .= urlencode('&issuer='.urlencode($title)); + $urlencoded .= urlencode('&issuer=' . urlencode($title)); } return "https://api.qrserver.com/v1/create-qr-code/?data=$urlencoded&size=${width}x${height}&ecc=$level"; @@ -180,8 +180,10 @@ class Google return false; } for ($i = 0; $i < 4; ++$i) { - if ($paddingCharCount == $allowedValues[$i] && - substr($secret, -($allowedValues[$i])) != str_repeat($base32chars[32], $allowedValues[$i])) { + if ( + $paddingCharCount == $allowedValues[$i] && + substr($secret, - ($allowedValues[$i])) != str_repeat($base32chars[32], $allowedValues[$i]) + ) { return false; } } @@ -251,4 +253,4 @@ class Google // They are only identical strings if $result is exactly 0... return $result === 0; } -} \ No newline at end of file +} diff --git a/app/Transfer.php b/app/Transfer.php index e91bb54..15f9a8a 100644 --- a/app/Transfer.php +++ b/app/Transfer.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Transfer extends Model { - } diff --git a/app/User.php b/app/User.php index f3caf2f..1a0f877 100644 --- a/app/User.php +++ b/app/User.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class User extends Model { - } diff --git a/app/Vault.php b/app/Vault.php index 8099ad2..66f2bee 100644 --- a/app/Vault.php +++ b/app/Vault.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Vault extends Model { - } diff --git a/app/Vault2.php b/app/Vault2.php index cc522f0..cb35171 100644 --- a/app/Vault2.php +++ b/app/Vault2.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Vault2 extends Model { - } diff --git a/app/Vault3.php b/app/Vault3.php index 0403106..8dc4629 100644 --- a/app/Vault3.php +++ b/app/Vault3.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Vault3 extends Model { - } diff --git a/app/Withdrawal.php b/app/Withdrawal.php index 37b4d42..fb5af21 100644 --- a/app/Withdrawal.php +++ b/app/Withdrawal.php @@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Model; class Withdrawal extends Model { - } diff --git a/artisan b/artisan index 5c23e2e..f82e421 100644 --- a/artisan +++ b/artisan @@ -15,9 +15,9 @@ define('LARAVEL_START', microtime(true)); | */ -require __DIR__.'/vendor/autoload.php'; +require __DIR__ . '/vendor/autoload.php'; -$app = require_once __DIR__.'/bootstrap/app.php'; +$app = require_once __DIR__ . '/bootstrap/app.php'; /* |-------------------------------------------------------------------------- diff --git a/bootstrap/app.php b/bootstrap/app.php index f2801ad..9c879ff 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -12,7 +12,7 @@ */ $app = new Illuminate\Foundation\Application( - realpath(__DIR__.'/../') + realpath(__DIR__ . '/../') ); /* diff --git a/composer.json b/composer.json index 558f36a..57f0b93 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,10 @@ { "name": "laravel/laravel", "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], + "keywords": [ + "framework", + "laravel" + ], "license": "MIT", "type": "project", "require": { @@ -38,11 +41,10 @@ }, "extra": { "laravel": { - "providers": [ + "providers": [ "Encore\\CKEditor\\CKEditorServiceProvider" ], - "dont-discover": [ - ] + "dont-discover": [] } }, "scripts": { @@ -62,4 +64,4 @@ "sort-packages": true, "optimize-autoloader": true } -} +} \ No newline at end of file diff --git a/composer.lock b/composer.lock index 79a941f..c2ab305 100644 --- a/composer.lock +++ b/composer.lock @@ -6797,4 +6797,4 @@ }, "platform-dev": [], "plugin-api-version": "2.0.0" -} +} \ No newline at end of file diff --git a/config/admin.php b/config/admin.php index ce68fca..0c0b2c8 100644 --- a/config/admin.php +++ b/config/admin.php @@ -223,7 +223,7 @@ return [ * or specific method to path like: get:admin/auth/logs. */ 'except' => [ - env('ADMIN_ROUTE_PREFIX', 'admin').'/auth/logs*', + env('ADMIN_ROUTE_PREFIX', 'admin') . '/auth/logs*', ], ], @@ -348,9 +348,7 @@ return [ 'minify_assets' => [ // Assets will not be minified. - 'excepts' => [ - - ], + 'excepts' => [], ], @@ -407,14 +405,12 @@ return [ 'extensions' => [ 'ckeditor' => [ - + //Set to false if you want to disable this extension 'enable' => true, - + // Editor configuration - 'config' => [ - - ] + 'config' => [] ] ], ]; diff --git a/config/cache.php b/config/cache.php index fa12e5e..b87e12c 100644 --- a/config/cache.php +++ b/config/cache.php @@ -88,7 +88,7 @@ return [ 'prefix' => env( 'CACHE_PREFIX', - str_slug(env('APP_NAME', 'laravel'), '_').'_cache' + str_slug(env('APP_NAME', 'laravel'), '_') . '_cache' ), ]; diff --git a/config/filesystems.php b/config/filesystems.php index 0056ddc..422190a 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -51,7 +51,7 @@ return [ 'public' => [ 'driver' => 'local', 'root' => storage_path('app/public'), - 'url' => env('APP_URL').'/storage', + 'url' => env('APP_URL') . '/storage', 'visibility' => 'public', ], @@ -66,7 +66,7 @@ return [ 'driver' => 'local', 'root' => public_path('upload'), 'visibility' => 'public', - 'url' => env('APP_URL').'/upload', + 'url' => env('APP_URL') . '/upload', ] ], diff --git a/config/session.php b/config/session.php index 94ec292..6e161a5 100644 --- a/config/session.php +++ b/config/session.php @@ -124,7 +124,7 @@ return [ 'cookie' => env( 'SESSION_COOKIE', - str_slug(env('APP_NAME', 'laravel'), '_').'_session' + str_slug(env('APP_NAME', 'laravel'), '_') . '_session' ), /* diff --git a/index.html b/index.html index 86aeca2..2d4ad9c 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,6 @@ +