Merge branch 'retail' of 39.97.239.116:gyfl/xyzshop into retail

docker/compose/xyzt/tacc/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - /nfs/upload:/var/www/html/data/upload
       - /nfs/tmerchant:/var/www/html/merchant
-      - /nfs/chinatelecom:/var/www/html/chinatelecom
+      - /nfs/ylclient/chinatelecom:/var/www/html/chinatelecom
     container_name: "test-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:

docker/compose/yl/conf/nginx/nginx.conf

@@ -74,7 +74,7 @@ http
             root $folder_name;
             autoindex on;
             index  index.html index.htm index.php;
-            try_files $uri $uri/ /client/chinatelecom/index.html;
+            try_files $uri $uri/ /chinatelecom/index.html;
         }
 
         location /plot {

docker/compose/yl/ylacc/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
       - /nfs/ylupload:/var/www/html/data/upload
       - /nfs/ylmerchant:/var/www/html/merchant
-      - /nfs/ylother:/var/www/html/other
+      - /nfs/ylclient/chinatelecom:/var/www/html/chinatelecom
     container_name: "yl-accnginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts: