Merge branch 'develop' into 'test'

Develop

See merge request bp/pay!3

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 daemon run "t=Wallet&n=2&j=sync_wallet"
         t   daemo 脚本类名
         n   进程数
         j   进程别名，默认同脚本类名
@@ -51,4 +51,4 @@ EOD;
 
         (new Daemon($rename, $task_class, $worker_num))->start();
     }
-}
\ No newline at end of file
+}

application/modules/Pay/controllers/Order.php

@@ -20,7 +20,10 @@ class OrderController extends Base
         $paySrv = new PayService();
         $ret = $paySrv->do_pay($order_id, $user_id);
 
-        $this->success(['result'=>$ret]);
+        //兼容C端客户端支付，调整返回结构，ping++ 返回 order，原生：微信、支付宝返回charge
+        $result = [];
+        $result[] = ['k'=>'order', 'v'=>$ret];
+        $this->success(['result'=>$result]);
     }
 
     public function refundAction() {

application/services/pay/PayService.php

@@ -535,10 +535,13 @@ class PayService
             $current_tip = Strategy::getTip($r['payment'], $total_amount, $cleared_amount, $total_tip, $cleared_tip);
             $id = $this->gen_pay_order_clearing_item_id();
 
+
             //商家资金需要显示商品名称
             if($account['pay_sub_type'] == 102) {
                 $remark = $r['goods_name'] ?? '';
-                $remark = mb_strlen($remark) > 100 ? mb_substr($remark, 0, 100) . '...' : '';
+                if(mb_strlen($remark) > 100) {
+                    $remark = mb_substr($remark, 0, 100) . '...';
+                }
             } else {
                 $remark = '';
             }

application/services/pingxx/PingxxService.php

@@ -16,7 +16,8 @@ class PingxxService
 
     private function __construct()
     {
-        Pingpp::setApiKey('sk_test_KCaD0O5KyjzPinLynHzH4Cu1'); // 设置 API Key
+        //Pingpp::setApiKey('sk_test_KCaD0O5KyjzPinLynHzH4Cu1'); // 设置 API Key
+        Pingpp::setApiKey('sk_live_9q9iLCS4mvv1a9eTq190O8K4'); // 正式 API Key
         Pingpp::setPrivateKeyPath(ROOT_PATH . '/conf/your_rsa_private_key.pem'); // 设置私钥
         Pingpp::setAppId('app_9m1ubDG4e1mPXLCG'); // 设置 App ID
     }

deploy/start_env/crontab/crontab-daemon.conf

+59 23 * * * /usr/sbin/logrotate /etc/logrotate.conf

deploy/start_env/start_daemon.sh

@@ -56,7 +56,7 @@ php api.go2yd.com/htdocs/Website/public/cli.php Daemon run "t=$2&n=$3&j=$2"
 
 
 while true; do
-    is_master_on=$(pgrep -fc "$2 $1 master process")
+    is_master_on=$(pgrep -fc "$2")
     if [[ ${is_master_on} -gt 0 ]]; then
         if [[ ! -f "$start_done_file" ]]; then
             touch ${start_done_file}