Merge branch 'develop' into 'test'

Develop

See merge request bp/pay!14

application/exception/ExceptionHandler.php

@@ -8,6 +8,7 @@ namespace App\Exception;
  * 重写Handle的render方法，实现自定义异常消息
  */
 
+use Api\PhpUtils\Log\FileLog;
 use Helpers\ApiResponse;
 use Yaf\Registry;
 
@@ -48,16 +49,16 @@ class ExceptionHandler
      */
     private function recordErrorLog($e)
     {
-        if($e instanceof \ErrorException || $e instanceof \Exception){
+        if($e instanceof \ErrorException || $e instanceof \Exception || $e instanceof \Error){
             $message = $e->getMessage();
             $file_name = $e->getFile();
             $line_num = $e->getLine();
 
             $msg = ' file_name : '.$file_name . ' line_num : '.$line_num . ' message : ' . $message;
-//            LogUtil::error('exception handler', $msg);
-        }
-        if(is_string($e) || is_int($e)){
-//            LogUtil::error('exception handler', $e);
+            FileLog::error(get_class($e) . ' handler', $msg, $e, 'wanjilong@yidian-inc.com');
+
+        }elseif( is_string($e) || is_int($e)){
+            FileLog::error('exception handler', $e);
         }
     }
 }
\ No newline at end of file

application/modules/Cli/controllers/Daemon.php

@@ -27,7 +27,7 @@ class DaemonController extends Cli
         if(empty($task_name)){
             echo <<<EOD
 
-usage: php cli.php daemon run "t=Wallet&n=2&j=sync_wallet"
+usage: php cli.php Wallet 2 sync_wallet
         t   daemo 脚本类名
         n   进程数
         j   进程别名，默认同脚本类名

application/services/pay/PayService.php

@@ -317,6 +317,7 @@ class PayService
             }
             PayOrderItem::update([
                 'notify_account_status' => 2,
+                'notify_account_times[+]' => 1,
                 'notify_account_success_time' => date('Y-m-d H:i:s')
             ], ['order_item_id' => $order_item_id, 'can_notify_account' => 1]);
 
@@ -325,6 +326,7 @@ class PayService
             //补偿处理
             PayOrderItem::update([
                 'notify_account_status' => 0,
+                'notify_account_times[+]' => 1,
             ], ['order_item_id' => $order_item_id, 'can_notify_account' => 1]);
         }
     }

conf/cli.ini

 [common]
-application.directory                       = APPLICATION_PATH"/application"
-application.library                         = APPLICATION_PATH"/application/library"
-application.bootstrap                       = APPLICATION_PATH"/application/BootstrapCli.php"
+application.directory                       = APP_PATH
+application.library                         = APP_PATH"/library"
+application.bootstrap                       = APP_PATH"/BootstrapCli.php"
 application.dispatcher.catchException       = true
 application.dispatcher.throwException       = true
 daemon.script_dir                           = "\\Daemon\\"

public/cli.php

@@ -14,23 +14,35 @@ if( !substr(php_sapi_name(), 0, 3) == 'cli' ) {
     die;
 }
 
+/* 定义这个常量是为了在cli.ini中引用*/
 define('ROOT_PATH', realpath(__DIR__.'/../'));
-define('APPLICATION_PATH', realpath(__DIR__.'/../'));
 define('APP_PATH', realpath(__DIR__.'/../application'));
+define('APP_START', microtime(true));
 
 require ROOT_PATH . '/vendor/autoload.php';
 $application = new Yaf\Application( ROOT_PATH . "/conf/cli.ini");
 
 /**
  * 获取模块/控制器/方法
+usage: php cli.php "t=Wallet&n=2&j=sync_wallet"
+usage: php cli.php Wallet sync_wallet 2
+ *
  */
 $module = "cli";
-$controller = $argv[1] ?? "";
-$method     = $argv[2] ?? "";
+$controller = "daemon";
+$method     = "run";
+
+
 $param      = [];
+$param['t'] = $argv[1] ?? "Wallet";
+$param['n'] = $argv[2] ?? 2;
+$param['j'] = $argv[3] ?? "sync_wallet";
+
+
+/*
 if (!empty($argv[3]))
 {
     parse_str($argv[3], $param);
 }
-
+*/
 $application->bootstrap()->getDispatcher()->dispatch( new Yaf\Request\Simple("", $module, $controller,$method,$param) );