stanley-king %!s(int64=4) %!d(string=hai) anos
pai
achega
a626105886

+ 0 - 5
application/api/config.php

@@ -1,5 +0,0 @@
-<?php
-
-return [
-    'user_status'  => ['1' => '已启用' , '2' => '已停用']
-];

+ 0 - 10
application/api/controller/base.php

@@ -1,10 +0,0 @@
-<?php
-
-
-namespace app\api\controller;
-
-
-class base
-{
-
-}

+ 18 - 5
application/common.php

@@ -67,7 +67,9 @@ function _curl(array $params,$is_json=false )
             $defaults[CURLOPT_CUSTOMREQUEST] = "DELETE";
             break;
     }
-    if ($_data && $params['method']!='get') {
+
+    if ($_data && $params['method']!='get')
+    {
         if($is_json){
             $defaults[CURLOPT_POSTFIELDS] = json_encode($_data);
             $defaults[CURLOPT_HTTPHEADER] = [
@@ -77,8 +79,11 @@ function _curl(array $params,$is_json=false )
         }else{
             $defaults[CURLOPT_POSTFIELDS] = $_data;
         }
-    }elseif($params['method']=='get'){
-        if(is_array($_data)){
+    }
+    elseif($params['method']=='get')
+    {
+        if(is_array($_data))
+        {
             $param = '';
             foreach ($_data as $k=>$v){
                 $param .= $k."=".$v."&";
@@ -86,14 +91,14 @@ function _curl(array $params,$is_json=false )
             $param = rtrim($param ,"&");
             if(!strpos($url,"?")){
                 $url .= "?".$param;
-            }else{
+            }
+            else{
                 $url .= "&".$param;
             }
         }
         $defaults[CURLOPT_URL] = $url;
     }
 
-
     $ch = curl_init();
     curl_setopt_array($ch, ($defaults));
 
@@ -103,6 +108,14 @@ function _curl(array $params,$is_json=false )
     return $result;
 }
 
+function http_request($method = 'GET',$params)
+{
+    $method = strtolower($method);
+    $params['method'] = $method;
+
+    return _curl($params,)
+}
+
 /**
  * 整理菜单住方法
  * @param $param

+ 8 - 0
application/index/config.php

@@ -0,0 +1,8 @@
+<?php
+
+//$_ENV = isset($_SERVER['ENV']) ? $_SERVER['ENV'] : 'dev';
+//$conf_extend = require APP_PATH . "config/{$_ENV}_config.php";
+
+return [
+    'user_status'  => ['1' => '已启用' , '2' => '已停用']
+];

+ 1 - 1
application/api/controller/Index.php

@@ -1,5 +1,5 @@
 <?php
-namespace app\api\controller;
+namespace app\index\controller;
 
 
 class Index extends base

+ 13 - 0
application/index/controller/base.php

@@ -0,0 +1,13 @@
+<?php
+
+
+namespace app\index\controller;
+
+
+class base
+{
+    protected function request($params)
+    {
+
+    }
+}

+ 3 - 1
application/api/controller/order.php

@@ -1,11 +1,13 @@
 <?php
 
-namespace app\api\controller;
+namespace app\index\controller;
 
 class order extends base
 {
     public function check_rcode()
     {
         $order_sn = input('param.order_sn');
+        echo 'hello world' . $order_sn;
+
     }
 }

+ 2 - 2
conf/nginx/nginx-debug-http.conf

@@ -29,7 +29,7 @@ http
     {
     	listen       8088;
         set  $folder_name /var/www/html/public;
-        server_name 39.97.239.116;
+        server_name 192.168.1.200;
         root $folder_name;
         index index.html index.php; 
     	client_max_body_size 100m;
@@ -58,7 +58,7 @@ http
 	        add_header Cache-Control no-store;
 	        set  $folder_name /var/www/html/public;
             root           $folder_name;
-            fastcgi_pass   devfpm:9000;
+            fastcgi_pass   devrfpm:9000;
             fastcgi_index  index.php;
             fastcgi_split_path_info ^(.+\.php)(.*)$;
             fastcgi_param PATH_INFO $fastcgi_path_info;

+ 0 - 0
conf/php-fpm/docker-php-fpm-start


+ 1 - 1
conf/php-fpm/php-debug.ini

@@ -1324,7 +1324,7 @@ bcmath.scale = 0
 ; Handler used to store/retrieve data.
 ; http://php.net/session.save-handler
 session.save_handler = redis
-session.save_path = "tcp://redisrv:6379"
+session.save_path = "tcp://devrredis:6379"
 
 ;session.save_handler = files
 

+ 25 - 37
docker-compose-dev.yml

@@ -1,57 +1,45 @@
 version: "3.7"
 
 services:
-  devnginx:
+  devrnginx:
     image: nginx:alpine
     ports:
-      - "8088:8080"
-      - "443:443"
+      - "8088:8088"
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD/conf/nginx/nginx-debug-http.conf:/etc/nginx/nginx.conf:ro
       - $PWD:/var/www/html
     links:
-      - devfpm
-    container_name: "dev-nginx"
+      - devrfpm
+    container_name: "devr-nginx"
     command: [nginx,'-g','daemon off;']
 
-  devfpm:
-      image: php-fpm:alpine
-      volumes:
-        - $PWD/conf/etc/localtime:/etc/localtime:ro
-        - $PWD:/var/www/html
-        - $PWD/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
-        - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
-        - $PWD/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
-      container_name: "dev-web"
-      command: [docker-php-fpm-start]
-      depends_on:
-        - devredis
+  devrfpm:
+    image: php-fpm:alpine
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD:/var/www/html
+      - $PWD/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
+      - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+      - $PWD/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
+    container_name: "devr-web"
+    command: [docker-php-fpm-start]
+    depends_on:
+      - devrredis
 
-  devphp:
+  devrphp:
     image: php-zts-debug:7.3.18
     volumes:
       - $PWD/conf/etc/localtime:/etc/localtime:ro
       - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - $PWD:/var/www/html
     links:
-      - devredis
-    container_name: "dev-php"
-    depends_on:
-      - "redisrv"
+      - devrredis
+    container_name: "devr-php"
 
-  crontabsrv:
-      image: php-zts-debug:7.3.18
-      volumes:
-        - $PWD/conf/etc/localtime:/etc/localtime:ro
-        - $PWD:/var/www/html
-        - /Volumes/Transcend/upload:/var/www/html/data/upload
-        - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-        - $PWD/conf/crontab/debug-root:/var/spool/cron/crontabs/root
-        - $PWD/conf/crontab/docker-start:/usr/local/bin/docker-start
-      links:
-        - redisrv
-      container_name: "panda-crontab"
-      command: [docker-start]
-      depends_on:
-        - "redisrv"
+  devrredis:
+    image: redis:alpine
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+    container_name: "devr-redis"
+    command: [ "redis-server"]

+ 56 - 0
docker-compose-test.yml

@@ -0,0 +1,56 @@
+version: "3.7"
+
+services:
+  devnginx:
+    image: nginx:alpine
+    ports:
+      - "8088:8080"
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD/conf/nginx/nginx-debug-http.conf:/etc/nginx/nginx.conf:ro
+      - $PWD:/var/www/html
+    links:
+      - devfpm
+    container_name: "dev-nginx"
+    command: [nginx,'-g','daemon off;']
+
+  devfpm:
+      image: php-fpm:alpine
+      volumes:
+        - $PWD/conf/etc/localtime:/etc/localtime:ro
+        - $PWD:/var/www/html
+        - $PWD/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
+        - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+        - $PWD/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
+      container_name: "dev-web"
+      command: [docker-php-fpm-start]
+      depends_on:
+        - devredis
+
+  devphp:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - $PWD:/var/www/html
+    links:
+      - devredis
+    container_name: "dev-php"
+    depends_on:
+      - "redisrv"
+
+  crontabsrv:
+      image: php-zts-debug:7.3.18
+      volumes:
+        - $PWD/conf/etc/localtime:/etc/localtime:ro
+        - $PWD:/var/www/html
+        - /Volumes/Transcend/upload:/var/www/html/data/upload
+        - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+        - $PWD/conf/crontab/debug-root:/var/spool/cron/crontabs/root
+        - $PWD/conf/crontab/docker-start:/usr/local/bin/docker-start
+      links:
+        - redisrv
+      container_name: "panda-crontab"
+      command: [docker-start]
+      depends_on:
+        - "redisrv"

+ 56 - 0
docker-compose.yml

@@ -0,0 +1,56 @@
+version: "3.7"
+
+services:
+  devnginx:
+    image: nginx:alpine
+    ports:
+      - "8088:8080"
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD/conf/nginx/nginx-debug-http.conf:/etc/nginx/nginx.conf:ro
+      - $PWD:/var/www/html
+    links:
+      - devfpm
+    container_name: "dev-nginx"
+    command: [nginx,'-g','daemon off;']
+
+  devfpm:
+      image: php-fpm:alpine
+      volumes:
+        - $PWD/conf/etc/localtime:/etc/localtime:ro
+        - $PWD:/var/www/html
+        - $PWD/conf/php-fpm/php-debug.ini:/usr/local/etc/php/php.ini
+        - $PWD/conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+        - $PWD/conf/php-fpm/docker-php-fpm-start:/usr/local/bin/docker-php-fpm-start
+      container_name: "dev-web"
+      command: [docker-php-fpm-start]
+      depends_on:
+        - devredis
+
+  devphp:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - $PWD/conf/etc/localtime:/etc/localtime:ro
+      - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - $PWD:/var/www/html
+    links:
+      - devredis
+    container_name: "dev-php"
+    depends_on:
+      - "redisrv"
+
+  crontabsrv:
+      image: php-zts-debug:7.3.18
+      volumes:
+        - $PWD/conf/etc/localtime:/etc/localtime:ro
+        - $PWD:/var/www/html
+        - /Volumes/Transcend/upload:/var/www/html/data/upload
+        - $PWD/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+        - $PWD/conf/crontab/debug-root:/var/spool/cron/crontabs/root
+        - $PWD/conf/crontab/docker-start:/usr/local/bin/docker-start
+      links:
+        - redisrv
+      container_name: "panda-crontab"
+      command: [docker-start]
+      depends_on:
+        - "redisrv"