HARUHARU 4 years atrás
parent
commit
7902aedf51
3 changed files with 30 additions and 27 deletions
  1. 4 4
      application/index/controller/Index.php
  2. 24 21
      docker-compose-windows.yml
  3. 2 2
      queue/config.windows.php

+ 4 - 4
application/index/controller/Index.php

@@ -4,8 +4,8 @@ namespace app\index\controller;
 
 class Index
 {
-//    const admin_url = 'host.docker.internal';
-    const admin_url = 'http://docker.hostip:8080';
+    const admin_url = 'http://host.docker.internal';
+//    const admin_url = 'docker.hostip';
 
     protected function request($params)
     {
@@ -18,7 +18,7 @@ class Index
     }
     public function CheckOrder(){
         $order_sn = input('param.order_sn');
-        $result = http_get(self::admin_url . '/CheckOrder' ,['order_sn' => $order_sn]);
+        $result = http_get(self::admin_url . ':8080/CheckOrder' ,['order_sn' => $order_sn]);
         if($result == false){
             json_return(500,[],'网络错误');
         }
@@ -26,8 +26,8 @@ class Index
             json_return($result['code'],[],$result['msg']);
         }
         json_success($result['data']);
-    }
 
+    }
     public function CheckFcode(){
         $code = input('param.code');
         $result = http_get(self::admin_url . ':8080/CheckFcode' ,['code' => $code]);

+ 24 - 21
docker-compose-windows.yml

@@ -6,9 +6,9 @@ services:
     ports:
       - "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
+      - /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
     links:
       - accfpm
     container_name: "acc-nginx"
@@ -17,11 +17,11 @@ services:
   accfpm:
     image: php-fpm:alpine
     volumes:
-      - 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
     container_name: "acc-web"
     command: [docker-php-fpm-start]
     depends_on:
@@ -30,9 +30,9 @@ services:
   accphp:
     image: php-zts-debug:7.3.18
     volumes:
-      - 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
     links:
       - accredis
     container_name: "acc-php"
@@ -40,27 +40,30 @@ services:
   accredis:
     image: redis:alpine
     volumes:
-      - d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
+      - /d/phpstudy_pro/WWW/access/conf/etc/localtime:/etc/localtime:ro
     container_name: "acc-redis"
     command: [ "redis-server"]
 
   accqueue:
     image: php-zts-debug:7.3.18
     volumes:
-      - 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
     container_name: "acc-queue"
     command: [docker-queue-start]
+    extra_hosts:
+      - "docker.hostip:172.18.0.1"
+      - "eth.hostip:172.17.153.106"
 
   acccrontab:
     image: php-zts-debug:7.3.18
     volumes:
-      - 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
     container_name: "acc-crontab"
     command: [docker-start]

+ 2 - 2
queue/config.windows.php

@@ -1,6 +1,6 @@
 <?php
 
 $config['net_queue']['name'] = 'net_access_queue';
-//$config['net_queue']['host'] = 'host.docker.internal';
-$config['net_queue']['host'] = '192.168.1.200';
+$config['net_queue']['host'] = 'host.docker.internal';
+//$config['net_queue']['host'] = '192.168.1.200';
 $config['net_queue']['port'] = 6380;