stanley-king 3 år sedan
förälder
incheckning
25bda72f2a

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 14 - 1089
data/config/dev/refill.ini.php


+ 4 - 4
data/config/xyztest/base.ini.php

@@ -48,15 +48,15 @@ $config['tablepre']	= 'lrlz_';
 $config['db'][1]['dbhost']       = MASTER_DBHOST;
 $config['db'][1]['dbport']       = '3306';
 $config['db'][1]['dbuser']       = 'root';
-$config['db'][1]['dbpwd']        = 'XTZ@shop@951688';
-$config['db'][1]['dbname']       = 'shop_test';
+$config['db'][1]['dbpwd']        = 'yezi131419';
+$config['db'][1]['dbname']       = 'xyztest';
 $config['db'][1]['dbcharset']    = 'UTF-8';
 
 $config['db']['slave'][0]['dbhost']     = SLAVE_DBHOST;
 $config['db']['slave'][0]['dbport']     = '3306';
 $config['db']['slave'][0]['dbuser']     = 'root';
-$config['db']['slave'][0]['dbpwd']      = 'XTZ@shop@951688';
-$config['db']['slave'][0]['dbname']     = 'shop_test';
+$config['db']['slave'][0]['dbpwd']      = 'yezi131419';
+$config['db']['slave'][0]['dbname']     = 'xyztest';
 $config['db']['slave'][0]['dbcharset']  = 'UTF-8';
 
 $config['session_expire'] 	= 3600;

+ 0 - 262
data/config/xyztest/refill.ini.php

@@ -1,262 +0,0 @@
-<?php
-
-global $config;
-
-$config['refill_oil_specs'] = [100, 200, 500, 1000, 2000];
-$config['refill_phone_specs'] = [10, 20, 30, 50, 100, 200, 300, 500];
-
-//充值额度基本表
-$config['refill_specs'] = [
-    'petrochina'  => $config['refill_oil_specs'],
-    'sinopec'     => $config['refill_oil_specs'],
-    'chinamobile' => $config['refill_phone_specs'],
-    'chinaunicom' => $config['refill_phone_specs'],
-    'chinatelecom' => $config['refill_phone_specs']
-];
-
-//充值渠道配置表
-//速汇充京东加油通道
-$tianjt_oil = ['name' => 'tianjt', 'store_id' => 7,
-    'amount' => [
-        100 => [['goods_id' => 6290, 'price' => 97.0, 'quality' => 1, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6291, 'price' => 194, 'quality' => 1, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6292, 'price' => 485, 'quality' => 1, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6293, 'price' => 970, 'quality' => 1, 'card_type' => 'sinopec']]
-    ],
-    'period' => ['start' => '8:30', 'end' => '22:20'], 'refill_type' => 'api'];
-
-//速汇充天猫加油通道
-$suhctm_oil = ['name' => 'suhctm', 'store_id' => 7,
-    'amount' => [
-        100 => [['goods_id' => 6290, 'price' => 96.8, 'quality' => 1, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6291, 'price' => 193.6, 'quality' => 1, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6292, 'price' => 484, 'quality' => 1, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6293, 'price' => 968, 'quality' => 1, 'card_type' => 'sinopec']]
-    ],
-    'period' => ['start' => '8:30', 'end' => '22:20'], 'refill_type' => 'api'];
-
-$suhcpdd_oil = ['name' => 'suhcpdd', 'store_id' => 7,
-    'amount' => [
-        100 => [['goods_id' => 6290, 'price' => 96.8, 'quality' => 1, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6291, 'price' => 193.6, 'quality' => 1, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6292, 'price' => 484, 'quality' => 1, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6293, 'price' => 968, 'quality' => 1, 'card_type' => 'sinopec']]
-    ],
-    'period' => ['start' => '8:30', 'end' => '22:20'], 'refill_type' => 'api'];
-
-//赵梓暄提供的加油通道
-$zzx_oil = ['name' => 'zzx', 'store_id' => 13,
-    'amount' => [
-        100 => [['goods_id' => 6307, 'price' => 97.8, 'quality' => 1, 'card_type' => 'petrochina,sinopec']],
-        200 => [['goods_id' => 6308, 'price' => 195.6, 'quality' => 1, 'card_type' => 'petrochina,sinopec']],
-        500 => [['goods_id' => 6309, 'price' => 489, 'quality' => 1, 'card_type' => 'petrochina,sinopec']],
-        1000 => [['goods_id' => 6310, 'price' => 978, 'quality' => 1, 'card_type' => 'petrochina,sinopec']]
-    ],
-    'refill_type' => 'api'];
-
-//赵梓暄提供的加油通道
-$lx_oil = ['name' => 'lx', 'store_id' => 14,
-    'amount' => [
-        500 => [['goods_id' => 6322, 'price' => 479, 'quality' => 1, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6311, 'price' => 958, 'quality' => 1, 'card_type' => 'sinopec']] //,
-//        2000 => ['goods_id' => 6322, 'price' => 1916]
-    ],
-    'period' => ['start' => '14:00', 'end' => '19:00'], 'official_sn' => true, 'refill_type' => 'inner_store'];
-
-//赛虎
-$saihu_oil = ['name' => 'saihu', 'store_id' => 15,
-    'amount' => [
-        100 => [['goods_id' => 6313, 'price' => 97, 'quality' => 1, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6314, 'price' => 194, 'quality' => 1, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6315, 'price' => 485, 'quality' => 1, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6316, 'price' => 970, 'quality' => 1, 'card_type' => 'sinopec']],
-        2000 => [['goods_id' => 6317, 'price' => 1940, 'quality' => 1, 'card_type' => 'sinopec']]
-    ],
-    'refill_type' => 'api'];
-
-#官方中石油通道
-$gftd_oil = ['name' => 'gftd', 'store_id' => 19,
-    'amount' => [
-        100 => [['goods_id' => 6339, 'price' => 95, 'quality' => 1, 'card_type' => 'petrochina']],
-        200 => [['goods_id' => 6340, 'price' => 190, 'quality' => 1, 'card_type' => 'petrochina']],
-        500 => [['goods_id' => 6341, 'price' => 475, 'quality' => 1, 'card_type' => 'petrochina']],
-        1000 => [['goods_id' => 6342, 'price' => 950, 'quality' => 1, 'card_type' => 'petrochina']]
-    ],
-    'period' => [], 'refill_type' => 'api'];
-
-#官方中石化通道
-$gftdsinop_oil = ['name' => 'gftdsinop', 'store_id' => 20,
-    'amount' => [
-        100 => [['goods_id' => 6343, 'price' => 95, 'quality' => 1, 'card_type' => 'sinopec']],
-        200 => [['goods_id' => 6344, 'price' => 190, 'quality' => 1, 'card_type' => 'sinopec']],
-        500 => [['goods_id' => 6345, 'price' => 475, 'quality' => 1, 'card_type' => 'sinopec']],
-        1000 => [['goods_id' => 6346, 'price' => 950, 'quality' => 1, 'card_type' => 'sinopec']]
-    ],
-    'period' => [], 'refill_type' => 'api'];
-
-$oil_providers = [
-    ['name' => 'tianjt', 'cfg' => $tianjt_oil],
-    ['name' => 'suhctm', 'cfg' => $suhctm_oil],
-    ['name' => 'suhcpdd', 'cfg' => $suhcpdd_oil],
-    ['name' => 'zzx', 'cfg' => $zzx_oil],
-    ['name' => 'lx', 'cfg' => $lx_oil],
-    ['name' => 'saihu', 'cfg' => $saihu_oil],
-    ['name' => 'gftd', 'cfg' => $gftd_oil],
-    ['name' => 'gftdsinop', 'cfg' => $gftdsinop_oil]
-];
-$config['oil_providers'] = $oil_providers;
-
-$beixt_phone = ['name' => 'beixt', 'store_id' => 8,
-    'amount' => [
-        50 => [['goods_id' => 6295, 'price' => 48.75, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6296, 'price' => 97.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6297, 'price' => 195,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
-    ],
-    'refill_type' => 'api'];
-
-$bxtwt_phone = ['name' => 'bxtwt', 'store_id' => 10,
-    'amount' => [
-        50 => [['goods_id' => 6298, 'price' => 48,   'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6299, 'price' => 96,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6300, 'price' => 192, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
-    ],
-    'refill_type' => 'api'];
-
-$bjb_phone = ['name' => 'bjb', 'store_id' => 12,
-    'amount' => [
-        10 => [['goods_id' => 6305, 'price' => 9.51,  'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6306, 'price' => 19.02, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6301, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6302, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6303, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6304, 'price' => 190.20, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6327, 'price' => 285.30, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6328, 'price' => 475.50, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']]
-        ],
-    'official_sn' => true, 'refill_type' => 'api'];
-$lingzh_phone = ['name' => 'lingzh', 'store_id' => 28,
-    'amount' => [
-        10 => [['goods_id' => 6389, 'price' => 9.53, 'quality' => 1, 'card_type' => 'chinamobile']],
-        20 => [['goods_id' => 6390, 'price' => 19.06, 'quality' => 1, 'card_type' => 'chinamobile']],
-        30 => [['goods_id' => 6391, 'price' => 28.59, 'quality' => 1, 'card_type' => 'chinamobile']],
-        50 => [['goods_id' => 6392, 'price' => 47.65, 'quality' => 1, 'card_type' => 'chinamobile']],
-        100 => [['goods_id' => 6393, 'price' => 95.3, 'quality' => 1, 'card_type' => 'chinamobile']],
-        200 => [['goods_id' => 6394, 'price' => 190.60, 'quality' => 1, 'card_type' => 'chinamobile']],
-        300 => [['goods_id' => 6395, 'price' => 285.90, 'quality' => 1, 'card_type' => 'chinamobile']],
-        500 => [['goods_id' => 6396, 'price' => 476.50, 'quality' => 1, 'card_type' => 'chinamobile']]
-    ],
-    'official_sn' => true, 'refill_type' => 'api'];
-
-$lingzhdl_phone = ['name' => 'lingzhdl', 'store_id' => 29, 'card_type' => ['chinaunicom', 'chinatelecom'],
-    'amount' => [
-        10 => [['goods_id' => 6397, 'price' => 9.51, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6398, 'price' => 19.02, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6399, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6400, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6401, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6402, 'price' => 190.20, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6403, 'price' => 285.30, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6404, 'price' => 475.50, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']]
-    ],
-    'official_sn' => true, 'refill_type' => 'api'];
-
-$bjbyd_phone = ['name' => 'bjbyd', 'store_id' => 24,
-    'amount' => [
-        30 => [['goods_id' => 6367, 'price' => 28.53, 'quality' => 1, 'card_type' => 'chinamobile']],
-        50 => [['goods_id' => 6368, 'price' => 47.55, 'quality' => 1, 'card_type' => 'chinamobile']],
-        100 => [['goods_id' => 6369, 'price' => 95.1, 'quality' => 1, 'card_type' => 'chinamobile']],
-        200 => [['goods_id' => 6370, 'price' => 190.2, 'quality' => 1, 'card_type' => 'chinamobile']]
-    ],
-    'official_sn' => true, 'refill_type' => 'api'];
-
-$afandnew_phone = ['name' => 'afandnew', 'store_id' => 25,
-    'amount' => [
-        30 => [['goods_id' => 6386, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile']],
-        50 => [['goods_id' => 6371, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile']],
-        100 => [['goods_id' => 6372, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile']],
-        200 => [['goods_id' => 6373, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile']],
-        300 => [['goods_id' => 6387, 'price' => 285, 'quality' => 1, 'card_type' => 'chinamobile']],
-        500 => [['goods_id' => 6388, 'price' => 475, 'quality' => 1, 'card_type' => 'chinamobile']]
-    ],
-    'refill_type' => 'api'];
-
-$tianx_phone = ['name' => 'tianx', 'store_id' => 25,
-    'amount' => [
-        50 => [['goods_id' => 6371, 'price' => 46.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6372, 'price' => 93,  'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6373, 'price' => 186, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
-    ],
-    'refill_type' => 'api'];
-
-$yifa_phone = ['name' => 'yifa', 'store_id' => 16,
-    'amount' => [
-        30 => [['goods_id' => 6318, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile']],
-        50 => [['goods_id' => 6319, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile']],
-        100 => [['goods_id' => 6320, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile']],
-        200 => [['goods_id' => 6321, 'price' => 191,  'quality' => 1, 'card_type' => 'chinamobile']]
-    ],
-    'refill_type' => 'api'];
-
-$jiec_phone = ['name' => 'jiec', 'store_id' => 17,
-    'amount' => [
-        30 => [['goods_id' => 6323, 'price' => 28.65, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6324, 'price' => 47.75, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6325, 'price' => 95.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6326, 'price' => 191, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6329, 'price' => 286.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6330, 'price' => 477.5, 'quality' => 1, 'card_type' => 'chinamobile,chinaunicom,chinatelecom']]
-    ],
-    'official_sn' => true, 'refill_type' => 'api'];
-
-$weit_phone = ['name' => 'weit', 'store_id' => 18,
-    'amount' => [
-        10 => [['goods_id' => 6337, 'price' => 9.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        20 => [['goods_id' => 6338, 'price' => 19, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        30 => [['goods_id' => 6331, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6332, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6333, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6334, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6335, 'price' => 285, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6336, 'price' => 475, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']]
-    ],
-    'official_sn' => true, 'refill_type' => 'api'];
-
-$afand_phone = ['name' => 'afand', 'store_id' => 26,
-    'amount' => [
-        30 => [['goods_id' => 6374, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        50 => [['goods_id' => 6375, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        100 => [['goods_id' => 6376, 'price' => 95, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        200 => [['goods_id' => 6377, 'price' => 190, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        300 => [['goods_id' => 6378, 'price' => 285, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']],
-        500 => [['goods_id' => 6379, 'price' => 475, 'quality' => 1, 'card_type' => 'chinaunicom,chinatelecom']]
-    ],
-    'official_sn' => true, 'refill_type' => 'api'];
-
-$afandeng_phone = ['name' => 'afandeng', 'store_id' => 27,
-    'amount' => [
-        30 => [['goods_id' => 6380, 'price' => 28.5, 'quality' => 1, 'card_type' => 'chinamobile']],
-        50 => [['goods_id' => 6381, 'price' => 47.5, 'quality' => 1, 'card_type' => 'chinamobile']],
-        100 => [['goods_id' => 6382, 'price' => 95, 'quality' => 1, 'card_type' => 'chinamobile']],
-        200 => [['goods_id' => 6383, 'price' => 190, 'quality' => 1, 'card_type' => 'chinamobile']],
-        300 => [['goods_id' => 6384, 'price' => 285, 'quality' => 1, 'card_type' => 'chinamobile']],
-        500 => [['goods_id' => 6385, 'price' => 475, 'quality' => 1, 'card_type' => 'chinamobile']]
-    ],
-    'official_sn' => true, 'refill_type' => 'api'];
-
-$phone_providers = [
-//    ['name' => 'beixt', 'cfg' => $beixt_phone],
-//    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
-    ['name' => 'bjb', 'cfg' => $bjb_phone],
-    ['name' => 'bjbyd', 'cfg' => $bjbyd_phone],
-
-//    ['name' => 'yifa', 'cfg' => $yifa_phone],
-//    ['name' => 'jiec', 'cfg' => $jiec_phone],
-//    ['name' => 'weit', 'cfg' => $weit_phone],
-
-    ['name' => 'afand', 'cfg' => $afand_phone],
-    ['name' => 'afandeng', 'cfg' => $afandeng_phone],
-    ['name' => 'afandnew', 'cfg' => $afandnew_phone],
-    ['name' => 'lingzh', 'cfg' => $lingzh_phone],
-    ['name' => 'lingzhdl', 'cfg' => $lingzhdl_phone]
-];
-$config['phone_providers'] = $phone_providers;

+ 50 - 10
docker/compose/xyzt-acc/docker-compose.yml

@@ -10,12 +10,12 @@ services:
       - ../../conf/etc/localtime:/etc/localtime:ro
       - /nfs/upload:/var/www/html/data/upload
       - /nfs/tmerchant:/var/www/html/merchant
-      - ../../conf/nginx/nginx-acc-45-http.conf:/etc/nginx/nginx.conf:ro
+      - ../../conf/nginx/nginx-acc-175-http.conf:/etc/nginx/nginx.conf:ro
     container_name: "panda-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:
       - "docker.hostip:172.17.0.1"
-      - "eth.hostip:172.26.105.126"
+      - "eth.hostip:172.26.105.127"
 
 
   redisrv:
@@ -30,29 +30,29 @@ services:
     command: [redis-server,"/etc/redis/redis.conf"]
 
   mobilesrv:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     ports:
       - "9100:9100"
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
       - ../../../:/var/www/html
-      - ../../conf/php/xyzt-45-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/lz-mobile-spwan-start:/usr/local/bin/docker-spwan-start
+      - ../../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
     container_name: "panda-mobile"
     command: ['docker-spwan-start']
     depends_on:
       - "redisrv"
 
   raccsrv:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     ports:
       - "9101:9101"
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
       - ../../../:/var/www/html
-      - ../../conf/php/xyzt-45-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../../conf/php/racc-spwan-start-lz:/usr/local/bin/docker-spwan-start
@@ -61,6 +61,22 @@ services:
     depends_on:
       - "redisrv"
 
+  mchsrv:
+    image: php-zts:7.3.18
+    ports:
+      - "9102:9102"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - ../../conf/php/mch-spwan-start-lz:/usr/local/bin/docker-spwan-start
+    container_name: "panda-merchant"
+    command: [docker-spwan-start]
+    depends_on:
+       - "redisrv"
+
   websrv:
     image: php-fpm:alpine
     ports:
@@ -70,7 +86,7 @@ services:
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/xyzt-45-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
       - ../../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
     container_name: "panda-web"
     command: [php-fpm]
@@ -84,18 +100,42 @@ services:
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/xyzt-45-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
       - ../../conf/crontab/root:/var/spool/cron/crontabs/root
     container_name: "panda-crontab"
     command: [crond,"-f"]
     depends_on:
       - "redisrv"
 
+  cronsec:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-cronsec"
+    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
+
+  wsdsrv:
+    image: php-zts-debug:7.3.18
+    ports:
+      - "60987:60987"
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../../:/var/www/html
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/shoplog:/var/www/html/data/log
+      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
+    container_name: "panda-wsd"
+    command: [php,"/var/www/html/wsd_bridge.php"]
+
   phpcli:
     image: php-zts-debug:7.3.18
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../conf/php/xyzt-45-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php/xyzt-175-php.ini:/usr/local/etc/php/php.ini
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log

+ 24 - 4
docker/conf/nginx/nginx-acc-45-http.conf

@@ -30,7 +30,7 @@ http
     {
     	listen       80;
         set  $folder_name /var/www/html;
-        server_name 121.89.196.45;
+        server_name 39.103.162.175;
         root $folder_name;
         index index.html index.php; 
     	client_max_body_size 100m;
@@ -63,6 +63,17 @@ http
 	        try_files $uri $uri/ /mshop/index.html;
         }
 
+        location /plot {
+            root $folder_name;
+            proxy_pass         http://172.26.105.127: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;
@@ -72,7 +83,7 @@ http
 
         location ~ /mobile/[/\w]+\.php$ {
             root           $folder_name;
-            fastcgi_pass   docker.hostip:9100;
+            fastcgi_pass    172.26.105.127:9100;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             fastcgi_param  SIGN $http_sign;
@@ -85,17 +96,26 @@ http
 
         location ~ /racc/[/\w]+\.php$ {
             root           $folder_name;
-            fastcgi_pass   docker.hostip:9101;
+            fastcgi_pass    172.26.105.127:9101;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             fastcgi_param  SIGN $http_sign;
             include fastcgi_params;
         }
 
+        location ~ /mchsrv/[/\w]+\.php$ {
+            root           $folder_name;
+            fastcgi_pass    172.26.105.127:9102;
+            fastcgi_index  index.php;
+            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
+            fastcgi_param SIGN $http_sign;
+            include fastcgi_params;
+        }
+
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   docker.hostip:9000;
+            fastcgi_pass    172.26.105.127:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;

+ 1 - 1
docker/conf/php/xyzt-45-php.ini

@@ -1325,7 +1325,7 @@ bcmath.scale = 0
 ; http://php.net/session.save-handler
 ;session.save_handler = file
 session.save_handler = redis
-session.save_path = tcp://172.26.105.126:6379
+session.save_path = tcp://172.26.105.127:6379
 
 ; Argument passed to save_handler.  In the case of files, this is the path
 ; where data files are stored. Note: Windows users have to change this