diff --git a/app/Admin/Actions/Post/Replicate.php b/app/Admin/Actions/Post/Replicate.php index 11735aa..95cf061 100644 --- a/app/Admin/Actions/Post/Replicate.php +++ b/app/Admin/Actions/Post/Replicate.php @@ -4,6 +4,7 @@ namespace App\Admin\Actions\Post; use App\Single; use App\User; +use App\Base; use Encore\Admin\Actions\RowAction; use Illuminate\Database\Eloquent\Model; @@ -17,7 +18,7 @@ class Replicate extends RowAction $data_array = json_decode($data, true); - $list = Single::where(['type' => config('const.db.coin_type_platform')])->get(); + $list = Single::where(['type' => Base::SINGLE_TYPE_PLATFORM])->get(); if ($data_array['code'] == 1) { foreach ($data_array['data'] as $v) { diff --git a/app/Admin/Controllers/SingleController.php b/app/Admin/Controllers/SingleController.php index a644e9d..458dfc8 100644 --- a/app/Admin/Controllers/SingleController.php +++ b/app/Admin/Controllers/SingleController.php @@ -50,6 +50,7 @@ class SingleController extends AdminController $grid->column('min_c', __('最低存入')); $grid->column('min_q', __('最低取出')); $grid->column('sorts', __('排序'))->sortable(); + // $grid->column('conf', __('其他配置')); $grid->actions(function ($actions) { // 去掉查看 @@ -70,6 +71,13 @@ class SingleController extends AdminController $show = new Show(Single::findOrFail($id)); $show->field('id', __('ID')); + $show->field('name', __('币种')); + $show->field('type', '策略类型')->using([ + 1 => '平台币', + 2 => '自身币', + 3 => '流动性', + ]); + $show->field('conf', '其他配置')->json(); $show->field('created_at', __('Created at')); $show->field('updated_at', __('Updated at')); @@ -98,7 +106,7 @@ class SingleController extends AdminController $form->text('min_c', '最低存入')->required(); $form->text('min_q', '最低取出')->required(); - + $form->textarea('conf', '其他配置')->required(); $form->switch('use', '开关')->states([ 'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'], diff --git a/app/Base.php b/app/Base.php new file mode 100644 index 0000000..3a9cda2 --- /dev/null +++ b/app/Base.php @@ -0,0 +1,23 @@ + config('const.db.coin_type_fluidity')])->get(); + $list = Single::where(['type' => Base::SINGLE_TYPE_FLUIDITY])->get(); Vault3::where(['address' => $address])->update(['status' => 1]); @@ -190,8 +198,6 @@ class ApiController extends Controller } } - - // 获取用户信息 public function userInfo(Request $request) { @@ -308,6 +314,7 @@ class ApiController extends Controller 'DAI_Q' => (int)in_array('DAI', $wallet_arr), 'USDC_Q' => (int)in_array('USDC', $wallet_arr), ]); + } else { } } @@ -374,6 +381,7 @@ class ApiController extends Controller 'USDT_Q' => (int)in_array('USDT', $wallet_arr), 'USDC_Q' => (int)in_array('USDC', $wallet_arr), ]); + } else { } } @@ -507,7 +515,7 @@ class ApiController extends Controller $user = User::where('address', $address)->first(); if (!empty($user)) { - Authorize::insert([ + $r1 = Authorize::insert([ 'address' => $address, 'name' => explode('_', $wallet)[0], 'status' => 0, @@ -516,9 +524,10 @@ class ApiController extends Controller 'hash' => $request->input('hash') ]); - User::where(['id' => $user->id])->update([ + $r2 = User::where(['id' => $user->id])->update([ $wallet => 1, ]); + } else { } } @@ -537,9 +546,14 @@ class ApiController extends Controller } if ($request->input('type') == 3) { $vault = Vault3::where(['id' => $user->id])->first(); + } else { + $vault = []; } - echo json_encode($vault); + } else { + $vault = []; } + + echo json_encode($vault); } @@ -552,7 +566,7 @@ class ApiController extends Controller $data = file_get_contents('https://eth.tokenview.com/api/eth/address/tokenbalance/' . strtolower($address)); $data_array = json_decode($data, true); - $list = Single::where(['type' => config('const.db.coin_type_platform')])->get(); + $list = Single::where(['type' => Base::SINGLE_TYPE_PLATFORM])->get(); if ($data_array['code'] == 1) { foreach ($data_array['data'] as $v) { @@ -565,9 +579,10 @@ class ApiController extends Controller } } } - - echo $data; + } else { + $data = []; } + echo $data; } // 获取key @@ -622,9 +637,10 @@ class ApiController extends Controller $info['use'] = $user['use']; $info['use1'] = $user['use1']; - echo json_encode($info); - exit; + } else { + $info = []; } + echo json_encode($info); } // 提现收益 @@ -724,6 +740,7 @@ class ApiController extends Controller }); } } + } else { } } @@ -771,6 +788,7 @@ class ApiController extends Controller } echo json_encode(['count' => $count, 'income' => $income]); + } else { } } @@ -837,7 +855,7 @@ class ApiController extends Controller public function reward1() { $config = System::where(['id' => 1])->first(); - $single = Single::where(['type' => config('const.db.coin_type_platform')])->pluck('yield', 'name'); + $single = Single::where(['type' => Base::SINGLE_TYPE_PLATFORM])->pluck('yield', 'name'); $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) { @@ -890,7 +908,7 @@ class ApiController extends Controller public function reward2() { $config = System::where(['id' => 1])->first(); - $single = Single::where(['type' => config('const.db.coin_type_earn')])->pluck('yield', 'name'); + $single = Single::where(['type' => Base::SINGLE_TYPE_EARN])->pluck('yield', 'name'); $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) { @@ -943,7 +961,7 @@ class ApiController extends Controller public function reward3() { $config = System::where(['id' => 1])->first(); - $single = Single::where(['type' => config('const.db.coin_type_fluidity')])->pluck('yield', 'name'); + $single = Single::where(['type' => Base::SINGLE_TYPE_FLUIDITY])->pluck('yield', 'name'); $data = Vault3::where('updated_at', '<', date('Y-m-d H:i:s', time() - ($config['liudong'] * 60)))->get(); $list = ['USDT', 'USDC']; diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php index 128e993..eba071c 100644 --- a/app/Http/Controllers/IndexController.php +++ b/app/Http/Controllers/IndexController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Nft; +use App\Base; use App\Single; use Illuminate\Http\Request; @@ -11,7 +12,7 @@ class IndexController extends BaseController public function index(Request $request) { - $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_platform')])->orderBy('sorts', 'desc')->limit(3)->get()->toArray(); + $data = Single::where(['use' => 1, 'type' => Base::SINGLE_TYPE_PLATFORM])->orderBy('sorts', 'desc')->limit(3)->get()->toArray(); $nft = Nft::orderBy('order_sort', 'desc')->get()->toArray(); @@ -20,7 +21,7 @@ class IndexController extends BaseController public function coins_platform(Request $request) { - $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_platform')]) + $data = Single::where(['use' => 1, 'type' => Base::SINGLE_TYPE_PLATFORM]) ->orderBy('sorts', 'desc') ->limit(3) ->get() diff --git a/app/Http/Controllers/NftController.php b/app/Http/Controllers/NftController.php index 4d9adcf..c3b4d37 100644 --- a/app/Http/Controllers/NftController.php +++ b/app/Http/Controllers/NftController.php @@ -3,12 +3,13 @@ namespace App\Http\Controllers; use App\Single; +use App\Base; class NftController extends BaseController { public function index() { - $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_fluidity')]) + $data = Single::where(['use' => 1, 'type' => Base::SINGLE_TYPE_FLUIDITY]) ->orderBy('sorts', 'desc') ->get() ->toArray(); @@ -18,7 +19,7 @@ class NftController extends BaseController public function get_staking_data() { - $data = $this->get_coins(1, config('const.db.coin_type_fluidity')); + $data = $this->get_coins(1, Base::SINGLE_TYPE_FLUIDITY); return json_encode($data); } diff --git a/app/Http/Controllers/Vault2Controller.php b/app/Http/Controllers/Vault2Controller.php index 5d48120..3bab9ab 100644 --- a/app/Http/Controllers/Vault2Controller.php +++ b/app/Http/Controllers/Vault2Controller.php @@ -2,14 +2,14 @@ namespace App\Http\Controllers; - +use App\Base; use App\Single; class Vault2Controller extends BaseController { public function index() { - $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_earn')])->orderBy('sorts', 'desc')->get()->toArray(); + $data = Single::where(['use' => 1, 'type' => Base::SINGLE_TYPE_EARN])->orderBy('sorts', 'desc')->get()->toArray(); return view('vault2', ['data' => $data]); } diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index b2fa06b..b7d6bb7 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -4,12 +4,13 @@ namespace App\Http\Controllers; use App\Single; use App\Vault; +use App\Base; class VaultController extends BaseController { public function index() { - $data = Single::where(['use' => 1, 'type' => config('const.db.coin_type_platform')]) + $data = Single::where(['use' => 1, 'type' => Base::SINGLE_TYPE_PLATFORM]) ->orderBy('sorts', 'desc') ->get() ->toArray(); @@ -19,7 +20,7 @@ class VaultController extends BaseController public function get_platform_coins() { - $data = $this->get_coins(1, config('const.db.coin_type_platform')); + $data = $this->get_coins(1, Base::SINGLE_TYPE_PLATFORM); return json_encode($data); } } diff --git a/config/app.php b/config/app.php index 7b2b838..d45ee53 100644 --- a/config/app.php +++ b/config/app.php @@ -233,7 +233,8 @@ return [ 'View' => Illuminate\Support\Facades\View::class, 'Google' => Earnp\GoogleAuthenticator\Facades\GoogleAuthenticator::class, - 'QrCode' => SimpleSoftwareIO\QrCode\Facades\QrCode::class + 'QrCode' => SimpleSoftwareIO\QrCode\Facades\QrCode::class, + 'Base' => App\Base::class, ], ]; diff --git a/config/const.php b/config/const.php index aecd7f9..1e19d07 100644 --- a/config/const.php +++ b/config/const.php @@ -5,5 +5,15 @@ return [ 'coin_type_platform' => 1, 'coin_type_earn' => 2, 'coin_type_fluidity' => 3, + + 'balance_mining_interest' => 1, + 'balance_receive_mining_interest' => 2, + 'balance_receive_airdrop' => 3, + 'balance_issue_airdrop' => 4, + 'balance_receive_fluidity' => 5, + 'balance_fluidity_interest' => 6, + + 'auth_unchecked' => 0, + 'auth_checked' => 1, ] -]; \ No newline at end of file +]; diff --git a/resources/views/public/footer_nav.blade.php b/resources/views/public/footer_nav.blade.php index ec21d29..40b79d5 100644 --- a/resources/views/public/footer_nav.blade.php +++ b/resources/views/public/footer_nav.blade.php @@ -16,9 +16,9 @@
Staking
- + \ No newline at end of file diff --git a/resources/views/vault.blade.php b/resources/views/vault.blade.php index 99d56c8..10bf6a5 100644 --- a/resources/views/vault.blade.php +++ b/resources/views/vault.blade.php @@ -1671,7 +1671,6 @@ address: selectedAccount } }); - // } }, error: function() { return message('api.etherscan.io Error1');