stanley-king 4 سال پیش
والد
کامیت
7c16c6ffe9

+ 11 - 11
docker/compose/stanley/docker-compose.yml

@@ -36,7 +36,7 @@ services:
       - ../../conf/php/php-local-debug.ini:/usr/local/etc/php/php.ini
       - /Volumes/Transcend/upload:/var/www/html/data/upload
       - /Users/stanley-king/work/PHPProject/shoplog:/var/www/html/data/log
-      - ../../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
+      - ../../conf/php/stanley-mobile-spwan-start:/usr/local/bin/docker-spwan-start
     links:
       - redisrv
     container_name: "panda-mobile"
@@ -177,13 +177,13 @@ services:
       - "websrv"
       - "searcher"
 
-  async:
-    image: php-swool-redis:latest
-    volumes:
-      - ../../conf/etc/localtime:/etc/localtime:ro
-      - ../../conf/php/php-swoole-debug.ini:/usr/local/etc/php/php.ini
-      - ../../../:/var/www/html
-      - /Volumes/Transcend/upload:/var/www/html/data/upload
-      - /Users/stanley-king/work/PHPProject/shoplog:/var/www/html/data/log
-    container_name: "panda-async"
-    command: [php, "/var/www/html//test/examples/process/async_master.php"]
+#  async:
+#    image: php-swool-redis:latest
+#    volumes:
+#      - ../../conf/etc/localtime:/etc/localtime:ro
+#      - ../../conf/php/php-swoole-debug.ini:/usr/local/etc/php/php.ini
+#      - ../../../:/var/www/html
+#      - /Volumes/Transcend/upload:/var/www/html/data/upload
+#      - /Users/stanley-king/work/PHPProject/shoplog:/var/www/html/data/log
+#    container_name: "panda-async"
+#    command: [php, "/var/www/html//test/examples/process/async_master.php"]

+ 2 - 0
docker/conf/nginx/nginx-acc-45-http.conf

@@ -75,6 +75,7 @@ http
             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;
         }
 
@@ -87,6 +88,7 @@ http
             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;
         }
 

+ 2 - 0
docker/conf/nginx/nginx-stanley-http.conf

@@ -66,6 +66,7 @@ http
             fastcgi_pass   host.docker.internal:9100;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
+            fastcgi_param SIGN $http_sign;
             include fastcgi_params;
         }
 
@@ -78,6 +79,7 @@ http
             fastcgi_pass   host.docker.internal:9101;
             fastcgi_index  index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
+            fastcgi_param SIGN $http_sign;
             include fastcgi_params;
         }
 

+ 2 - 0
docker/conf/nginx/nginx-xyz-https.conf

@@ -85,6 +85,7 @@ http
             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;
         }
 
@@ -97,6 +98,7 @@ http
             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;
         }
 

+ 11 - 0
docker/conf/php/stanley-mobile-spwan-start

@@ -0,0 +1,11 @@
+#!/bin/sh
+set -e
+spawn-fcgi -a 0.0.0.0 -p 9100 -F 1 -f "php /var/www/html/mobile/mobile_run.php"
+
+time=$(date "+%Y%m%d")
+
+if [ ! -f "/var/www/html/data/log/${time}-mobile.log" ]; then
+    touch "/var/www/html/data/log/${time}-mobile.log"
+fi
+
+tail -f "/var/www/html/data/log/${time}-mobile.log"

+ 1 - 0
helper/request_helper.php

@@ -228,6 +228,7 @@ class request_helper
             'PATH_INFO',
             'HTTP_CLIENT_TYPE',
             'HTTP_CLIENT_VERSION',
+            'HTTP_SIGN',
             'ORIG_PATH_INFO');
 
         return $fields;