Browse Source

feat: correct auto type hiting

Anankke 3 years ago
parent
commit
3fe341f9e6
39 changed files with 111 additions and 158 deletions
  1. 2 2
      src/Controllers/Admin/AnnController.php
  2. 2 2
      src/Controllers/Admin/CodeController.php
  3. 2 2
      src/Controllers/Admin/DetectBanLogController.php
  4. 2 2
      src/Controllers/Admin/DetectController.php
  5. 2 2
      src/Controllers/Admin/GConfigController.php
  6. 2 2
      src/Controllers/Admin/IpController.php
  7. 2 2
      src/Controllers/Admin/NodeController.php
  8. 6 2
      src/Controllers/Admin/SettingController.php
  9. 2 2
      src/Controllers/Admin/ShopController.php
  10. 2 2
      src/Controllers/Admin/SubscribeLogController.php
  11. 2 2
      src/Controllers/Admin/TicketController.php
  12. 2 2
      src/Controllers/Admin/UserController.php
  13. 2 2
      src/Controllers/Admin/UserLog/BoughtLogController.php
  14. 2 2
      src/Controllers/Admin/UserLog/CodeLogController.php
  15. 2 2
      src/Controllers/Admin/UserLog/DetectLogController.php
  16. 2 2
      src/Controllers/Admin/UserLog/LoginLogController.php
  17. 2 2
      src/Controllers/Admin/UserLog/SubLogController.php
  18. 2 1
      src/Controllers/AdminController.php
  19. 2 2
      src/Controllers/User/DetectController.php
  20. 2 2
      src/Controllers/User/NodeController.php
  21. 2 2
      src/Controllers/User/ShopController.php
  22. 2 2
      src/Controllers/User/TicketController.php
  23. 1 1
      src/Models/User.php
  24. 2 2
      src/Services/Auth/Cookie.php
  25. 19 6
      src/Services/Gateway/AbstractPayment.php
  26. 11 22
      src/Services/Gateway/AopF2F.php
  27. 10 16
      src/Services/Gateway/CoinPay.php
  28. 6 6
      src/Services/Gateway/CoinPay/CoinPayConfig.php
  29. 8 8
      src/Services/Gateway/CoinPay/CoinPayConfigInterface.php
  30. 1 1
      src/Services/Gateway/CoinPay/CoinPayDataBase.php
  31. 0 8
      src/Services/Gateway/PAYJS.php
  32. 0 9
      src/Services/Gateway/PaymentWall.php
  33. 0 5
      src/Services/Gateway/StripeCard.php
  34. 0 16
      src/Services/Gateway/THeadPay.php
  35. 0 10
      src/Services/Gateway/Vmqpay.php
  36. 1 1
      src/Utils/DatatablesHelper.php
  37. 1 1
      src/Utils/ResponseHelper.php
  38. 1 1
      src/Utils/Tools.php
  39. 2 2
      src/Utils/URL.php

+ 2 - 2
src/Controllers/Admin/AnnController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\Ann;
 use App\Models\User;
 use App\Utils\ResponseHelper;
@@ -12,7 +12,7 @@ use App\Utils\Telegram;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class AnnController extends AdminController
+final class AnnController extends BaseController
 {
     /**
      * 后台公告页面

+ 2 - 2
src/Controllers/Admin/CodeController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\Code;
 use App\Models\Setting;
 use App\Services\Auth;
@@ -14,7 +14,7 @@ use App\Utils\Tools;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class CodeController extends AdminController
+final class CodeController extends BaseController
 {
     /**
      * 后台充值码及充值记录页面

+ 2 - 2
src/Controllers/Admin/DetectBanLogController.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\DetectBanLog;
 use App\Utils\ResponseHelper;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class DetectBanLogController extends AdminController
+final class DetectBanLogController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/Admin/DetectController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\DetectLog;
 use App\Models\DetectRule;
 use App\Utils\ResponseHelper;
@@ -12,7 +12,7 @@ use App\Utils\Telegram;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class DetectController extends AdminController
+final class DetectController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/Admin/GConfigController.php

@@ -4,13 +4,13 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\GConfig;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class GConfigController extends AdminController
+final class GConfigController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/Admin/IpController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\BlockIp;
 use App\Models\Ip;
 use App\Models\LoginIp;
@@ -15,7 +15,7 @@ use App\Utils\Tools;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class IpController extends AdminController
+final class IpController extends BaseController
 {
     /**
      * 后台登录记录页面

+ 2 - 2
src/Controllers/Admin/NodeController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\Node;
 use App\Services\Config;
 use App\Utils\CloudflareDriver;
@@ -15,7 +15,7 @@ use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class NodeController extends AdminController
+final class NodeController extends BaseController
 {
     /**
      * 后台节点页面

+ 6 - 2
src/Controllers/Admin/SettingController.php

@@ -4,9 +4,13 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
+use App\Models\Setting;
+use Slim\Http\Request;
+use Slim\Http\Response;
+use App\Services\Mail;
 
-final class SettingController extends AdminController
+final class SettingController extends BaseController
 {
     public function index($request, $response, $args)
     {

+ 2 - 2
src/Controllers/Admin/ShopController.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\Bought;
 use App\Models\Shop;
 use App\Utils\ResponseHelper;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class ShopController extends AdminController
+final class ShopController extends BaseController
 {
     /**
      * 后台商品页面

+ 2 - 2
src/Controllers/Admin/SubscribeLogController.php

@@ -4,14 +4,14 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\UserSubscribeLog;
 use App\Utils\QQWry;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class SubscribeLogController extends AdminController
+final class SubscribeLogController extends BaseController
 {
     /**
      * 后台订阅记录页面

+ 2 - 2
src/Controllers/Admin/TicketController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\Ticket;
 use App\Models\User;
 use App\Utils\ResponseHelper;
@@ -13,7 +13,7 @@ use Slim\Http\Request;
 use Slim\Http\Response;
 use voku\helper\AntiXSS;
 
-final class TicketController extends AdminController
+final class TicketController extends BaseController
 {
     /**
      * 后台工单页面

+ 2 - 2
src/Controllers/Admin/UserController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\Bought;
 use App\Models\DetectBanLog;
 use App\Models\Setting;
@@ -21,7 +21,7 @@ use Ramsey\Uuid\Uuid;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class UserController extends AdminController
+final class UserController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/Admin/UserLog/BoughtLogController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin\UserLog;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\Bought;
 use App\Models\Shop;
 use App\Models\User;
@@ -12,7 +12,7 @@ use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class BoughtLogController extends AdminController
+final class BoughtLogController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/Admin/UserLog/CodeLogController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin\UserLog;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\Code;
 use App\Models\User;
 use App\Utils\ResponseHelper;
@@ -12,7 +12,7 @@ use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class CodeLogController extends AdminController
+final class CodeLogController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/Admin/UserLog/DetectLogController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin\UserLog;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\DetectLog;
 use App\Models\User;
 use App\Utils\ResponseHelper;
@@ -12,7 +12,7 @@ use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class DetectLogController extends AdminController
+final class DetectLogController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/Admin/UserLog/LoginLogController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin\UserLog;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\LoginIp;
 use App\Models\User;
 use App\Utils\QQWry;
@@ -13,7 +13,7 @@ use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class LoginLogController extends AdminController
+final class LoginLogController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/Admin/UserLog/SubLogController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\Admin\UserLog;
 
-use App\Controllers\AdminController;
+use App\Controllers\BaseController;
 use App\Models\User;
 use App\Models\UserSubscribeLog;
 use App\Utils\QQWry;
@@ -13,7 +13,7 @@ use Psr\Http\Message\ResponseInterface;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class SubLogController extends AdminController
+final class SubLogController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 1
src/Controllers/AdminController.php

@@ -12,11 +12,12 @@ use App\Utils\Tools;
 use Ozdemir\Datatables\Datatables;
 use Slim\Http\Request;
 use Slim\Http\Response;
+use App\Services\Analytics;
 
 /*
  *  Admin Controller
  */
-final class AdminController extends UserController
+final class AdminController extends BaseController
 {
     /**
      * 后台首页

+ 2 - 2
src/Controllers/User/DetectController.php

@@ -4,11 +4,11 @@ declare(strict_types=1);
 
 namespace App\Controllers\User;
 
-use App\Controllers\UserController;
+use App\Controllers\BaseController;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class DetectController extends UserController
+final class DetectController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/User/NodeController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\User;
 
-use App\Controllers\UserController;
+use App\Controllers\BaseController;
 use App\Models\Node;
 use App\Models\User;
 use App\Utils\Tools;
@@ -16,7 +16,7 @@ use Slim\Http\Response;
 /**
  *  User NodeController
  */
-final class NodeController extends UserController
+final class NodeController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/User/ShopController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\User;
 
-use App\Controllers\UserController;
+use App\Controllers\BaseController;
 use App\Models\Coupon;
 use App\Models\Payback;
 use App\Models\Shop;
@@ -12,7 +12,7 @@ use App\Utils\ResponseHelper;
 use Slim\Http\Request;
 use Slim\Http\Response;
 
-final class ShopController extends UserController
+final class ShopController extends BaseController
 {
     /**
      * @param array     $args

+ 2 - 2
src/Controllers/User/TicketController.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Controllers\User;
 
-use App\Controllers\UserController;
+use App\Controllers\BaseController;
 use App\Models\Ticket;
 use App\Models\User;
 use App\Utils\Tools;
@@ -16,7 +16,7 @@ use voku\helper\AntiXSS;
 /**
  *  TicketController
  */
-final class TicketController extends UserController
+final class TicketController extends BaseController
 {
     /**
      * @param array     $args

+ 1 - 1
src/Models/User.php

@@ -44,7 +44,7 @@ final class User extends Model
      * @var array
      */
     protected $casts = [
-        't' => 'float',
+        't' => 'int',
         'u' => 'float',
         'd' => 'float',
         'port' => 'int',

+ 2 - 2
src/Services/Auth/Cookie.php

@@ -17,11 +17,11 @@ final class Cookie extends Base
         $expire_in = $time + time();
         $key = Hash::cookieHash($user->pass, $expire_in);
         Utils\Cookie::set([
-            'uid' => $uid,
+            'uid' => strval($uid),
             'email' => $user->email,
             'key' => $key,
             'ip' => md5($_SERVER['REMOTE_ADDR'] . $_ENV['key'] . $uid . $expire_in),
-            'expire_in' => $expire_in,
+            'expire_in' => strval($expire_in),
         ], $expire_in);
     }
 

+ 19 - 6
src/Services/Gateway/AbstractPayment.php

@@ -19,18 +19,19 @@ use App\Models\User;
 use App\Utils\Telegram;
 use Slim\Http\Request;
 use Slim\Http\Response;
+use Psr\Http\Message\ResponseInterface;
 
 abstract class AbstractPayment
 {
     /**
      * @param array     $args
      */
-    abstract public function purchase(Request $request, Response $response, array $args): void;
+    abstract public function purchase(Request $request, Response $response, array $args): ResponseInterface;
 
     /**
      * @param array     $args
      */
-    abstract public function notify(Request $request, Response $response, array $args): void;
+    abstract public function notify(Request $request, Response $response, array $args): ResponseInterface;
 
     /**
      * 支付网关的 codeName, 规则为 [0-9a-zA-Z_]*
@@ -42,7 +43,7 @@ abstract class AbstractPayment
      *
      * TODO: 传入目前用户信, etc..
      */
-    abstract public static function _enable(): boolean;
+    abstract public static function _enable(): bool;
 
     /**
      * 显示给用户的名称
@@ -52,14 +53,24 @@ abstract class AbstractPayment
     /**
      * @param array     $args
      */
-    abstract public function getReturnHTML(Request $request, Response $response, array $args): void;
+    public function getReturnHTML(Request $request, Response $response, array $args): ResponseInterface
+    {
+        return $response->write('ok');
+    }
 
     /**
      * @param array     $args
      */
-    abstract public function getStatus(Request $request, Response $response, array $args): void;
+    public function getStatus(Request $request, Response $response, array $args): ResponseInterface
+    {
+        $p = Paylist::where('tradeno', $_POST['pid'])->first();
+        return json_encode([
+            'ret' => 1,
+            'result' => $p->satatus,
+        ]);
+    }
 
-    abstract public static function getPurchaseHTML(): void;
+    abstract public static function getPurchaseHTML(): ResponseInterface;
 
     public function postPayment($pid, $method)
     {
@@ -133,4 +144,6 @@ abstract class AbstractPayment
         }
         return false;
     }
+
+
 }

+ 11 - 22
src/Services/Gateway/AopF2F.php

@@ -17,25 +17,28 @@ use App\Services\Auth;
 use App\Services\View;
 use Exception;
 use Omnipay\Omnipay;
+use Slim\Http\Request;
+use Slim\Http\Response;
+use Psr\Http\Message\ResponseInterface;
 
 final class AopF2F extends AbstractPayment
 {
-    public static function _name()
+    public static function _name(): string
     {
         return 'f2fpay';
     }
 
-    public static function _enable()
+    public static function _enable(): bool
     {
         return self::getActiveGateway('f2fpay');
     }
 
-    public static function _readableName()
+    public static function _readableName(): string
     {
         return '支付宝在线充值';
     }
 
-    public function purchase($request, $response, $args)
+    public function purchase(Request $request, Response $response, array $args): ResponseInterface
     {
         $amount = $request->getParam('amount');
         $user = Auth::getUser();
@@ -75,7 +78,7 @@ final class AopF2F extends AbstractPayment
         ]);
     }
 
-    public function notify($request, $response, $args): void
+    public function notify($request, $response, $args): ResponseInterface
     {
         $gateway = $this->createGateway();
         $aliRequest = $gateway->completePurchase();
@@ -87,32 +90,18 @@ final class AopF2F extends AbstractPayment
             $pid = $aliResponse->data('out_trade_no');
             if ($aliResponse->isPaid()) {
                 $this->postPayment($pid, '支付宝当面付 ' . $pid);
-                die('success'); //The response should be 'success' only
+                return $response->write('success');
             }
         } catch (Exception $e) {
-            die('fail');
+            return $response->write('fail');
         }
     }
 
-    public static function getPurchaseHTML()
+    public static function getPurchaseHTML(): ResponseInterface
     {
         return View::getSmarty()->fetch('user/aopf2f.tpl');
     }
 
-    public function getReturnHTML($request, $response, $args)
-    {
-        return 0;
-    }
-
-    public function getStatus($request, $response, $args)
-    {
-        $p = Paylist::where('tradeno', $_POST['pid'])->first();
-        return json_encode([
-            'ret' => 1,
-            'result' => $p->satatus,
-        ]);
-    }
-
     private function createGateway()
     {
         $configs = Setting::getClass('f2f');

+ 10 - 16
src/Services/Gateway/CoinPay.php

@@ -11,6 +11,10 @@ use App\Services\Gateway\CoinPay\CoinPayApi;
 use App\Services\Gateway\CoinPay\CoinPayConfig;
 use App\Services\Gateway\CoinPay\CoinPayException;
 use App\Services\Gateway\CoinPay\CoinPayUnifiedOrder;
+use Slim\Http\Request;
+use Slim\Http\Response;
+use Psr\Http\Message\ResponseInterface;
+
 
 final class CoinPay extends AbstractPayment
 {
@@ -26,22 +30,22 @@ final class CoinPay extends AbstractPayment
         $this->coinPayGatewayUrl = 'https://openapi.coinpay.la/'; // 网关地址
     }
 
-    public static function _name()
+    public static function _name(): string
     {
         return 'coinpay';
     }
 
-    public static function _enable()
+    public static function _enable(): bool
     {
         return self::getActiveGateway('coinpay');
     }
 
-    public static function _readableName()
+    public static function _readableName(): string
     {
         return 'CoinPay 支持BTC、ETH、USDT等数十种数字货币';
     }
 
-    public function purchase($request, $response, $args)
+    public function purchase(Request $request, Response $response, array $args): ResponseInterface
     {
         // set timezone
         date_default_timezone_set('Asia/Hong_Kong');
@@ -95,7 +99,7 @@ final class CoinPay extends AbstractPayment
      *
      * @param array $args
      */
-    public function notify(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args): void
+    public function notify($request, $response, $args): ResponseInterface
     {
         $raw = file_get_contents('php://input');
         file_put_contents(BASE_PATH . '/coinpay_purchase.log', $raw . "\r\n", FILE_APPEND);
@@ -126,17 +130,7 @@ final class CoinPay extends AbstractPayment
         die;
     }
 
-    public function getReturnHTML($request, $response, $args): void
-    {
-        // TODO: Implement getStatus() method.
-    }
-
-    public function getStatus($request, $response, $args): void
-    {
-        // TODO: Implement getStatus() method.
-    }
-
-    public static function getPurchaseHTML()
+    public static function getPurchaseHTML(): ResponseInterface
     {
         return '<div class="card-inner">
 						<div class="form-group pull-left">

+ 6 - 6
src/Services/Gateway/CoinPay/CoinPayConfig.php

@@ -49,18 +49,18 @@ final class CoinPayConfig extends CoinPayConfigInterface
         return 'UTF-8';
     }
 
-    public function getAttach(): void
+    public function getAttach(): string
     {
-        // TODO: Implement GetAttach() method.
+        return '';
     }
 
-    public function getTransCurrency(): void
+    public function getTransCurrency(): string
     {
-        // TODO: Implement GetTransCurrency() method.
+        return '';
     }
 
-    public function getBody(): void
+    public function getBody(): string
     {
-        // TODO: Implement GetBody() method.
+        return '';
     }
 }

+ 8 - 8
src/Services/Gateway/CoinPay/CoinPayConfigInterface.php

@@ -7,26 +7,26 @@ namespace App\Services\Gateway\CoinPay;
 abstract class CoinPayConfigInterface
 {
     // 系统加密key
-    abstract public function getSecret(): void;
+    abstract public function getSecret(): string;
 
     // 支付回调url
-    abstract public function getNotifyUrl(): void;
+    abstract public function getNotifyUrl(): string;
 
     // 同步返回url
-    abstract public function getReturnUrl(): void;
+    abstract public function getReturnUrl(): string;
 
     // 设置应用AppID
-    abstract public function getAppId(): void;
+    abstract public function getAppId(): string;
 
     //附加数据,按原样返回,不填写默认为空.
-    abstract public function getAttach(): void;
+    abstract public function getAttach(): string;
 
     // body数据.不填写默认为空
-    abstract public function getBody(): void;
+    abstract public function getBody(): string;
 
     // 货币代号,不填写默认为CNY  可选值为CNY USD
-    abstract public function getTransCurrency(): void;
+    abstract public function getTransCurrency(): string;
 
     // 表单提交字符集编码
-    abstract public function getPostCharset(): void;
+    abstract public function getPostCharset(): string;
 }

+ 1 - 1
src/Services/Gateway/CoinPay/CoinPayDataBase.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 namespace App\Services\Gateway\CoinPay;
 
-final class CoinPayDataBase
+abstract class CoinPayDataBase
 {
     private $values = [];
 

+ 0 - 8
src/Services/Gateway/PAYJS.php

@@ -198,12 +198,4 @@ final class PAYJS extends AbstractPayment
         }
         return View::getSmarty()->assign('money', $money)->assign('success', $success)->fetch('user/pay_success.tpl');
     }
-    public function getStatus($request, $response, $args)
-    {
-        $return = [];
-        $p = Paylist::where('tradeno', $_POST['pid'])->first();
-        $return['ret'] = 1;
-        $return['result'] = $p->status;
-        return json_encode($return);
-    }
 }

+ 0 - 9
src/Services/Gateway/PaymentWall.php

@@ -121,13 +121,4 @@ final class PaymentWall extends AbstractPayment
         return $widget->getHtmlCode(['height' => $configs['pmw_height'], 'width' => '100%']);
     }
 
-    public function getReturnHTML($request, $response, $args): void
-    {
-        // TODO: Implement getReturnHTML() method.
-    }
-
-    public function getStatus($request, $response, $args): void
-    {
-        // TODO: Implement getStatus() method.
-    }
 }

+ 0 - 5
src/Services/Gateway/StripeCard.php

@@ -103,11 +103,6 @@ final class StripeCard extends AbstractPayment
         header('Location: ' . $_ENV['baseUrl'] . '/user/code');
     }
 
-    public function getStatus($request, $response, $args): void
-    {
-        // TODO: Implement getStatus() method.
-    }
-
     public static function exchange($currency)
     {
         $ch = curl_init();

+ 0 - 16
src/Services/Gateway/THeadPay.php

@@ -97,20 +97,4 @@ final class THeadPay extends AbstractPayment
     {
         return View::getSmarty()->fetch('user/theadpay.tpl');
     }
-
-    public function getReturnHTML($request, $response, $args)
-    {
-        return 0;
-    }
-
-    public function getStatus($request, $response, $args)
-    {
-        $pid = $request->getParam('pid');
-
-        $p = Paylist::where('tradeno', $pid)->first();
-        return $response->withJson([
-            'ret' => 1,
-            'result' => $p->status,
-        ]);
-    }
 }

+ 0 - 10
src/Services/Gateway/Vmqpay.php

@@ -93,14 +93,4 @@ final class Vmqpay extends AbstractPayment
             </div>
         ';
     }
-
-    public function getReturnHTML($request, $response, $args): void
-    {
-        // TODO: Implement getReturnHTML() method.
-    }
-
-    public function getStatus($request, $response, $args): void
-    {
-        // TODO: Implement getStatus() method.
-    }
 }

+ 1 - 1
src/Utils/DatatablesHelper.php

@@ -18,7 +18,7 @@ final class DatatablesHelper implements DatabaseInterface
         $capsule = new Capsule();
         $capsule->addConnection(Config::getDbConfig(), 'default');
         $this->connection = $capsule->getConnection('default');
-        $this->connection->run("set session sql_mode='';");
+        $this->connection->query("set session sql_mode='';");
     }
 
     public function connect()

+ 1 - 1
src/Utils/ResponseHelper.php

@@ -26,7 +26,7 @@ final class ResponseHelper
         ]);
     }
 
-    public static function buildTableConfig(string $uri, array $data): array
+    public static function buildTableConfig(array $data, string $uri): array
     {
         return [
             'total_column' => $data,

+ 1 - 1
src/Utils/Tools.php

@@ -307,7 +307,7 @@ final class Tools
     }
 
     // Unix time to Date Time
-    public static function toDateTime($time)
+    public static function toDateTime(int $time)
     {
         return date('Y-m-d H:i:s', $time);
     }

+ 2 - 2
src/Utils/URL.php

@@ -90,7 +90,7 @@ final class URL
         return $return_array;
     }
 
-    public static function SSCanConnect(User $user, $mu_port = 0): int
+    public static function SSCanConnect(User $user, $mu_port = 0): bool
     {
         if ($mu_port !== 0) {
             $mu_user = User::where('port', '=', $mu_port)
@@ -105,7 +105,7 @@ final class URL
             self::canObfsConnect($user->obfs) >= 2;
     }
 
-    public static function SSRCanConnect(User $user, $mu_port = 0): int
+    public static function SSRCanConnect(User $user, $mu_port = 0): bool
     {
         if ($mu_port !== 0) {
             $mu_user = User::where('port', '=', $mu_port)