dev

docker/compose/lz-stat/docker-compose.yml

@@ -0,0 +1,26 @@
+version: "3.7"
+
+services:
+  readersrv:
+    image: pycpu:3.7.10
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - /mnt/stdata:/var/www/html/data/stdata
+    container_name: "panda-reader"
+    command: ['python','reader.py','-h', '172.16.110.28', '-p', '6379']
+
+  flasksrv:
+    image: pycpu:3.7.10
+    ports:
+      - "5000:5000"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /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"
+    command: ['python','app.py']

docker/compose/xyz-stat/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-reader"
-    command: ['python','reader.py']
+    command: ['python','reader.py', '-h', '172.26.105.125', '-p', '6379']
 
   flasksrv:
     image: pycpu:3.7.10

docker/conf/nginx/nginx-linzh-https.conf

@@ -71,6 +71,17 @@ http
             try_files $uri $uri/ /mshop/index.html;
         }
 
+        location /plot {
+            root $folder_name;
+            proxy_pass         http://172.16.110.30:5000;
+              proxy_redirect     off;
+
+            proxy_set_header   Host                 $host;
+            proxy_set_header   X-Real-IP            $remote_addr;
+            proxy_set_header   X-Forwarded-For      $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Proto    $scheme;
+        }
+
         location /merchant {
             root $folder_name;
             autoindex on;

helper/refill/policy/rlock.php

@@ -71,8 +71,8 @@ class rlock
     public static function clear_all()
     {
         $ins = Cache::getInstance('cacheredis');
-        $ins->hdel(self::sys_storage_name);
-        $ins->hdel(self::mch_storage_name);
+        $ins->hdel(self::sys_storage_name,'');
+        $ins->hdel(self::mch_storage_name,'');
     }
 
     //merchant 总金额分配策略开关，及剩余金额变动和获取

helper/refill/policy/rstorage.php

@@ -211,7 +211,7 @@ class rstorage
         return $merchant->lock_type($card_type, $spec);
     }
 
-    //需要为锁定的机构保留的最低量
+    //需要为锁定的机构保留的最低总量
     private function lowest_total($mchid,$card_type)
     {
         $total = 0;
@@ -224,6 +224,7 @@ class rstorage
         return $total;
     }
 
+     //需要为锁定的机构保留的最低总量
     private function lowest_spec_total($mchid,$card_type,$spec)
     {
         $total = 0;

plot/DataCenter.py

@@ -21,8 +21,14 @@ class DataCenter(object):
 
     def __init__(self):
         self._mquit = False
+        self._mRHost = ''
+        self._mRPort = 6379
         self._file_name = '/var/www/html/data/stdata/data.hdf5'
 
+    def set_redis(self, rhost, rport):
+        self._mRHost = rhost
+        self._mRPort = rport
+
     def stop(self):
         self._mquit = True
         pass
@@ -31,7 +37,7 @@ class DataCenter(object):
         while True:
             try:
                 # pool = redis.ConnectionPool(host='121.89.223.81', port=57649, db=0)
-                pool = redis.ConnectionPool(host='172.26.105.125', port=6379, db=0)
+                pool = redis.ConnectionPool(host=self._mRHost, port=self._mRPort, db=0)
                 r = redis.Redis(connection_pool=pool)
 
                 if path.exists(self._file_name):

plot/app.py

@@ -14,9 +14,9 @@ from DataCenter import dataCenter
 from flask import request, jsonify
 import logging
 from logging.handlers import RotatingFileHandler
-
 import time
 import signal as sig
+import sys, getopt
 
 app = Flask(__name__)
 app.debug = True
@@ -60,7 +60,6 @@ def days():
     datas = dataCenter.days()
     return jsonify(datas)
 
-
 @app.route('/plot/paths')
 def paths():
     time_stamp = request.args.get('time_stamp')
@@ -82,15 +81,6 @@ if __name__ == "__main__":
 
     monkey.patch_all()
     http_server = WSGIServer(('0.0.0.0', 5000), app)
-
-
-    def shutdown():
-        print('Shutting down ...')
-        http_server.stop()
-        exit(sig.SIGTERM)
-
-
     geventsig.signal(sig.SIGTERM, lambda: http_server.stop())
     geventsig.signal(sig.SIGINT, lambda: http_server.stop())
-
     http_server.serve_forever()

plot/reader.py

@@ -1,6 +1,23 @@
 from DataCenter import dataCenter
 import signal as sig
+import sys,getopt
 
 if __name__ == '__main__':
+    try:
+        opts, args = getopt.getopt(sys.argv[1:],"h:p:",["host=",'port='])
+    except Exception as ex:
+        print(ex)
+        sys.exit(2)
+
+    rhost = ''
+    rport=6379
+    for o, val in opts:
+        if o in ("-h", "--host"):
+            rhost = val
+        elif o in ('-p', "--port"):
+            rport = int(val)
+        else:
+            print("Err argv")
+    dataCenter.set_redis(rhost,rport)
     sig.signal(sig.SIGINT, lambda: dataCenter.stop())
     dataCenter.prepare_data()