Merge branch 'raccount' of 39.97.239.116:gyfl/xyzshop into raccount

docker/compose/homecuda/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
+      - /data/shop_share/upload:/var/www/html/data/upload
+      - /data/shop_share/merchant:/var/www/html/merchant
     container_name: "panda-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:
@@ -28,7 +28,7 @@ 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
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
     container_name: "panda-mobile"
@@ -46,7 +46,7 @@ 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
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../conf/php/vapi-spwan-start:/usr/local/bin/docker-spwan-start
     container_name: "panda-vapi"

docker/compose/homecuda/admin/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/php/mch-spwan-start:/usr/local/bin/docker-spwan-start
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-merchant"
     command: [docker-spwan-start]
@@ -28,7 +28,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-web"
     command: [php-fpm]

docker/compose/homecuda/cli/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       - /mnt/xyzshop:/var/www/html
       - /mnt/xyzshop/docker/compose/homecuda/conf/etc/localtime:/etc/localtime:ro
       - /mnt/xyzshop/docker/compose/homecuda/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-php"
     deploy:
@@ -21,7 +21,7 @@ services:
       - ../../../../:/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
+      - /data/shop_share/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"
@@ -31,11 +31,10 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/vender-init:/usr/local/bin/vender-init
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-
+      - /data/shop_share/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']
 

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

@@ -8,7 +8,7 @@ services:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/crontab/root:/var/spool/cron/crontabs/root
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-crontab"
     command: [crond,"-f"]
@@ -19,7 +19,7 @@ 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
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-cronsec"
     command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
@@ -30,7 +30,7 @@ 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
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-accedit"
     command: [php,"/var/www/html/crontab/index.php",'minutes','account_edit']

docker/compose/homecuda/plot/docker-compose.yml

@@ -8,7 +8,6 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-flask"

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

@@ -8,7 +8,7 @@ services:
       - ../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
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-slavecron"
     command: [crond,"-f"]
@@ -24,7 +24,7 @@ services:
       - ../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
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-taska"
     command: [php,"/var/www/html/crontab/index.php",'minutes','task']
@@ -40,7 +40,7 @@ services:
       - ../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
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/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']
@@ -55,7 +55,7 @@ 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
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-statutil"
     command: [php,"/var/www/html/crontab/index.php",'minutes','stat_util']

docker/compose/homecuda/statcalc/docker-compose.yml

@@ -6,7 +6,6 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-mamount"
@@ -17,7 +16,6 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-mpratios"
@@ -28,7 +26,6 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-mtimesratios"
@@ -39,7 +36,6 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-chspeedratio"

docker/compose/homecuda/statwriter/docker-compose.yml

@@ -6,7 +6,6 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - /mnt/stdata:/var/www/html/data/stdata
     container_name: "panda-qreader"

docker/compose/homecuda/worker/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php-swoole-debug.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-codispatcher"
     command: [php,"/var/www/html/rdispatcher/codispatcher.php","1"]
@@ -22,7 +22,7 @@ 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
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-queue"
     command: [php,"/var/www/html/queue/index.php", "queue", "index"]
@@ -33,7 +33,7 @@ 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
+      - /data/shop_share/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-searcher"
     command: [php, "/var/www/html/searcher.php"]

docker/compose/pull_docker.sh

@@ -0,0 +1,16 @@
+docker pull redis:alpine
+docker pull nginx:alpine
+docker pull 39.97.239.116:5000/php-zts:7.3.18
+docker tag 39.97.239.116:5000/php-zts:7.3.18 php-zts:7.3.18
+
+docker pull 39.97.239.116:5000/php-swool-hook:7.3.18
+docker tag 39.97.239.116:5000/php-swool-hook:7.3.18 php-swool-hook:7.3.18
+
+docker pull 39.97.239.116:5000/php-swool-redis:latest
+docker tag 39.97.239.116:5000/php-swool-redis:latest php-swool-redis:latest
+
+docker pull 39.97.239.116:5000/php-fpm:alpine
+docker tag 39.97.239.116:5000/php-fpm:alpine php-fpm:alpine
+
+docker pull 39.97.239.116:5000/pycpu:3.7.10
+docker tag 39.97.239.116:5000/pycpu:3.7.10 pycpu:3.7.10

plot/refill/DataStream.py

@@ -118,12 +118,10 @@ class DataReadStream(metaclass=ABCMeta):
     def __init__(self, hfive):
         self._hfive = hfive
         self._days = self._getdays()
-        stime = lambda t: time.strftime('%d-%H:%M:%S', time.localtime(t))
+        stime = lambda t: time.strftime('%y-%m-%d %H:%M:%S', time.localtime(t))
         sdays = [stime(day) for day in self._days]
         logger.debug(sdays)
 
-        logger.debug(self._days)
-
     def __del__(self):
         pass
 

plot/refill/NetcheckCovPainter.py

@@ -9,7 +9,7 @@ from .algorithm import calc_cov_netfail
 import time as time
 
 import logging
-logger = logging.getLogger('ChannelCumPainter')
+logger = logging.getLogger('NetcheckCovPainter')
 
 class NetcheckCovPainter(NetcheckPainter):
     def __init__(self, start_time: int, end_time: int, chnames: set = None, filter_wave: int = None):
@@ -22,7 +22,7 @@ class NetcheckCovPainter(NetcheckPainter):
 
     def paint(self):
         reader = self._reader
-        self._days, _start_time, _end_time, _interval = self.calc_time(self._reader, self._start_time - self._filter_wave, self._end_time)
+        self._days, _start_time, _end_time, _interval = self.calc_time(self._reader, self._start_time, self._end_time)
 
         tuple_pathes = reader.many_tuple_path(self._days, self._chnames)
         gen = net_pathes(reader, tuple_pathes, self._days)
@@ -38,7 +38,7 @@ class NetcheckCovPainter(NetcheckPainter):
         left_len = self._start_time - _start_time
         right_len = _end_time - self._end_time
 
-        stime = lambda t: time.strftime('%d-%H:%M:%S', time.localtime(t))
+        stime = lambda t: time.strftime('%y-%m-%d %H:%M:%S', time.localtime(t))
         logger.debug("near_stamp start_time %d, %s end_time=%s left_len=%d right_len=%d",
                      self._start_time, stime(self._start_time), stime(self._end_time),left_len,right_len)
 

plot/refill/PainterBase.py

@@ -34,17 +34,15 @@ class PainterBase(object):
         if start_time is None:
             raise Exception('data is empty')
 
-        stime = lambda t: time.strftime('%d-%H:%M:%S', time.localtime(t))
-        logger.debug("near_stamp start_time %d , %s end_time=%s", start_time, stime(start_time), stime(end_time))
+        stime = lambda t: time.strftime('%y-%m-%d %H:%M:%S', time.localtime(t))
 
         interval = calc_interval(start_time, end_time)
+        logger.debug("near_stamp start_time %d=%s end_time=%s interval=%d", start_time, stime(start_time), stime(end_time), interval)
         start_time = time_border(interval, start_time, True)
         end_time = time_border(interval, end_time, False)
         logger.debug("time_border start_time %d , %s end_time=%s", start_time, stime(start_time), stime(end_time))
 
         days = span_days(start_time, end_time)
-
-        stime = lambda t: time.strftime('%d-%H:%M:%S', time.localtime(t))
         sdays = [stime(day) for day in days]
         logger.debug(sdays)
 

plot/refill/algorithm.py

@@ -188,9 +188,10 @@ def calc_cov_netfail(data, pos_map, start, end, window, left_len,right_len):
 
     succ = view[0, :]
     fail = view[1, :]
-    succ   = np.convolve(succ, window, 'same')
+    succ = np.convolve(succ, window, 'same')
     fail = np.convolve(fail, window, 'same')
-    succ   = succ[left_len:end - start - right_len]
+
+    succ = succ[left_len:end - start - right_len]
     fail = fail[left_len:end - start - right_len]
 
     fail = fail / (fail + succ + 0.0000001)