Merge branch 'raccount' into rch

admin/config/config.ini.php

@@ -34,6 +34,7 @@ if(defined('COMPANY_NAME') && COMPANY_NAME === 'XYZ_COMPANY')
             '福庆顺招行',
             '椰林光大',
             '椰林北京',
+            '国研北京',
     ];
 
     $config['server'] = [

docker/compose/zy/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
-      - /nfs/upload:/var/www/html/data/upload
-      - /nfs/merchant:/var/www/html/merchant
+      - /mnt/upload:/var/www/html/data/upload
+      - /mnt/merchant:/var/www/html/merchant
     container_name: "zy-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
-      - /nfs/upload:/var/www/html/data/upload
+      - /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: "zy-mobile"

docker/compose/zy/admin/docker-compose.yml

@@ -1,20 +1,20 @@
 version: "3.7"
 
 services:
-  nginxsrv:
-    image: nginx:alpine
-    ports:
-      - "80:80"
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/nginx/nginx_admin.conf:/etc/nginx/nginx.conf:ro
-      - /nfs/upload:/var/www/html/data/upload
-      - /nfs/merchant:/var/www/html/merchant
-    container_name: "zy-nginx"
-    command: [nginx,'-g','daemon off;']
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
+#  nginxsrv:
+#    image: nginx:alpine
+#    ports:
+#      - "80:80"
+#    volumes:
+#      - ../../../../:/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
+#    container_name: "zy-nginx"
+#    command: [nginx,'-g','daemon off;']
+#    extra_hosts:
+#      - "docker.hostip:172.17.0.1"
 
   mchsrv:
     image: php-zts:7.3.18
@@ -25,7 +25,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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-merchant"
     command: [docker-spwan-start]
@@ -39,7 +39,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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-web"
     command: [php-fpm]

docker/compose/zy/cli/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-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
-      - /nfs/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: "zy-swoole"
@@ -32,7 +32,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /nfs/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: "zy-vender"

docker/compose/zy/conf/nginx/nginx.conf

@@ -72,7 +72,7 @@ http
 
         location /plot {
             root $folder_name;
-            proxy_pass         http://172.26.105.126:5000;
+            proxy_pass         http://172.16.1.101:5000;
             proxy_redirect     off;
 
             proxy_set_header   Host                 $host;
@@ -112,7 +112,7 @@ http
 
         location ~ /mchsrv/[/\w]+\.php$ {
             root           $folder_name;
-            fastcgi_pass   172.26.80.6:9102;
+            fastcgi_pass   docker.hostip:9102;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             fastcgi_param SIGN $http_sign;
@@ -122,7 +122,7 @@ http
         location ~ \.php$ {
 	        add_header Cache-Control no-store;
             root           $folder_name;
-            fastcgi_pass   172.26.80.6:9000;
+            fastcgi_pass   docker.hostip:9000;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             fastcgi_buffer_size  1024K;

docker/compose/zy/conf/nginx/nginx_admin.conf

@@ -1,141 +0,0 @@
-user nginx;
-worker_processes  16;
-error_log   /var/error.log  info;
-worker_rlimit_nofile 10240;
-
-events {
-    worker_connections  8192;
-    multi_accept on;
-    use epoll;
-}
-
-http 
-{
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    underscores_in_headers on;
-    client_max_body_size 32M;
-    client_body_buffer_size 1024K;
-
-    tcp_nopush on;
-
-    sendfile            on;
-    keepalive_timeout   300;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    server 
-    {
-    	listen       80;
-        set  $folder_name /var/www/html;
-        server_name co-data.zylife.co;
-        root $folder_name;
-        index index.html index.php; 
-
-    	proxy_connect_timeout 500s;
-        proxy_read_timeout 500s;
-        proxy_send_timeout 500s;
-
-        fastcgi_connect_timeout 75;
-        fastcgi_read_timeout 600;   
-        fastcgi_send_timeout 600;
-        fastcgi_buffer_size  32K;
-        fastcgi_buffers      32 32K;
-
-        set_real_ip_from 100.64.0.0/10;
-        real_ip_header X-Forwarded-For;
-
-        charset utf-8;
-        
-        location /logs {
-            deny all;
-            return 403;
-        }
-
-        location /data/log {
-            deny all;
-            return 403;
-        }
-        location / {
-            index  index.html index.htm index.php;
-        }
-        
-        location /mshop {
-            root $folder_name;
-            autoindex on;        
-            index  index.html index.htm index.php;
-	        try_files $uri $uri/ /mshop/index.html;
-        }
-
-        location /plot {
-            root $folder_name;
-            proxy_pass         http://172.16.1.97: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;
-            index  index.html index.htm index.php;
-            try_files $uri $uri/ /merchant/index.html;
-        }
-
-        location ~ /mobile/[/\w]+\.php$ {
-            root           $folder_name;
-            fastcgi_pass   docker.hostip:9100;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-            fastcgi_param  SIGN $http_sign;
-            include fastcgi_params;
-        }
-
-        location ~ /mobile/[/\w]+\.html$ {
-            try_files $uri $uri/ /mobile/index.html;
-        }
-
-        location ~ /racc/[/\w]+\.php$ {
-            root           $folder_name;
-            fastcgi_pass   docker.hostip: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   docker.hostip: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_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-            fastcgi_buffer_size  1024K;
-            fastcgi_buffers      32 1024K;
-            proxy_buffer_size  128k;     #设置缓冲区的大小和数量
-            proxy_buffers 100  128k;     #
-            proxy_read_timeout 900s;
-            proxy_send_timeout 900s;
-            fastcgi_read_timeout 900;
-            fastcgi_send_timeout 900;
-            keepalive_timeout    900;
-
-            include        fastcgi_params;
-        }
-    }
-}

docker/compose/zy/conf/nginx/nginxip.conf

@@ -1,127 +0,0 @@
-user nginx;
-worker_processes  16;
-error_log   /var/error.log  info;
-worker_rlimit_nofile 10240;
-
-events {
-    worker_connections  8192;
-    multi_accept on;
-    use epoll;
-}
-
-http 
-{
-    include       mime.types;
-    default_type  application/octet-stream;
-    fastcgi_buffer_size 32k;
-    fastcgi_buffers 8 32k;
-    underscores_in_headers on;
-    client_max_body_size 1024M;
-    tcp_nopush on;
-
-    sendfile            on;
-    keepalive_timeout   300;
-
-    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-                      '$status $body_bytes_sent "$http_referer" '
-                      '"$http_user_agent" "$http_x_forwarded_for"';
-
-    server 
-    {
-    	listen       80;
-        set  $folder_name /var/www/html;
-        server_name 39.99.250.4;
-        root $folder_name;
-        index index.html index.php; 
-    	client_max_body_size 100m;
-    	proxy_connect_timeout 500s;
-        proxy_read_timeout 500s;
-        proxy_send_timeout 500s;
-        fastcgi_connect_timeout 75;
-        fastcgi_read_timeout 600;   
-        fastcgi_send_timeout 600;
-
-        set_real_ip_from 100.64.0.0/10;
-        real_ip_header X-Forwarded-For;
-
-        charset utf-8;
-        
-        location /logs {
-            deny all;
-            return 403;
-        }
-
-        location /data/log {
-            deny all;
-            return 403;
-        }
-        location / {
-            index  index.html index.htm index.php;
-        }
-        
-        location /mshop {
-            root $folder_name;
-            autoindex on;        
-            index  index.html index.htm index.php;
-	        try_files $uri $uri/ /mshop/index.html;
-        }
-
-        location /plot {
-            root $folder_name;
-            proxy_pass         http://172.26.105.126: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;
-            index  index.html index.htm index.php;
-            try_files $uri $uri/ /merchant/index.html;
-        }
-
-        location ~ /mobile/[/\w]+\.php$ {
-            root           $folder_name;
-            fastcgi_pass   docker.hostip:9100;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-            fastcgi_param  SIGN $http_sign;
-            include fastcgi_params;
-        }
-
-        location ~ /mobile/[/\w]+\.html$ {
-            try_files $uri $uri/ /mobile/index.html;
-        }
-
-        location ~ /racc/[/\w]+\.php$ {
-            root           $folder_name;
-            fastcgi_pass   docker.hostip: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.80.6: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   172.26.80.6:9000;
-            fastcgi_index  index.php;
-            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
-            include        fastcgi_params;
-        }
-    }
-}

docker/compose/zy/conf/php/php-swoole.ini

@@ -1327,7 +1327,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.125:6379
+session.save_path = tcp://172.16.1.101: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

docker/compose/zy/conf/php/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.125:6379
+session.save_path = tcp://172.16.1.101: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

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

@@ -2,35 +2,35 @@ version: "3.7"
 
 services:
   crontabsrv:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/crontab/root:/var/spool/cron/crontabs/root
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-crontab"
     command: [crond,"-f"]
 
   cronsec:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-cronsec"
     command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
 
   accedit:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-accedit"
     command: [php,"/var/www/html/crontab/index.php",'minutes','account_edit']

docker/compose/zy/plot/docker-compose.yml

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

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

@@ -2,13 +2,13 @@ version: "3.7"
 
 services:
   crontabslave:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-slavecron"
     command: [crond,"-f"]
@@ -18,12 +18,12 @@ services:
           cpus: '8'
 
   statutil:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-statutil"
     command: [php,"/var/www/html/crontab/index.php",'minutes','stat_util']

docker/compose/zy/slave-task/docker-compose.yml

@@ -2,85 +2,85 @@ version: "3.7"
 
 services:
   taska:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-taska"
     command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
 
   taskb:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-taskb"
     command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
 
   taskc:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-taskc"
     command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
 
   mtaska:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-mtaska"
     command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
 
   mtaskb:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-mtaskb"
     command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
 
   mtaskc:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-mtaskc"
     command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']
 
   mtaskd:
-    image: php-zts-debug:7.3.18
+    image: php-zts:7.3.18
     volumes:
       - ../../../../:/var/www/html
       - ../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
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "zy-mtaskd"
     command: [php,"/var/www/html/crontab/index.php",'minutes','merchant_task']

docker/compose/zy/worker/docker-compose.yml

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

docker/compose/zy/worker/restart_cordsrv.sh

@@ -1,3 +0,0 @@
-docker-compose stop -t 1200 cordsrv
-docker-compose up -d cordsrv
-docker-compose ps

docker/compose/zy/yzvendor/docker-compose.yml

@@ -7,7 +7,7 @@ services:
       - ../../../../:/var/www/html
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-token-refresh"
     command: [php,"/var/www/html/crontab/index.php",'vendor','token_refresh']

helper/refill/api/xyz/guochuang/config.php

@@ -95,7 +95,7 @@ class config
         "5-20-23" => 20.08, "5-30-23" => 30.12, "5-50-23" => 50.2, "5-100-23" => 100.4, "5-200-23" => 200.8, "5-300-23" => 301.2, "5-500-23" => 502,//四川 23
         "5-10-31" => 10.22, "5-20-31" => 20.22, "5-30-31" => 30.24, "5-50-31" => 50.25, "5-100-31" => 100.3, "5-200-31" => 200.4, "5-300-31" => 300.6, "5-500-31" => 501,//新疆 31
         //电信
-        "6-10-27" => 10.02, "6-20-27" => 20.04, "6-30-27" => 30.06, "6-50-27" => 50.1, "6-100-27" => 100.2, "6-200-27" => 200.4, "6-300-27" => 300.6, "6-500-27" => 501,//陕西 27
+        "6-10-27" => 10.01, "6-20-27" => 20.02, "6-30-27" => 30.03, "6-50-27" => 50.05, "6-100-27" => 100.1, "6-200-27" => 200.2, "6-300-27" => 300.3, "6-500-27" => 500.5,//陕西 27
         "6-10-4" => 9.935, "6-20-4" => 19.87, "6-30-4" => 29.805, "6-50-4" => 49.675, "6-100-4" => 99.35, "6-200-4" => 198.7, "6-300-4" => 298.05, "6-500-4" => 496.75,//山西 4
         "6-10-18" => 10.04, "6-20-18" => 20.08, "6-30-18" => 30.12, "6-50-18" => 50.15, "6-100-18" => 100.3, "6-200-18" => 200.6, "6-300-18" => 300.9, "6-500-18" => 501.5,//湖南 18
         "6-10-15" => 10.21, "6-20-15" => 20.22, "6-30-15" => 30.231, "6-50-15" => 50.25, "6-100-15" => 100.3, "6-200-15" => 200.3, "6-300-15" => 300.45, "6-500-15" => 500.75,//山东 15

helper/refill/api/xyz/xinma/RefillCallBack.php

@@ -26,23 +26,27 @@ class RefillCallBack implements refill\IRefillCallBack
 
     public function notify($params)
     {
-        $extractOfficialSn = function ($officialSnStr) {
+        $extractOfficialSn = function ($sms)
+        {
             $officialSn = '';
 
-            $matches = [];
-            if (preg_match_all("/(\d+)/", $officialSnStr, $matches)) {
-                foreach ($matches[1] as $item) {
+            if (preg_match_all("/(\d+)/", $sms, $matches))
+            {
+                foreach ($matches[1] as $item)
+                {
                     if (strlen($officialSn) < strlen($item)) {
                         $officialSn = $item;
                     }
                 }
             }
+
             return $officialSn;
         };
 
         $status = intval($params['status']);
         $order_sn = $params['user_order_id'];
         $order_info = Model('vr_order')->getOrderInfoForNotify(['order_sn' => $order_sn]);
+
         if (empty($order_info)) {
             return [false, false, false, false, ''];
         }

helper/refill/api/yl/guochuang/config.php

@@ -72,6 +72,7 @@ class config
         "4-10-13" => 9.965, "4-20-13" => 19.93, "4-30-13" => 29.895, "4-50-13" => 49.825, "4-100-13" => 99.65, "4-200-13" => 199.3, "4-300-13" => 298.95, "4-500-13" => 498.25,//福建 13
         "4-10-5" => 10.035, "4-20-5" => 20.07, "4-30-5" => 30.09, "4-50-5" => 50.15, "4-100-5" => 100.3, "4-200-5" => 200.4, "4-300-5" => 300.6, "4-500-5" => 501,//内蒙古 5
         "4-30-18" => 29.835, "4-50-18" => 49.725, "4-100-18" => 99.45, "4-200-18" => 198.3,//湖南 18
+
         "4-10-19" => 10.1, "4-20-19" => 20.2, "4-30-19" => 30.015, "4-50-19" => 50.025, "4-100-19" => 100.05, "4-200-19" => 200.1, "4-300-19" => 300.15, "4-500-19" => 500.25,//广东 19
         "4-10-7" => 9.93, "4-20-7" => 19.86, "4-30-7" => 29.52, "4-50-7" => 49.2, "4-100-7" => 98.4, "4-200-7" => 196.8, "4-300-7" => 295.2, "4-500-7" => 492,//吉林 7
         "4-10-1" => 10.31, "4-20-1" => 20.32, "4-30-1" => 30.33, "4-50-1" => 50.35, "4-100-1" => 100.4, "4-200-1" => 200.3, "4-300-1" => 300.45, "4-500-1" => 500.75,//北京 1
@@ -95,7 +96,7 @@ class config
         "5-20-23" => 20.08, "5-30-23" => 30.12, "5-50-23" => 50.2, "5-100-23" => 100.4, "5-200-23" => 200.8, "5-300-23" => 301.2, "5-500-23" => 502,//四川 23
         "5-10-31" => 10.22, "5-20-31" => 20.22, "5-30-31" => 30.24, "5-50-31" => 50.25, "5-100-31" => 100.3, "5-200-31" => 200.4, "5-300-31" => 300.6, "5-500-31" => 501,//新疆 31
         //电信
-        "6-10-27" => 10.02, "6-20-27" => 20.04, "6-30-27" => 30.06, "6-50-27" => 50.1, "6-100-27" => 100.2, "6-200-27" => 200.4, "6-300-27" => 300.6, "6-500-27" => 501,//陕西 27
+        "6-10-27" => 10.01, "6-20-27" => 20.02, "6-30-27" => 30.03, "6-50-27" => 50.05, "6-100-27" => 100.1, "6-200-27" => 200.2, "6-300-27" => 300.3, "6-500-27" => 500.5,//陕西 27
         "6-10-4" => 9.935, "6-20-4" => 19.87, "6-30-4" => 29.805, "6-50-4" => 49.675, "6-100-4" => 99.35, "6-200-4" => 198.7, "6-300-4" => 298.05, "6-500-4" => 496.75,//山西 4
         "6-10-18" => 10.04, "6-20-18" => 20.08, "6-30-18" => 30.12, "6-50-18" => 50.15, "6-100-18" => 100.3, "6-200-18" => 200.6, "6-300-18" => 300.9, "6-500-18" => 501.5,//湖南 18
         "6-10-15" => 10.21, "6-20-15" => 20.22, "6-30-15" => 30.231, "6-50-15" => 50.25, "6-100-15" => 100.3, "6-200-15" => 200.3, "6-300-15" => 300.45, "6-500-15" => 500.75,//山东 15

helper/refill/api/yl/yuntian_fs/config.php

@@ -248,6 +248,13 @@ class config
                 100 => 'CTCCZJr100r',
                 200 => 'CTCCZJr200r'
             ],
+            //广西
+            20 => [
+                30 => 'CTCCGXr30r',
+                50 => 'CTCCGXr50r',
+                100 => 'CTCCGXr100r',
+                200 => 'CTCCGXr200r'
+            ],
         ]
     ];
 
@@ -300,5 +307,6 @@ class config
         "6-50-12" => 47.5, "6-100-12" => 95, "6-200-12" => 190,//安徽 12
         "6-50-15" => 47.5, "6-100-15" => 95, "6-200-15" => 190,//山东 15
         "6-50-11" => 47.5, "6-100-11" => 95, "6-200-11" => 190,//浙江 11
+        "6-30-20" => 28.5, "6-50-20" => 47.5, "6-100-20" => 95, "6-200-20" => 190,//广西 20
     ];
 }

helper/refill/api/yl/yuntian_fs/椰林.txt

@@ -220,3 +220,9 @@ CTCCBJr200r
 CTCCNXr50r
 CTCCNXr100r
 CTCCNXr200r
+
+广西电信
+CTCCGXr30r
+CTCCGXr50r
+CTCCGXr100r
+CTCCGXr200r

test/TestRefill.php

@@ -41,6 +41,8 @@ class TestRefill extends TestCase
             $this->mMchid = 1092;
             $this->mKey = '210fe406954220f56085997d6a4c5b80';
         }
+
+        $this->make_sn();
     }
 
     public static function setUpBeforeClass(): void
@@ -5587,17 +5589,20 @@ class TestRefill extends TestCase
 
     public function testXinmaOfficialSn()
     {
-        $extractOfficialSn = function ($officialSnStr) {
+        $extractOfficialSn = function ($officialSnStr)
+        {
             $officialSn = '';
 
-            $matches = [];
-            if (preg_match_all("/(\d+)/", $officialSnStr, $matches)) {
-                foreach ($matches[1] as $item) {
+            if (preg_match_all("/(\d+)/", $officialSnStr, $matches))
+            {
+                foreach ($matches[1] as $item)
+                {
                     if (strlen($officialSn) < strlen($item)) {
                         $officialSn = $item;
                     }
                 }
             }
+
             return $officialSn;
         };
 
@@ -5613,5 +5618,6 @@ class TestRefill extends TestCase
     }
 }
 
+
 //docker-compose run phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefill::testLoadBlack)( .*)?$/" --test-suffix TestRefill.php /var/www/html/test
 //docker-compose -f ./docker-compose-dev.yml run phpcli php /var/www/html/phpunit-9.2.5.phar --filter "/(TestRefill::testCall)( .*)?$/" --test-suffix TestRefill.php /var/www/html/test

test/TestSms.php

@@ -52,6 +52,19 @@ class TestSms extends TestCase
         }
     }
 
+    public function testSMS()
+    {
+        $type = 879588;//'balance_warning';
+        $mobile = '13911129867';
+        $sms = new Sms();
+        $datas = [date("m月d日H时") , 1000];
+        $status = $sms->send_oper($mobile,$type,$datas);
+
+    }
+
+
+
+
     public function testInvitee()
     {
         $sms = new Sms();
@@ -63,7 +76,6 @@ class TestSms extends TestCase
         $params[Sms::tpl_order_complete_inviter] = ['level' => 1,'name' => '桑贵苏','amount' => 2];
         $params[Sms::tpl_order_complete_invitee] = ['name' => '桑贵苏','amount' => 2];
 
-
         foreach ($params as $sms_type => $sms_param) {
             $status = $sms->send_oper($mobile,$sms_type,$sms_param);
         }