dev

admin/control/refill_order.php

@@ -65,7 +65,8 @@ class refill_orderControl extends SystemControl
             if (!empty($input['quality'])) {
                 $cond['refill_order.quality'] = $input['quality'];
             }
-            if(!empty($input['official_status'])) {
+            if(!empty($input['official_status']))
+            {
                 if($input['official_status'] == 1) {
                     $cond['official_sn'] = '';
                 } elseif ($input['official_status'] == 2) {
@@ -99,7 +100,6 @@ class refill_orderControl extends SystemControl
             return $cond;
         };
 
-
         if(isset($input['export'])) {
             $scope['export_time'] = 'order_time';
         } else {

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

@@ -17,19 +17,7 @@ services:
         limits:
           cpus: '8'
 
-  crontask:
-    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: "panda-task"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','task']
-
-  crontaska:
+  taska:
     image: php-zts-debug:7.3.18
     volumes:
       - ../../../../:/var/www/html
@@ -40,9 +28,12 @@ services:
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-taska"
     command: [php,"/var/www/html/crontab/index.php",'minutes','task']
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
 
-
-  crontaskb:
+  taskb:
     image: php-zts-debug:7.3.18
     volumes:
       - ../../../../:/var/www/html
@@ -52,4 +43,8 @@ services:
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-taskb"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','task']
+    command: [php,"/var/www/html/crontab/index.php",'minutes','task']
+    deploy:
+      resources:
+        limits:
+          cpus: '8'