dev

crontab/control/minutes.php

@@ -302,11 +302,30 @@ class minutesControl extends BaseCronControl
         while (true)
         {
             do{
-                $ret = $this->_cron_common([8]);
-                perfor_clear();
+                try {
+                    $ret = $this->_cron_common([8]);
+                    perfor_clear();
+                } catch (Exception $ex) {
+                    Log::record($ex->getMessage(),Log::ERR);
+                }
             }
             while($ret === true);
+            sleep(1);
+        }
+    }
 
+    public function update_merchant_account()
+    {
+        while (true)
+        {
+            do{
+                try {
+                    perfor_clear();
+                } catch (Exception $ex) {
+                    Log::record($ex->getMessage(),Log::ERR);
+                }
+            }
+            while($ret === true);
             sleep(1);
         }
     }

data/model/account_divert.model.php

@@ -92,7 +92,9 @@ class account_divertModel extends Model
         {
             $slot = 1;
             foreach ($amounts as $amount) {
+                $update = [];
                 $update[$field] = ['exp', "{$field} + {$amount}"];
+                $update['optime'] = time();
                 $this->table('pd_divert')->where(['member_id' => $member_id, 'slot' => $slot])->update($update);
                 $slot++;
             }
@@ -117,19 +119,17 @@ class account_divertModel extends Model
                 {
                     if($op =='add')
                     {
-                        if($field == 'available_predeposit') {
+                        if ($field == 'available_predeposit') {
                             $available_amounts = $amount;
-                        }
-                        else {
+                        } else {
                             $freeze_amounts = $amount;
                         }
                     }
                     elseif($op == 'reduce')
                     {
-                        if($field == 'available_predeposit') {
+                        if ($field == 'available_predeposit') {
                             $available_amounts = -$amount;
-                        }
-                        else {
+                        } else {
                             $freeze_amounts = -$amount;
                         }
                     }
@@ -162,6 +162,7 @@ class account_divertModel extends Model
                 }
             }
 
+            $data_pd['optime'] = time();
             $slot = mt_rand(1,self::MAX_SLOTS);
             return $this->table('pd_divert')->where(['member_id' => $member_id,'slot' => $slot])->update($data_pd);
         }
@@ -169,6 +170,6 @@ class account_divertModel extends Model
 
     public function edit_provider($provider_id,$datas)
     {
-    }
 
+    }
 }

docker/compose/xyzt/master-crond/docker-compose.yml

@@ -0,0 +1,25 @@
+version: "3.7"
+
+services:
+  crontabsrv:
+    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/root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+    container_name: "panda-master-crontab"
+    command: [crond,"-f"]
+
+  cronsec:
+    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
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+    container_name: "panda-cronsec"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']

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

@@ -0,0 +1,14 @@
+version: "3.7"
+
+services:
+  crontabsrv:
+    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/root:/var/spool/cron/crontabs/root
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+    container_name: "panda-master-crontab"
+    command: [crond,"-f"]

docker/compose/xyzt/storage/docker-compose.yml

@@ -10,27 +10,4 @@ services:
       - ../conf/redis/6379.conf:/etc/redis/redis.conf
       - /mnt/tredisdata:/data
     container_name: "panda-redis"
-    command: [redis-server,"/etc/redis/redis.conf"]
-
-  crontabsrv:
-    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/root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/testlog:/var/www/html/data/log
-    container_name: "panda-crontab"
-    command: [crond,"-f"]
-
-  cronsec:
-    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
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/testlog:/var/www/html/data/log
-    container_name: "panda-cronsec"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
+    command: [redis-server,"/etc/redis/redis.conf"]