dev

docker/compose/workcuda/database/docker-compose.yml

@@ -0,0 +1,19 @@
+version: "3.7"
+
+services:
+  mysql:
+    image: mysql:latest
+    ports:
+      - 3306:3306
+    volumes:
+      - /mnt/mysql/logs:/var/log/mysql
+      - /mnt/mysql/data:/var/lib/mysql
+      - /mnt/mysql/conf/my.cnf:/etc/my.cnf
+    container_name: docker-mysqld
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: 55668899
+    deploy:
+      resources:
+        limits:
+          cpus: '16'

docker/compose/workcuda/statcalc/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-mamount"
-    command: [ 'python','mamount_lack.py', '-h', '192.168.3.46', '-p', '6379' ]
+    command: [ 'python','mamount_lack.py', '-h', '192.168.3.226', '-p', '6379' ]
 
   mpratios:
     image: pycpu:3.7.10
@@ -21,4 +21,4 @@ services:
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-mpratios"
-    command: [ 'python','mprofit_ratio.py', '-h', '192.168.3.46', '-p', '6379' ]
+    command: [ 'python','mprofit_ratio.py', '-h', '192.168.3.226', '-p', '6379' ]

docker/compose/workcuda/statwriter/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-qreader"
-    command: ['python','qreader.py','-h', '192.168.3.46', '-p', '6379']
+    command: ['python','qreader.py','-h', '192.168.3.226', '-p', '6379']
     deploy:
       resources:
         limits:

helper/refill/policy/chctlex.php

@@ -363,7 +363,7 @@ class chctlex
             $overloads = $assigner->assign();
         }
 
-        $ctls = array_merge($cur_feeds, $workers, $overloads, $next_feeds);
+        $ctls = array_merge($workers, $cur_feeds, $overloads, $next_feeds);
         $ctls = $time_map($ctls,$left_time);
 
         $names = [];

test/TestSmartCard.php

@@ -20,7 +20,8 @@ class TestSmartCard extends TestCase
     public function testGenChannelCode()
     {
         $result = [];
-        $name_count = ['huanxishuyu' => 10];
+//        $name_count = ['huanxishuyu' => 10];
+        $name_count = ['乐猫数娱' => 25];
         foreach ($name_count as $name => $count)
         {
             $codes = $this->gen_code($name,$count);