update

conf/nginx/nginx-debug-http.conf

@@ -31,7 +31,7 @@ http
         set  $folder_name /var/www/html/public;
         server_name 127.0.0.1;
         root $folder_name;
-        index index.html index.php; 
+        index index.html Index.php;
     	client_max_body_size 100m;
     	proxy_connect_timeout 500s;
         proxy_read_timeout 500s;
@@ -52,17 +52,17 @@ http
             return 403;
         }
         location / {
-            index  index.html index.htm index.php;
+            index  index.html index.htm Index.php;
         }
         if (!-e $request_filename) {
-            rewrite  ^(.*)$  /index.php?s=/$1  last;
+            rewrite  ^(.*)$  /Index.php?s=/$1  last;
         }
         location ~ \.php {
 	        add_header Cache-Control no-store;
 	        set  $folder_name /var/www/html/public;
             root           $folder_name;
             fastcgi_pass   accfpm:9000;
-            fastcgi_index  index.php;
+            fastcgi_index  Index.php;
             fastcgi_split_path_info ^(.+\.php)(.*)$;
             fastcgi_param PATH_INFO $fastcgi_path_info;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;

conf/nginx/nginx-prod-http.conf

@@ -31,7 +31,7 @@ http
         set  $folder_name /var/www/html;
         server_name www.xyzshops.cn;
         root $folder_name;
-        index index.html index.php; 
+        index index.html Index.php;
     	client_max_body_size 100m;
     	proxy_connect_timeout 500s;
         proxy_read_timeout 500s;
@@ -52,20 +52,20 @@ http
             return 403;
         }
         location / {
-            index  index.html index.htm index.php;
+            index  index.html index.htm Index.php;
         }
         
         location /mshop {
             root $folder_name;
             autoindex on;        
-            index  index.html index.htm index.php;
+            index  index.html index.htm Index.php;
 	        try_files $uri $uri/ /mshop/index.html;
         }
 
         location ~ /mobile/[/\w]+\.php$ {
             root           $folder_name;
             fastcgi_pass   mobilesrv:9100;
-            fastcgi_index  index.php;
+            fastcgi_index  Index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include fastcgi_params;
         }
@@ -78,7 +78,7 @@ http
 	        add_header Cache-Control no-store;
             root           $folder_name;
             fastcgi_pass   fpmsrv:9000;
-            fastcgi_index  index.php;
+            fastcgi_index  Index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;
         }

conf/nginx/nginx-prod-https.conf

@@ -40,7 +40,7 @@ http
         ssl_protocols TLSv1 TLSv1.1 TLSv1.2;   #使用该协议进行配置。
         ssl_prefer_server_ciphers on;
 
-        index index.html index.php;
+        index index.html Index.php;
         client_max_body_size 100m;
         proxy_connect_timeout 500s;
         proxy_read_timeout 500s;
@@ -61,20 +61,20 @@ http
             return 403;
         }
         location / {
-            index  index.html index.htm index.php;
+            index  index.html index.htm Index.php;
         }
 
         location /mshop {
             root $folder_name;
             autoindex on;
-            index  index.html index.htm index.php;
+            index  index.html index.htm Index.php;
             try_files $uri $uri/ /mshop/index.html;
         }
 
         location ~ /mobile/[/\w]+\.php$ {
             root           $folder_name;
             fastcgi_pass   mobilesrv:9100;
-            fastcgi_index  index.php;
+            fastcgi_index  Index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include fastcgi_params;
         }
@@ -87,7 +87,7 @@ http
             add_header Cache-Control no-store;
             root           $folder_name;
             fastcgi_pass   fpmsrv:9000;
-            fastcgi_index  index.php;
+            fastcgi_index  Index.php;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
             include        fastcgi_params;
         }

conf/nginx/nginx-test-http.conf

@@ -31,7 +31,7 @@ http
         set  $folder_name /var/www/html;
         server_name 39.97.239.116;
         root $folder_name;
-        index index.html index.php; 
+        index index.html Index.php;
     	client_max_body_size 100m;
     	proxy_connect_timeout 500s;
         proxy_read_timeout 500s;
@@ -46,11 +46,11 @@ http
             return 403;
         }
         location / {
-            index  index.html index.htm index.php;
+            index  index.html index.htm Index.php;
         }
 
         if (!-e $request_filename) {
-            rewrite  ^(.*)$  /index.php?s=/$1  last;
+            rewrite  ^(.*)$  /Index.php?s=/$1  last;
         }
 
         location ~ \.php {
@@ -58,7 +58,7 @@ http
             set  $folder_name /var/www/html/public;
             root           $folder_name;
             fastcgi_pass   accfpm:9000;
-            fastcgi_index  index.php;
+            fastcgi_index  Index.php;
             fastcgi_split_path_info ^(.+\.php)(.*)$;
             fastcgi_param PATH_INFO $fastcgi_path_info;
             fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;

docker-compose-windows.yml

@@ -4,19 +4,11 @@ services:
   accnginx:
     image: nginx:alpine
     ports:
-<<<<<<< HEAD
       - "8088:8088"
     volumes:
       - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - /d/phpstudy_pro/WWW/access/conf/nginx/nginx-debug-http.conf:/etc/nginx/nginx.conf:ro
       - /d/phpstudy_pro/WWW/access:/var/www/html
-=======
-      - "8088:80"
-    volumes:
-      - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
-      - d/phpstudy_pro/WWW/access/conf/nginx/nginx-test-http.conf:/etc/nginx/nginx.conf:ro
-      - d/phpstudy_pro/WWW/access:/var/www/html
->>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     links:
       - accfpm
     container_name: "acc-nginx"
@@ -25,19 +17,11 @@ services:
   accfpm:
     image: php-fpm:alpine
     volumes:
-<<<<<<< HEAD
       - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - /d/phpstudy_pro/WWW/access:/var/www/html
       - /d/phpstudy_pro/WWW/access/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
       - /d/phpstudy_pro/WWW/access/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
       - /d/phpstudy_pro/WWW/access/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
-=======
-      - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
-      - d/phpstudy_pro/WWW/access:/var/www/html
-      - d/phpstudy_pro/WWW/access/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
-      - d/phpstudy_pro/WWW/access/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
-      - d/phpstudy_pro/WWW/access/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
->>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     container_name: "acc-web"
     command: [docker-php-fpm-start]
     depends_on:
@@ -46,15 +30,9 @@ services:
   accphp:
     image: php-zts-debug:7.3.18
     volumes:
-<<<<<<< HEAD
       - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - /d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - /d/phpstudy_pro/WWW/access:/var/www/html
-=======
-      - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
-      - d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - d/phpstudy_pro/WWW/access:/var/www/html
->>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     links:
       - accredis
     container_name: "acc-php"
@@ -62,46 +40,27 @@ services:
   accredis:
     image: redis:alpine
     volumes:
-<<<<<<< HEAD
       - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
-=======
-      - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
->>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     container_name: "acc-redis"
     command: [ "redis-server"]
 
   accqueue:
     image: php-zts-debug:7.3.18
     volumes:
-<<<<<<< HEAD
       - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - /d/phpstudy_pro/WWW/access:/var/www/html
       - /d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - /d/phpstudy_pro/WWW/access/conf/queue/docker-queue-start:/usr/local/bin/docker-queue-start
-=======
-      - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
-      - d/phpstudy_pro/WWW/access:/var/www/html
-      - d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - d/phpstudy_pro/WWW/access/conf/queue/docker-queue-start:/usr/local/bin/docker-queue-start
->>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     container_name: "acc-queue"
     command: [docker-queue-start]
 
   acccrontab:
     image: php-zts-debug:7.3.18
     volumes:
-<<<<<<< HEAD
       - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
       - /d/phpstudy_pro/WWW/access:/var/www/html
       - /d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - /d/phpstudy_pro/WWW/access/conf/crontab/root:/var/spool/cron/crontabs/root
       - /d/phpstudy_pro/WWW/access/conf/crontab/docker-start:/usr/local/bin/docker-start
-=======
-      - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
-      - d/phpstudy_pro/WWW/access:/var/www/html
-      - d/phpstudy_pro/WWW/access/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - d/phpstudy_pro/WWW/access/conf/crontab/root:/var/spool/cron/crontabs/root
-      - d/phpstudy_pro/WWW/access/conf/crontab/docker-start:/usr/local/bin/docker-start
->>>>>>> 0e677ca27c6e4a79b6f72643cfb3ef529f7e1f7d
     container_name: "acc-crontab"
     command: [docker-start]

tests/TestIndex.php

@@ -72,7 +72,7 @@ class TestIndex extends TestCase
         }
         if($remain >= 60){
             $minute = floor($remain / 60);
-        } 
+        }
         $second = $remain % 60;
         if($day == 0){
             return "{$hour}小时{$minute}分钟{$second}秒";