dev

docker/compose/zy/slave-crond/docker-compose.yml

@@ -17,91 +17,6 @@ services:
         limits:
           cpus: '8'
 
-  taska:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "zy-taska"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
-
-  taskb:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "zy-taskb"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
-
-  taskc:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "zy-taskc"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
-
-  mtaska:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "zy-mtaska"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
-
-  mtaskb:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "zy-mtaskb"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
-
-  mtaskc:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "zy-mtaskc"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
-
-  mtaskd:
-    image: php-zts-debug:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "zy-mtaskd"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
-
-
   statutil:
     image: php-zts-debug:7.3.18
     volumes:

docker/compose/zy/slave-task/docker-compose.yml

@@ -0,0 +1,86 @@
+version: "3.7"
+
+services:
+  taska:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+    container_name: "zy-taska"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
+
+  taskb:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+    container_name: "zy-taskb"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
+
+  taskc:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+    container_name: "zy-taskc"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
+
+  mtaska:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+    container_name: "zy-mtaska"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
+
+  mtaskb:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+    container_name: "zy-mtaskb"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
+
+  mtaskc:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+    container_name: "zy-mtaskc"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
+
+  mtaskd:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+    container_name: "zy-mtaskd"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']

test/TestCardNo.php

@@ -29,6 +29,8 @@ class TestCardNo extends TestCase
             Log::record("$i succ=$succ",Log::DEBUG);
 //            sleep(1);
         }
+
+        $x = 1 <=> 2;
     }
 
     public function testTransfer()

test/TestPay.php

@@ -28,6 +28,7 @@ class TestAddData extends TestCase
         Base::run_util();
     }
 
+
     public function testAdd()
     {
         $y = unserialize('a:8:{s:11:"home1_title";s:9:"那句好";s:5:"image";s:0:"";s:9:"show_type";s:4:"vote";s:9:"show_data";s:0:"";s:4:"type";s:4:"vote";s:4:"data";s:75:"[{"id":0,"text":"u7b2cu4e00u53e5"},{"id":1,"text":"u7b2cu4e8cu53e5"}]";s:5:"title";s:9:"那句好";s:8:"reserved";s:11:"vote_type=0";}');