dev

docker/compose/gx/conf/nginx/nginx_admin.conf

@@ -99,14 +99,14 @@ http
             try_files $uri $uri/ /mobile/index.html;
         }
 
-#         location ~ /mchsrv/[/\w]+\.php$ {
-#             root           $folder_name;
-#             fastcgi_pass   gxmch:9000;
-#             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   mch:9000;
+            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;

docker/compose/gx/gx-admin/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - ../conf/nginx/nginx_admin.conf:/etc/nginx/nginx.conf:ro
       - /nfs/gxupload:/var/www/html/data/upload
       - /mnt/gxlog:/var/nginxlog
-#      - /nfs/gxmerchant:/var/www/html/merchant
+      - /nfs/gxmerchant:/var/www/html/merchant
     container_name: "gx-nginx"
     command: [nginx,'-g','daemon off;']
     extra_hosts:
@@ -29,6 +29,7 @@ services:
       - /nfs/gxupload:/var/www/html/data/upload
       - /mnt/gxlog:/var/www/html/data/log
     container_name: "gx-merchant"
+    command: [docker-spwan-start]
     extra_hosts:
       - "docker.hostip:172.17.0.1"
     networks: