dev

admin/templates/default/analysis.cov.provider.php

@@ -56,7 +56,6 @@
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=provider_succs"><span>通道按时段成功单量监控</span></a></li>
                 <li><a href="JavaScript:void(0);" class="current"><span>通道累计成功率监控</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=index&type=network"><span>通道网络监控</span></a></li>
-
                 <li><a href="?index.php&act=refill_analysis&op=index&type=system"><span>机构成功率监控</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=new_version&type=system"><span>机构累计成功率监控</span></a></li>
                 <li><a href="?index.php&act=refill_analysis&op=merchant_ratios"><span>机构成功率统计</span></a></li>

admin/templates/default/analysis.provider.php

@@ -190,6 +190,7 @@
                                     <option value="commit">提交单量</option>
                                     <option value="succ_time">成功回调时间</option>
                                     <option value="fail_time">失败回调时间</option>
+                                    <option value="succ_amounts">成功经额</option>
                                 </select>
                             </label>
 
@@ -202,7 +203,6 @@
                 </tbody>
             </table>
             <div id="echart">
-
             </div>
         </div>
 
@@ -307,7 +307,8 @@
                     succ: 0,
                     commit: 0,
                     succ_time: 0,
-                    fail_time: 0
+                    fail_time: 0,
+                    succ_amounts:0
                 }
             })
             return result;

data/config/dev/base.ini.php

@@ -56,14 +56,14 @@ if(SSH_TUNEL_PROD ==='local') {
     $config['db'][1]['dbport']       = '3307';
     $config['db'][1]['dbuser']       = 'root';
     $config['db'][1]['dbpwd']        = '55668899';
-    $config['db'][1]['dbname']       = 'ylshop';
+    $config['db'][1]['dbname']       = 'xyzshop';
     $config['db'][1]['dbcharset']    = 'UTF-8';
 
     $config['db']['slave'][0]['dbhost']     = SLAVE_DBHOST;
     $config['db']['slave'][0]['dbport']     = '3307';
     $config['db']['slave'][0]['dbuser']     = 'root';
     $config['db']['slave'][0]['dbpwd']      = '55668899';
-    $config['db']['slave'][0]['dbname']     = 'ylshop';
+    $config['db']['slave'][0]['dbname']     = 'xyzshop';
     $config['db']['slave'][0]['dbcharset']  = 'UTF-8';
 }
 elseif(SSH_TUNEL_PROD === 'xyz') {

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
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /data/shop_share/merchant:/var/www/html/merchant
+      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/merchant:/var/www/html/merchant
     container_name: "panda-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:
@@ -27,8 +27,8 @@ services:
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/upload:/var/www/html/data/upload
+      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - /mnt/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
-      - /data/shop_share/upload:/var/www/html/data/upload
+      - /mnt/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-debug.ini:/usr/local/etc/php/php.ini
       - ../conf/php/mch-spwan-start:/usr/local/bin/docker-spwan-start
-      - /data/shop_share/upload:/var/www/html/data/upload
+      - /mnt/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
-      - /data/shop_share/upload:/var/www/html/data/upload
+      - /mnt/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

@@ -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
-      - /data/shop_share/upload:/var/www/html/data/upload
+      - /mnt/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"