debug

docker/compose/lz-28/docker-compose.yml

@@ -67,67 +67,67 @@ services:
     depends_on:
       - "redisrv"
 
-#  websrv:
-#    image: php-fpm:alpine
-#    ports:
-#      - "9000:9000"
-#    volumes:
-#      - ../../conf/etc/localtime:/etc/localtime:ro
-#      - ../../../:/var/www/html
-#      - /nfs/upload:/var/www/html/data/upload
-#      - ../../conf/php-fpm/lz-php.ini:/usr/local/etc/php/php.ini
-#      - ../../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
-#    container_name: "panda-web"
-#    command: [php-fpm]
-#    depends_on:
-#      - "redisrv"
-#
-#  queuesrv:
-#    image: php-zts-debug:7.3.18
-#    volumes:
-#      - ../../conf/etc/localtime:/etc/localtime:ro
-#      - ../../../:/var/www/html
-#      - /nfs/upload:/var/www/html/data/upload
-#      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
-#    container_name: "panda-queue"
-#    command: [php,"/var/www/html/queue/index.php", "queue", "index"]
-#    depends_on:
-#      - "redisrv"
-#
-#  searcher:
-#    image: php-zts-debug:7.3.18
-#    volumes:
-#      - ../../conf/etc/localtime:/etc/localtime:ro
-#      - ../../../:/var/www/html
-#      - /nfs/upload:/var/www/html/data/upload
-#      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
-#    container_name: "panda-searcher"
-#    command: [php, "/var/www/html/searcher.php"]
-#    depends_on:
-#      - "redisrv"
-#
-#  crontabsrv:
-#    image: php-zts-debug:7.3.18
-#    volumes:
-#      - ../../conf/etc/localtime:/etc/localtime:ro
-#      - ../../../:/var/www/html
-#      - /nfs/upload:/var/www/html/data/upload
-#      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
-#      - ../../conf/crontab/root:/var/spool/cron/crontabs/root
-#    container_name: "panda-crontab"
-#    command: [crond,"-f"]
-#    depends_on:
-#      - "redisrv"
-#
-#  phpcli:
-#    image: php-zts-debug:7.3.18
-#    volumes:
-#      - ../../conf/etc/localtime:/etc/localtime:ro
-#      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
-#      - ../../../:/var/www/html
-#      - /nfs/upload:/var/www/html/data/upload
-#    container_name: "panda-php"
-#    depends_on:
-#      - "redisrv"
-#      - "websrv"
-#      - "searcher"
+  websrv:
+    image: php-fpm:alpine
+    ports:
+      - "9000:9000"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - ../../conf/php-fpm/lz-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+    container_name: "panda-web"
+    command: [php-fpm]
+    depends_on:
+      - "redisrv"
+
+  queuesrv:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-queue"
+    command: [php,"/var/www/html/queue/index.php", "queue", "index"]
+    depends_on:
+      - "redisrv"
+
+  searcher:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-searcher"
+    command: [php, "/var/www/html/searcher.php"]
+    depends_on:
+      - "redisrv"
+
+  crontabsrv:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/crontab/root:/var/spool/cron/crontabs/root
+    container_name: "panda-crontab"
+    command: [crond,"-f"]
+    depends_on:
+      - "redisrv"
+
+  phpcli:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+    container_name: "panda-php"
+    depends_on:
+      - "redisrv"
+      - "websrv"
+      - "searcher"

docker/compose/stanley/docker-compose.yml

@@ -71,7 +71,7 @@ services:
     links:
       - redisrv
     container_name: "panda-dispatcher"
-    command: [php,"/var/www/html/rdispatcher/dispatcher.php","1"]
+    command: [php,"/var/www/html/rdispatcher/dispatcher.php","5"]
     depends_on:
       - "redisrv"
 

helper/refill/RefillFactory.php

@@ -16,68 +16,9 @@ require_once(BASE_HELPER_PATH . '/refill/CalcMerchantPrice.php');
 require_once(BASE_HELPER_PATH . '/refill/util.php');
 
 
-require_once(BASE_HELPER_PATH . '/refill/tianjt/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/tianjt/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/tianjt/RefillCallBack.php');
+require_once(BASE_HELPER_PATH . '/refill/yzchannel.php');
 
-require_once(BASE_HELPER_PATH . '/refill/suhctm/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/suhctm/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/suhctm/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/suhcpdd/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/suhcpdd/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/suhcpdd/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/beixt/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/beixt/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/bxtwt/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/bxtwt/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/bjb/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/bjb/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/bdt/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/bdt/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/zzx/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/zzx/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/zzx/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/lx/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/lx/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/lx/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/saihu/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/saihu/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/saihu/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/yifa/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/yifa/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/jiec/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/jiec/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/xc/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/xc/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/gftd/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/gftd/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/gftdsinop/RefillOil.php');
-require_once(BASE_HELPER_PATH . '/refill/gftdsinop/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/weit/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/weit/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/bjbyd/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/bjbyd/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/tianx/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/tianx/RefillCallBack.php');
-
-require_once(BASE_HELPER_PATH . '/refill/afand/RefillPhone.php');
-require_once(BASE_HELPER_PATH . '/refill/afand/RefillCallBack.php');
+define('BASE_HELPER_RAPI_PATH',BASE_HELPER_PATH . '/refill/api/xyz');
 
 use Log;
 use mtopcard;

helper/refill/afand/RefillCallBack.php

@@ -3,7 +3,7 @@
 
 namespace refill\afand;
 
-require_once(BASE_HELPER_PATH . '/refill/afand/config.php');
+require_once(BASE_HELPER_RAPI_PATH . '/afand/config.php');
 
 
 use refill;

helper/refill/afand/RefillPhone.php

@@ -2,7 +2,7 @@
 
 namespace refill\afand;
 
-require_once(BASE_HELPER_PATH . '/refill/afand/config.php');
+require_once(BASE_HELPER_RAPI_PATH . '/afand/config.php');
 
 use refill;
 use Log;

helper/refill/api/xyz/api.php

@@ -0,0 +1,46 @@
+<?php
+
+require_once(BASE_HELPER_RAPI_PATH . '/tianjt/RefillOil.php');
+require_once(BASE_HELPER_RAPI_PATH . '/tianjt/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/tianjt/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/suhctm/RefillOil.php');
+require_once(BASE_HELPER_RAPI_PATH . '/suhctm/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/suhctm/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/suhcpdd/RefillOil.php');
+require_once(BASE_HELPER_RAPI_PATH . '/suhcpdd/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/suhcpdd/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/beixt/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/beixt/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/bxtwt/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/bxtwt/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/bjb/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/bjb/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/bdt/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/bdt/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/zzx/RefillOil.php');
+require_once(BASE_HELPER_RAPI_PATH . '/zzx/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/zzx/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/lx/RefillOil.php');
+require_once(BASE_HELPER_RAPI_PATH . '/lx/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/lx/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/saihu/RefillOil.php');
+require_once(BASE_HELPER_RAPI_PATH . '/saihu/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/saihu/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/yifa/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/yifa/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/jiec/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/jiec/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/xc/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/xc/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/gftd/RefillOil.php');
+require_once(BASE_HELPER_RAPI_PATH . '/gftd/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/gftdsinop/RefillOil.php');
+require_once(BASE_HELPER_RAPI_PATH . '/gftdsinop/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/weit/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/weit/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/bjbyd/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/bjbyd/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/tianx/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/tianx/RefillCallBack.php');
+require_once(BASE_HELPER_RAPI_PATH . '/afand/RefillPhone.php');
+require_once(BASE_HELPER_RAPI_PATH . '/afand/RefillCallBack.php');

rdispatcher/dispatcher.php

@@ -10,10 +10,13 @@ define('BASE_PATH',BASE_ROOT_PATH . '/rdispatcher');
 require_once(BASE_ROOT_PATH . '/global.php');
 require_once(BASE_ROOT_PATH . '/fooder.php');
 require_once(BASE_ROOT_PATH . '/fooder.php');
-require_once(BASE_ROOT_PATH . '/helper/event_looper.php');
+
+require_once(BASE_HELPER_PATH . '/event_looper.php');
 require_once(BASE_HELPER_PATH . '/queue/rdispatcher.php');
 require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
-
+require_once(BASE_HELPER_PATH . '/message/msgstates.php');
+require_once(BASE_HELPER_PATH . '/message/msgutil.php');
+require_once(BASE_HELPER_PATH . '/message/subscriber.php');
 
 require_once(BASE_PATH . '/processor.php');
 require_once(BASE_PATH . '/proxy.php');
@@ -39,19 +42,52 @@ require_once(BASE_PATH . '/yzpolicy.php');
 //目前没发现问题
 Co::set(['hook_flags' => SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_TCP]);
 
-
 if (empty($_SERVER['argv'][1])) exit('parameter error');
 $count = intval($_SERVER['argv'][1]);
 
-function work_proc() {
+
+
+function all_channels() {
+    return ['refill'];
+}
+
+function work_proc()
+{
     Base::run_util();
+
+    $trdid = Thread::getCurrentThreadId();
+    Log::record("thread id = {$trdid}",Log::INFO);
+//
+//    $gMessageStates = new MsgStates();
+//    StatesHelper::init();
+//    $listener = new message\subscriber($gMessageStates);
+//    $listener->start();
+
     $looper = new processor();
     $looper->run();
 }
 
-Co\run(function() {
-    work_proc();
-});
+function corun()
+{
+    Log::record("start run process",Log::DEBUG);
+    Co\run(function() {
+        work_proc();
+    });
+
+//    $process = new swoole_process(function(swoole_process $process)
+//    {
+//        try {
+//            Log::record("start run process",Log::DEBUG);
+//            Co\run(function() {
+//                work_proc();
+//            });
+//        } catch (Exception $ex) {
+//            Log::record("",Log::ERR);
+//        }
+//    });
+//
+//    $pid = $process->start();
+//    return $pid;
+}
 
-//work_proc();
-//event\util::fork_workerex('work_proc',$count);
+event\util::fork_workerex('corun',$count);

rdispatcher/processor.php

@@ -28,37 +28,37 @@ class processor extends queue\ILooper
                 $method = strtolower($key);
                 if($method == 'add')
                 {
-                    go(function () use ($params) {
-                        Log::record(__FUNCTION__,Log::DEBUG);
-                        $mchid = $params['mchid'];
-                        $buyer_id = $params['buyer_id'];
-                        $amount = $params['amount'];
-                        $card_no = $params['card_no'];
-                        $mch_order = $params['mch_order'];
-                        $notify_url = $params['notify_url'];
-                        $idcard = $params['idcard'] ?? '';
-                        $card_name = $params['card_name'] ?? '';
-                        $order_time = $params['order_time'] ?? 0;
-                        $commit_times = $params['commit_times'] ?? 0;
-
-                        $minfo = new member_info($buyer_id);
-                        $available = $minfo->available_predeposit();
-                        Log::record("available = {$available}",Log::DEBUG);
+//                    go(function () use ($params) {
+//                        Log::record(__FUNCTION__,Log::DEBUG);
+//                        $mchid = $params['mchid'];
+//                        $buyer_id = $params['buyer_id'];
+//                        $amount = $params['amount'];
+//                        $card_no = $params['card_no'];
+//                        $mch_order = $params['mch_order'];
+//                        $notify_url = $params['notify_url'];
+//                        $idcard = $params['idcard'] ?? '';
+//                        $card_name = $params['card_name'] ?? '';
+//                        $order_time = $params['order_time'] ?? 0;
+//                        $commit_times = $params['commit_times'] ?? 0;
+//
+//                        $minfo = new member_info($buyer_id);
+//                        $available = $minfo->available_predeposit();
+//                        Log::record("available = {$available}",Log::DEBUG);
+//
+//                        $resp = http_request('https://www.xyzshops.cn/mobile/index.php?act=index&op=index&client_type=ios');
+//                        Log::record("recv size=" . strlen($resp), Log::DEBUG);
+//                    });
 
-                        $resp = http_request('https://www.xyzshops.cn/mobile/index.php?act=index&op=index&client_type=ios');
-                        Log::record("recv size=" . strlen($resp), Log::DEBUG);
+                    $proxy = new proxy();
+                    go(function () use ($proxy,$params) {
+                        try {
+                            $proxy->add($params);
+                        }
+                        catch (Exception $x) {
+                            Log::record($x->getMessage(),Log::ERR);
+                        }
                     });
 
-//                    $proxy = new proxy();
-//                    go(function () use ($proxy,$params) {
-//                        try {
-//                            $proxy->add($params);
-//                        }
-//                        catch (Exception $x) {
-//                            Log::record($x->getMessage(),Log::ERR);
-//                        }
-//                    });
-
 //                    Swoole\Runtime::enableCoroutine(SWOOLE_HOOK_CURL);
 //                    Swoole\Coroutine\run(function () use ($proxy,$params) {
 //                        $proxy->add($params);