神州(电增_非银) 通道

crontab/index.php

@@ -17,7 +17,7 @@ require_once(BASE_ROOT_PATH . '/helper/img_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/exceptionex.php');
 require_once(BASE_ROOT_PATH . '/helper/notify_helper.php');
 
-if (php_sapi_name() == 'cli') {
+if (php_sapi_name() == 'dpcli') {
     $_GET['act'] = $_SERVER['argv'][1];
     $_GET['op'] = empty($_SERVER['argv'][2]) ? 'index' : $_SERVER['argv'][2];
 }

data/api/xs/lib/XS.php

@@ -492,7 +492,7 @@ class XS extends XSComponent
 			if (function_exists('apc_fetch')) {
 				$cache = apc_fetch($cache_key);
 				$cache_write = 'apc_store';
-			} elseif (function_exists('xcache_get') && php_sapi_name() !== 'cli') {
+			} elseif (function_exists('xcache_get') && php_sapi_name() !== 'dpcli') {
 				$cache = xcache_get($cache_key);
 				$cache_write = 'xcache_set';
 			} elseif (function_exists('eaccelerator_get')) {

data/api/xs/util/XSDataSource.class.php

@@ -31,7 +31,7 @@ abstract class XSDataSource
 	{
 		$this->type = $type;
 		$this->arg = $arg;
-		$this->inCli = php_sapi_name() === 'cli';
+		$this->inCli = php_sapi_name() === 'dpcli';
 		$this->init();
 	}
 

data/config/win/base.ini.php

@@ -53,14 +53,14 @@ $config['gip'] 		= 0;
 $config['dbdriver'] = 'mysqli';
 $config['tablepre']	= 'lrlz_';
 
-$config['db'][1]['dbhost']       = 'host.docker.internal';
+$config['db'][1]['dbhost']       = '192.168.3.241';
 $config['db'][1]['dbport']       = '3306';
 $config['db'][1]['dbuser']       = 'root';
 $config['db'][1]['dbpwd']        = 'root';
 $config['db'][1]['dbname']       = 'xyzshop';
 $config['db'][1]['dbcharset']    = 'UTF-8';
 
-$config['db']['slave'][0]['dbhost']     = 'host.docker.internal';
+$config['db']['slave'][0]['dbhost']     = '192.168.3.241';
 $config['db']['slave'][0]['dbport']     = '3306';
 $config['db']['slave'][0]['dbuser']     = 'root';
 $config['db']['slave'][0]['dbpwd']      = 'root';

docker/compose/dongpeng/acc/docker-compose.yml

@@ -9,8 +9,8 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/merchant:/var/www/html/merchant
+      - /home/dongpeng/upload:/var/www/html/data/upload
+      - /home/dongpeng/merchant:/var/www/html/merchant
     container_name: "panda-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:
@@ -28,8 +28,8 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
+      - /home/dongpeng/upload:/var/www/html/data/upload
+      - /home/dongpeng/shoplog:/var/www/html/data/log
       - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
     container_name: "panda-mobile"
     command: ['docker-spwan-start']
@@ -46,8 +46,8 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
+      - /home/dongpeng/upload:/var/www/html/data/upload
+      - /home/dongpeng/shoplog:/var/www/html/data/log
       - ../conf/php/vapi-spwan-start:/usr/local/bin/docker-spwan-start
     container_name: "panda-vapi"
     command: ['docker-spwan-start']

docker/compose/dongpeng/cli/docker-compose.yml

@@ -1,63 +0,0 @@
-version: "3.7"
-
-services:
-  phpcli:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - /mnt/xyzshop:/var/www/html
-      - /mnt/xyzshop/docker/compose/workcuda/conf/etc/localtime:/etc/localtime:ro
-      - /mnt/xyzshop/docker/compose/workcuda/conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-php"
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
-
-  phpswoole:
-    image: php-swool-redis:latest
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../conf/php/vender-init:/usr/local/bin/vender-init
-    container_name: "panda-swoole"
-
-  vender:
-    image: php-zts:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../conf/php/vender-init:/usr/local/bin/vender-init
-    container_name: "panda-vender"
-    command: ['vender-init']
-
-  pythoncli:
-    image: pycpu:3.7.10
-    volumes:
-      - /mnt/xyzshop/docker/compose/workcuda/conf/etc/localtime:/etc/localtime:ro
-      - /mnt/xyzshop:/var/www/html
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-python"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-
-  pybash:
-    image: pycpu:3.7.10
-    volumes:
-      - /mnt/xyzshop/docker/compose/workcuda/conf/etc/localtime:/etc/localtime:ro
-      - /mnt/xyzshop:/var/www/html
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-pybash"
-    command: [python,'/var/www/html/plot/copy_channel.py']
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"

docker/compose/dongpeng/conf/php/php-debug.ini

@@ -1945,7 +1945,7 @@ output_buffering = On
 xdebug.default_enable=1
 xdebug.remote_enable=1
 xdebug.remote_handler=dbgp
-xdebug.remote_host=192.168.3.27
+xdebug.remote_host=192.168.3.103
 xdebug.remote_port=9300
 xdebug.remote_mode=req
 xdebug.remote_autostart=1

docker/compose/dongpeng/dpcli/docker-compose.yml

@@ -0,0 +1,28 @@
+version: "3.7"
+
+services:
+  phpcli:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - /home/dongpeng/xyzshop:/var/www/html
+      - /home/dongpeng/xyzshop/docker/compose/dongpeng/conf/etc/localtime:/etc/localtime:ro
+      - /home/dongpeng/xyzshop/docker/compose/dongpeng/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - /home/dongpeng/upload:/var/www/html/data/upload
+      - /home/dongpeng/shoplog:/var/www/html/data/log
+    container_name: "panda-php"
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
+
+  phpswoole:
+    image: php-swool-redis:latest
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
+      - /home/dongpeng/upload:/var/www/html/data/upload
+      - /home/dongpeng/shoplog:/var/www/html/data/log
+      - ../conf/php/vender-init:/usr/local/bin/vender-init
+    container_name: "panda-swoole"
+

test/TestAccount.php

@@ -37,7 +37,6 @@ class TestAccount extends TestCase
     {
         $fn = fopen(BASE_ROOT_PATH . "/data/amount/{$file}", "r");
 
-
         $total_amount = ncPriceFormat(0.00);
 
         $i = 0;
@@ -51,7 +50,6 @@ class TestAccount extends TestCase
                 $amount = $matches['amount'];
                 if ($oper == '-') {
                     $total_amount = ncPriceFormat($total_amount) - ncPriceFormat($amount);
-
                 } else {
                     $total_amount = ncPriceFormat($total_amount) + ncPriceFormat($amount);
                 }

test/TestRefill.php

@@ -5038,6 +5038,7 @@ class TestRefill extends TestCase
                 $mch_cache = ['last_time' => 0, 'send_count' => 0];
             }
 
+
             if (!empty($phone) && ($available_pd < $alarm_pd)) {
                 $counts = $mch_cache['send_count'];
                 if (($mch_cache['last_time'] + 300 < time()) && $counts < 5) {
@@ -5184,6 +5185,30 @@ class TestRefill extends TestCase
 
         $ret = $notify($resp);
     }
+
+    /**
+     * 神州(电增_非银） 余额
+     */
+    public function testShenzhoudzfyBalance()
+    {
+        $provider = $this->getProvider('shenzhoudzfy');
+        $resp = $provider->balance();
+    }
+
+    /**
+     *  神州(电增_非银） 添加
+     */
+
+    public function testShenzhouzfyAdd()
+    {
+        $provider = $this->getProvider('shenzhoudzfy');
+        $resp = $provider->add(13911129867, 4, 10, ['order_sn' => $this->make_sn()]);
+    }
+
+    /**
+     *  神州(电增_非银） 查詢
+     */
+
 }
 
 

test/TestRefillBalance.php

@@ -141,7 +141,5 @@ class TestRefillBalance extends TestCase
         $x = wcache('balance-cfg', ['adc' => serialize(['a' => 1,'b' => 2])], 'refill-');
         $y = rcache('balance-cfg','refill-','adc');
         $z = unserialize($y) ?? [];
-
-
     }
 }

test/TestRefillUtil.php

@@ -25,6 +25,8 @@ class TestRefillUtil extends TestCase
         $val = refill\util::query_queue_order(1092,'abcdefg');
     }
 
+
+
     public function testWriteCard()
     {
         refill\util::write_card('1000113300017553895',mtopcard\SinopecCard,'13911129867');

test/coroutine/TestHttpServ.php

@@ -54,10 +54,10 @@ class TestHttpServer {
 	public function onRequest($request, $response){
 
 		// $udp = new swoole_client(SWOOLE_SOCK_UDP, SWOOLE_SOCK_ASYNC);
-		// $udp->on("connect", function(swoole_client $cli) {
-		//     $cli->send("udp test");
+		// $udp->on("connect", function(swoole_client $dpcli) {
+		//     $dpcli->send("udp test");
 		// });
-		// $udp->on("receive", function(swoole_client $cli, $data)use($response){
+		// $udp->on("receive", function(swoole_client $dpcli, $data)use($response){
 
 			$tcp = new swoole_client(SWOOLE_SOCK_TCP, SWOOLE_SOCK_ASYNC);
 			$tcp->on("connect", function(swoole_client $cli) {
@@ -73,7 +73,7 @@ class TestHttpServer {
 			$tcp->connect('10.100.64.151', 9805);
 
 		// });
-		// $udp->on("close", function(swoole_client $cli){
+		// $udp->on("close", function(swoole_client $dpcli){
 		// });
 		// $udp->connect('10.100.65.222', 9906);
 

test/coroutine/http2_client.php

@@ -77,5 +77,5 @@ co::create(function () use ($fp)
         var_dump($cli->recv());
     }
 
-//    $cli->close();
+//    $dpcli->close();
 });

test/coroutine/http_client.php

@@ -7,6 +7,6 @@ co::create(function () {
     $result = $cli->get('/get?json=true');
     var_dump($cli->body);
 //     assert($result);
-//     $ret = json_decode($cli->body, true);
+//     $ret = json_decode($dpcli->body, true);
 //     assert(is_array($ret) and $ret['json'] == 'true');
 });

test/coroutine/udp_client.php

@@ -26,7 +26,7 @@ class Client
     {
         $cli = new swoole_client_coro(SWOOLE_SOCK_UDP);
         $ret = $cli->connect($this->ip, self::PORT);
-        $cli->send("sent by cli");
+        $cli->send("sent by dpcli");
 
         $cli2 = new swoole_client_coro(SWOOLE_SOCK_UDP);
         $ret = $cli2->connect($this->ip, self::PORT);

test/coroutine/udp_tcp_timeout.php

@@ -63,10 +63,10 @@ class TestHttpServer {
 		// $udp_cli->close();
 
 		// if ($ret) {
-		// 	//error_log(" udp cli get rsp == " . print_r($ret, true),3, '/data/log/udp_timeout.log');
+		// 	//error_log(" udp dpcli get rsp == " . print_r($ret, true),3, '/data/log/udp_timeout.log');
 		// }
 		// else{
-		// 	error_log(" udp cli timeout \n",3, '/data/log/udp_timeout.log');
+		// 	error_log(" udp dpcli timeout \n",3, '/data/log/udp_timeout.log');
 		// }
 
   		$ret = $tcp_cli ->connect("10.100.64.151", 9805);
@@ -75,10 +75,10 @@ class TestHttpServer {
 		$tcp_cli->close();
 
 		if ($ret) {
-			//error_log(" tcp cli get rsp == " . print_r($ret, true) . PHP_EOL, 3, '/data/log/udp_timeout.log');
+			//error_log(" tcp dpcli get rsp == " . print_r($ret, true) . PHP_EOL, 3, '/data/log/udp_timeout.log');
 		}
 		else{
-			error_log(" tcp cli timeout \n",3, '/data/log/udp_timeout.log');
+			error_log(" tcp dpcli timeout \n",3, '/data/log/udp_timeout.log');
 		}
 
 		$response ->end(" swoole response is ok");

test/coroutine/websocket/client.php

@@ -1,12 +1,12 @@
 <?php
 // go(function () {
-//     $cli = new Co\http\Client("127.0.0.1", 9501);
-//     $ret = $cli->upgrade("/");
+//     $dpcli = new Co\http\Client("127.0.0.1", 9501);
+//     $ret = $dpcli->upgrade("/");
 
 //     if ($ret) {
 //         while(true) {
-//             $cli->push("hello");
-//             var_dump($cli->recv());
+//             $dpcli->push("hello");
+//             var_dump($dpcli->recv());
 //             co::sleep(0.1);
 //         }
 //     }

test/examples/client/async.php

@@ -8,10 +8,10 @@ $client = new swoole_client(SWOOLE_SOCK_TCP, SWOOLE_SOCK_ASYNC); //异步非阻
 
 $client->_count = 0;
 $client->on("connect", function(swoole_client $cli) {
-    //swoole_timer_clear($cli->timer);
+    //swoole_timer_clear($dpcli->timer);
     $cli->send("GET / HTTP/1.1\r\n\r\n");
-    //$cli->sendfile(__DIR__.'/test.txt');
-    //$cli->_count = 0;
+    //$dpcli->sendfile(__DIR__.'/test.txt');
+    //$dpcli->_count = 0;
 });
 
 $client->on("receive", function(swoole_client $cli, $data){
@@ -27,7 +27,7 @@ $client->on("receive", function(swoole_client $cli, $data){
             //唤醒
             $cli->wakeup();
         });
-        //$cli->close();
+        //$dpcli->close();
         return;
     }
     else

test/examples/coroutine/TestHttpServ.php

@@ -54,10 +54,10 @@ class TestHttpServer {
 	public function onRequest($request, $response){
 
 		// $udp = new swoole_client(SWOOLE_SOCK_UDP, SWOOLE_SOCK_ASYNC);
-		// $udp->on("connect", function(swoole_client $cli) {
-		//     $cli->send("udp test");
+		// $udp->on("connect", function(swoole_client $dpcli) {
+		//     $dpcli->send("udp test");
 		// });
-		// $udp->on("receive", function(swoole_client $cli, $data)use($response){
+		// $udp->on("receive", function(swoole_client $dpcli, $data)use($response){
 
 			$tcp = new swoole_client(SWOOLE_SOCK_TCP, SWOOLE_SOCK_ASYNC);
 			$tcp->on("connect", function(swoole_client $cli) {
@@ -73,7 +73,7 @@ class TestHttpServer {
 			$tcp->connect('10.100.64.151', 9805);
 
 		// });
-		// $udp->on("close", function(swoole_client $cli){
+		// $udp->on("close", function(swoole_client $dpcli){
 		// });
 		// $udp->connect('10.100.65.222', 9906);
 

test/examples/coroutine/http2_client.php

@@ -77,5 +77,5 @@ co::create(function () use ($fp)
         var_dump($cli->recv());
     }
 
-//    $cli->close();
+//    $dpcli->close();
 });

test/examples/coroutine/http_client.php

@@ -7,6 +7,6 @@ co::create(function () {
     $result = $cli->get('/get?json=true');
     var_dump($cli->body);
 //     assert($result);
-//     $ret = json_decode($cli->body, true);
+//     $ret = json_decode($dpcli->body, true);
 //     assert(is_array($ret) and $ret['json'] == 'true');
 });

test/examples/coroutine/udp_client.php

@@ -26,7 +26,7 @@ class Client
     {
         $cli = new swoole_client_coro(SWOOLE_SOCK_UDP);
         $ret = $cli->connect($this->ip, self::PORT);
-        $cli->send("sent by cli");
+        $cli->send("sent by dpcli");
 
         $cli2 = new swoole_client_coro(SWOOLE_SOCK_UDP);
         $ret = $cli2->connect($this->ip, self::PORT);

test/examples/coroutine/udp_tcp_timeout.php

@@ -63,10 +63,10 @@ class TestHttpServer {
 		// $udp_cli->close();
 
 		// if ($ret) {
-		// 	//error_log(" udp cli get rsp == " . print_r($ret, true),3, '/data/log/udp_timeout.log');
+		// 	//error_log(" udp dpcli get rsp == " . print_r($ret, true),3, '/data/log/udp_timeout.log');
 		// }
 		// else{
-		// 	error_log(" udp cli timeout \n",3, '/data/log/udp_timeout.log');
+		// 	error_log(" udp dpcli timeout \n",3, '/data/log/udp_timeout.log');
 		// }
 
   		$ret = $tcp_cli ->connect("10.100.64.151", 9805);
@@ -75,10 +75,10 @@ class TestHttpServer {
 		$tcp_cli->close();
 
 		if ($ret) {
-			//error_log(" tcp cli get rsp == " . print_r($ret, true) . PHP_EOL, 3, '/data/log/udp_timeout.log');
+			//error_log(" tcp dpcli get rsp == " . print_r($ret, true) . PHP_EOL, 3, '/data/log/udp_timeout.log');
 		}
 		else{
-			error_log(" tcp cli timeout \n",3, '/data/log/udp_timeout.log');
+			error_log(" tcp dpcli timeout \n",3, '/data/log/udp_timeout.log');
 		}
 
 		$response ->end(" swoole response is ok");

test/examples/coroutine/websocket/client.php

@@ -1,12 +1,12 @@
 <?php
 // go(function () {
-//     $cli = new Co\http\Client("127.0.0.1", 9501);
-//     $ret = $cli->upgrade("/");
+//     $dpcli = new Co\http\Client("127.0.0.1", 9501);
+//     $ret = $dpcli->upgrade("/");
 
 //     if ($ret) {
 //         while(true) {
-//             $cli->push("hello");
-//             var_dump($cli->recv());
+//             $dpcli->push("hello");
+//             var_dump($dpcli->recv());
 //             co::sleep(0.1);
 //         }
 //     }

test/examples/eof/async_client.php

@@ -21,7 +21,7 @@ $client->on("receive", function (swoole_client $cli, $data) {
     }
     $i ++;
     //usleep(200000);
-    //send($cli);
+    //send($dpcli);
 });
 
 $client->on("error", function(swoole_client $cli){

test/examples/http/async_client.php

@@ -1,10 +1,10 @@
 <?php
 $cli = new swoole_http_client('127.0.0.1', 9501);
 //post request
-//$cli->setData(http_build_query(['a'=>123,'b'=>"哈哈"]));
-//$cli->set(['timeout' => -1]);
-//$cli->setHeaders(['Host' => 'www.baidu.com']);
-//$cli->set(['http_proxy_host' => '127.0.0.1', 'http_proxy_port' => 8888,]);
+//$dpcli->setData(http_build_query(['a'=>123,'b'=>"哈哈"]));
+//$dpcli->set(['timeout' => -1]);
+//$dpcli->setHeaders(['Host' => 'www.baidu.com']);
+//$dpcli->set(['http_proxy_host' => '127.0.0.1', 'http_proxy_port' => 8888,]);
 
 $cli->setHeaders(['User-Agent' => "swoole"]);
 
@@ -13,13 +13,13 @@ $cli->get('/index.php', function ($cli)
     var_dump($cli);
 });
 
-//$cli->post('/dump.php', array("test" => 'abc'), function ($cli) {
-//    echo $cli->body;
-//    $cli->get('/index.php', function ($cli) {
-//        file_put_contents(__DIR__.'/t.html', $cli->body);
-//        $cli->download('/index.php', __DIR__.'/phpinfo.html', function ($cli)
+//$dpcli->post('/dump.php', array("test" => 'abc'), function ($dpcli) {
+//    echo $dpcli->body;
+//    $dpcli->get('/index.php', function ($dpcli) {
+//        file_put_contents(__DIR__.'/t.html', $dpcli->body);
+//        $dpcli->download('/index.php', __DIR__.'/phpinfo.html', function ($dpcli)
 //        {
-//            var_dump($cli->downloadFile);
+//            var_dump($dpcli->downloadFile);
 //        });
 //    });
 //});

test/examples/http/client.php

@@ -38,7 +38,7 @@ else
     echo "http header length=".strlen($header)."\n";
     $header .=  "Content-Length: " . (strlen($_postBody) - 2);
 
-//    $cli->send($header);
+//    $dpcli->send($header);
 //    usleep(100000);
     $_sendStr = $header . "\r\n\r\n" . $_postBody;
 //    $_sendStr = "\r\n\r\n" . $_postBody;

test/examples/http/http_proxy.php

@@ -2,7 +2,7 @@
 Swoole\Async::dnsLookup("www.htmleaf.com", function ($domainName, $ip) {
 //Swoole\Async::dnsLookup("www.baidu.com", function ($domainName, $ip) {
    $cli = new swoole_http_client($ip, 80);
-//$cli = new swoole_http_client($ip, 443,true);
+//$dpcli = new swoole_http_client($ip, 443,true);
     $cli->set(array(
      'http_proxy_host'=>"127.0.0.1",
       'http_proxy_port'=>3128,
@@ -15,7 +15,7 @@ Swoole\Async::dnsLookup("www.htmleaf.com", function ($domainName, $ip) {
     $cli->get('/', function ($cli) {
         echo "Length: " . strlen($cli->body) . "\n";
 $cli->close();
- // echo $cli->body;
+ // echo $dpcli->body;
     });
 });
 

test/examples/length/async_client.php

@@ -35,7 +35,7 @@ $client->on("receive", function (swoole_client $cli, $data) {
     $cli->close();
 //    sleep(1);
     //usleep(200000);
-    //send($cli);
+    //send($dpcli);
 });
 
 $client->on("error", function(swoole_client $cli){

test/examples/ssl/http_client.php

@@ -9,5 +9,5 @@ $cli->get('/?dump.php?corpid=ding880f44069a80bca1&corpsecret=YB1cT8FNeN7VCm3eThw
     var_dump($cli);
     var_dump($cli->headers);
     echo $cli->body;
-    //$cli->close();
+    //$dpcli->close();
 });