for refill_queue last version

data/config/xyz/base.ini.php

@@ -10,36 +10,34 @@ define('LOCAL_DEBUG',false);
 define('BONUS_EXPIRY_DATE',true);
 define('USE_BONUS_RATE',false);
 define('SERVER_TYPE','panda');
-
-define('COOKIE_DOMAIN','xyzshops.cn');
-define('NET_IP','121.89.223.81');
-$SRV_HOST = 'https://www.xyzshops.cn';
-
-$REMOTE_IMG_HOST = $SRV_HOST;
+define('CROSS_DOAMIN',false);
+define('COMPANY_NAME', 'XYZ_COMPANY');
+define('ZERO_GOODS_ID', 6245);
 
 $config = [];
-$config['base_site_url']        = $SRV_HOST;
-$config['client_site_url']      = $SRV_HOST;
-$config['shop_site_url'] 		= $SRV_HOST.'/shop';
-$config['cms_site_url'] 		= $SRV_HOST.'/cms';
-$config['microshop_site_url'] 	= $SRV_HOST.'/microshop';
-$config['circle_site_url'] 		= $SRV_HOST.'/circle';
-$config['admin_site_url'] 		= $SRV_HOST.'/admin';
-$config['mobile_site_url'] 		= $SRV_HOST.'/mobile';
-$config['wap_site_url'] 		= $SRV_HOST.'/wap';
-$config['chat_site_url'] 		= $SRV_HOST.'/chat';
+$config['base_site_url']        = SRV_HOST;
+$config['client_site_url']      = SRV_HOST;
+$config['shop_site_url'] 		= SRV_HOST.'/shop';
+$config['cms_site_url'] 		= SRV_HOST.'/cms';
+$config['microshop_site_url'] 	= SRV_HOST.'/microshop';
+$config['circle_site_url'] 		= SRV_HOST.'/circle';
+$config['admin_site_url'] 		= SRV_HOST.'/admin';
+$config['mobile_site_url'] 		= SRV_HOST.'/mobile';
+$config['wap_site_url'] 		= SRV_HOST.'/wap';
+$config['chat_site_url'] 		= SRV_HOST.'/chat';
 $config['node_site_url'] 		= 'http://127.0.0.1:8090';
-$config['delivery_site_url']    = $SRV_HOST.'/delivery';
+$config['delivery_site_url']    = SRV_HOST.'/delivery';
+
 $config['system_manager_phones'] = [
-    '13911129867' , '18500608333' , '18500350111' , '15136908757' , '18510995608'
+    '13911129867' , '18500608333' , '18500350111' , '15136908757'
 ];
 
 if(defined('USE_REMOTE_IMAGE') && USE_REMOTE_IMAGE == true) {
-    $config['upload_site_url']		= $REMOTE_IMG_HOST.'/data/upload';
-    $config['resource_site_url']	= $REMOTE_IMG_HOST.'/data/resource';
+    $config['upload_site_url']		= REMOTE_IMG_HOST.'/data/upload';
+    $config['resource_site_url']	= REMOTE_IMG_HOST.'/data/resource';
 } else {
-    $config['upload_site_url']		= $SRV_HOST.'/data/upload';
-    $config['resource_site_url']	= $SRV_HOST.'/data/resource';
+    $config['upload_site_url']		= SRV_HOST.'/data/upload';
+    $config['resource_site_url']	= SRV_HOST.'/data/resource';
 }
 
 $config['version'] 	= '201502020388';
@@ -48,14 +46,14 @@ $config['gip'] 		= 0;
 $config['dbdriver'] 	= 'mysqli';
 $config['tablepre']	= 'lrlz_';
 
-$config['db'][1]['dbhost']       = 'docker.hostip';
+$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']       = 'xyzshop';
 $config['db'][1]['dbcharset']    = 'UTF-8';
 
-$config['db']['slave'][0]['dbhost']     = 'docker.hostip';
+$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';
@@ -70,13 +68,14 @@ $config['thumb']['impath'] = '';
 
 $config['cache']['type'] 		= 'redis';
 $config['redis']['prefix']      	= 'nc_';
-$config['redis']['master']['host']     	= 'tcp://redisrv';
+$config['redis']['master']['host']     	= MASTER_REDISHOST;
 $config['redis']['master']['port']     	= 6379;
 $config['redis']['master']['pconnect'] 	= 0;
-$config['redis']['slave']['host']     	= 'tcp://redisrv';
+$config['redis']['slave']['host']     	= SLAVE_REDISHOST;
 $config['redis']['slave']['port']     	= 6379;
 $config['redis']['slave']['pconnect'] 	= 0;
 
+
 //$config['fullindexer']['open']      = false;
 //$config['fullindexer']['appname']   = '33hao';
 
@@ -88,7 +87,7 @@ $config['url_model'] = false;
 //如果店铺开启二级域名绑定的，这里填写主域名如baidu.com
 $config['subdomain_suffix'] = '';
 $config['session_type'] = 'redis';
-$config['session_save_path'] = 'tcp://redisrv:6379';
+$config['session_save_path'] = SESSION_SAVE_PATH;
 $config['node_chat'] = true;
 
 //流量记录表数量，为1~10之间的数字，默认为3，数字设置完成后请不要轻易修改，否则可能造成流量统计功能数据错误
@@ -99,14 +98,14 @@ $config['sms']['password']     = '';
 $config['sms']['sessionKey']   = '';
 
 $config['queue']['open'] = true;
-$config['queue']['host'] = 'tcp://redisrv';
+$config['queue']['host'] = QUEUEHOST;
 $config['queue']['port'] = 6379;
 $config['cache_open']    = true;
+
 $config['return_address'] = ['address' => '上海市金山区朱吕公路7335号','name' => "大熊猫（丽帆供应链）",'tel_phone' => '17301603655','zip_code' => '201600'];
 $config['area_version'] = 5;
-
 $config['appjump_prefix'] = 'xyzshop://www.xyzshops.com';
 
 $config['client_setting'] = ['running' => 174,'home' => 0];
-
-$config['wsd_bradge_port'] = 60987;
+$config['wsd_bradge_port'] = 60987;
+$config['card_key_stores'] = [6];

data/config/xyz/refill.ini.php

@@ -134,6 +134,31 @@ $bjb_phone = ['name' => 'bjb', 'store_id' => 12,
         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' => [
@@ -144,6 +169,17 @@ $bjbyd_phone = ['name' => 'bjbyd', 'store_id' => 24,
     ],
     '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']],
@@ -208,15 +244,19 @@ $afandeng_phone = ['name' => 'afandeng', 'store_id' => 27,
     'official_sn' => true, 'refill_type' => 'api'];
 
 $phone_providers = [
-    ['name' => 'beixt', 'cfg' => $beixt_phone],
-    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
+//    ['name' => 'beixt', 'cfg' => $beixt_phone],
+//    ['name' => 'bxtwt', 'cfg' => $bxtwt_phone],
     ['name' => 'bjb', 'cfg' => $bjb_phone],
     ['name' => 'bjbyd', 'cfg' => $bjbyd_phone],
-    ['name' => 'tianx', 'cfg' => $tianx_phone],
-    ['name' => 'yifa', 'cfg' => $yifa_phone],
-    ['name' => 'jiec', 'cfg' => $jiec_phone],
-    ['name' => 'weit', 'cfg' => $weit_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' => 'afandeng', 'cfg' => $afandeng_phone],
+    ['name' => 'afandnew', 'cfg' => $afandnew_phone],
+    ['name' => 'lingzh', 'cfg' => $lingzh_phone],
+    ['name' => 'lingzhdl', 'cfg' => $lingzhdl_phone]
 ];
 $config['phone_providers'] = $phone_providers;

docker/compose/xyz-acc/docker-compose.yml

@@ -11,9 +11,12 @@ services:
       - /nfs/upload:/var/www/html/data/upload
       - /nfs/merchant:/var/www/html/merchant
       - ../../conf/nginx/cert:/etc/nginx/cert
-      - ../../conf/nginx/nginx-prod-https.conf:/etc/nginx/nginx.conf:ro
+      - ../../conf/nginx/nginx-xyz-https.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.125"
 
   redisrv:
     image: redis:alpine
@@ -33,7 +36,7 @@ services:
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
       - ../../../:/var/www/html
-      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
+      - ../../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/lz-mobile-spwan-start:/usr/local/bin/docker-spwan-start
@@ -49,7 +52,7 @@ services:
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
       - ../../../:/var/www/html
-      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
+      - ../../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/racc-spwan-start-lz:/usr/local/bin/docker-spwan-start
@@ -67,7 +70,7 @@ services:
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php-fpm/lz-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php/xyz-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]
@@ -81,7 +84,7 @@ services:
       - ../../../:/var/www/html
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
-      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php/xyz-php.ini:/usr/local/etc/php/php.ini
       - ../../conf/crontab/root:/var/spool/cron/crontabs/root
     container_name: "panda-crontab"
     command: [crond,"-f"]
@@ -92,7 +95,7 @@ services:
     image: php-zts-debug:7.3.18
     volumes:
       - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../conf/php/lz-php.ini:/usr/local/etc/php/php.ini
+      - ../../conf/php/xyz-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

docker/compose/xyz-worker/docker-compose.yml

@@ -8,7 +8,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/xyz-php.ini:/usr/local/etc/php/php.ini
     container_name: "panda-dispatcher"
     command: [php,"/var/www/html/rdispatcher/dispatcher.php","1"]
 
@@ -19,7 +19,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/xyz-php.ini:/usr/local/etc/php/php.ini
     container_name: "panda-queue"
     command: [php,"/var/www/html/queue/index.php", "queue", "index"]
 
@@ -30,16 +30,16 @@ 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/xyz-php.ini:/usr/local/etc/php/php.ini
     container_name: "panda-searcher"
     command: [php, "/var/www/html/searcher.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
-#      - ../../../:/var/www/html
-#      - /nfs/upload:/var/www/html/data/upload
-#      - /mnt/shoplog:/var/www/html/data/log
-#    container_name: "panda-php"
+  phpcli:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../conf/etc/localtime:/etc/localtime:ro
+      - ../../conf/php/xyz-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
+    container_name: "panda-php"

docker/conf/nginx/nginx-xyz-https.conf

@@ -82,7 +82,7 @@ http
 
         location ~ /mobile/[/\w]+\.php$ {
             root           $folder_name;
-            fastcgi_pass   121.89.223.81:9100;
+            fastcgi_pass   docker.hostip:9100;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include fastcgi_params;
@@ -94,7 +94,7 @@ http
 
         location ~ /racc/[/\w]+\.php$ {
             root           $folder_name;
-            fastcgi_pass   121.89.223.81:9101;
+            fastcgi_pass   docker.hostip:9101;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include fastcgi_params;
@@ -103,7 +103,7 @@ http
         location ~ \.php$ {
             add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   websrv:9000;
+            fastcgi_pass   docker.hostip:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;