stanley-king 1 tahun lalu
induk
melakukan
f513b8d920
44 mengubah file dengan 80 tambahan dan 618 penghapusan
  1. 1 1
      application/index/controller/Base.php
  2. 0 27
      conf/nginx/cert/www.xyzshops.cn.key
  3. 0 59
      conf/nginx/cert/www.xyzshops.cn.pem
  4. 0 25
      conf/nginx/fastcgi.conf
  5. 0 25
      conf/nginx/fastcgi.conf.default
  6. 0 24
      conf/nginx/fastcgi_params
  7. 0 109
      conf/nginx/koi-utf
  8. 0 103
      conf/nginx/koi-win
  9. 0 27
      conf/nginx/lrlzssl/214455844540210.key
  10. 0 67
      conf/nginx/lrlzssl/214455844540210.pem
  11. 0 89
      conf/nginx/mime.types
  12. 1 1
      config/cache.php
  13. 0 53
      docker-compose.yml
  14. 13 0
      docker/api/compose.env
  15. 0 0
      docker/api/docker-compose-mac.yml
  16. 0 0
      docker/api/docker-compose-test.yml
  17. 0 0
      docker/api/docker-compose-windows.yml
  18. 56 0
      docker/api/docker-compose.yml
  19. 0 0
      docker/conf/crontab/debug-root
  20. 0 0
      docker/conf/crontab/docker-start
  21. 0 0
      docker/conf/crontab/root
  22. 0 0
      docker/conf/etc/hosts
  23. 0 0
      docker/conf/etc/localtime
  24. 1 0
      conf/nginx/nginx-prod-http.conf
  25. 0 0
      docker/conf/nginx/nginx-debug-http.conf
  26. 0 0
      docker/conf/nginx/nginx-prod-https.conf
  27. 0 0
      docker/conf/nginx/nginx-test-http.conf
  28. 0 0
      docker/conf/nginx/nginx.conf.default
  29. 0 0
      docker/conf/nginx/scgi_params
  30. 0 0
      docker/conf/nginx/uwsgi_params
  31. 0 0
      docker/conf/nginx/win-utf
  32. 0 0
      docker/conf/php-fpm/docker-php-fpm-start
  33. 1 1
      conf/php-fpm/php-debug.ini
  34. 0 0
      docker/conf/php-fpm/php-fpm.conf
  35. 3 3
      conf/php-fpm/php.ini
  36. 0 0
      docker/conf/php/docker-php-spwan-start
  37. 0 0
      docker/conf/php/docker-php-start
  38. 1 1
      conf/php/php-debug.ini
  39. 1 1
      conf/php/php.ini
  40. 0 0
      docker/conf/queue/docker-queue-start
  41. 0 0
      docker/conf/redis/6379.conf
  42. 0 0
      docker/conf/searcher/docker-search-start
  43. 1 1
      thinkphp/library/think/cache/driver/Redis.php
  44. 1 1
      thinkphp/library/think/session/driver/Redis.php

+ 1 - 1
application/index/controller/Base.php

@@ -5,7 +5,7 @@ use app\index\model\ActionLogModel;
 use think\Controller;
 
 class Base extends Controller{
-    const redis_host = 'tcp://lredis';
+    const redis_host = 'tcp://redis';
     const redis_port = 6379;
     const queue_name = 'net_access_queue';
     private $no_check = ['order/checkorder' , 'order/recordstore' , 'order/checkfcode' , 'order/recordfetch' , 'cabinet/getcabinetsboxs' , 'cabinet/boxchangestatus'];

+ 0 - 27
conf/nginx/cert/www.xyzshops.cn.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAsx5PGr1ffC+BJMN5hX9MjkvvaJ2kKxkiaZHcMDDoSllzLtjv
-Zhwd+1+YZBJ5Eq2llBxIrOTK7olB3j0AFGKz+k3Px5GrZ5uAoobv6efGLarp7BZW
-L5NUun8wQjDgegYlVIbnPMwOuhLbFdBV0LFSEAsy91sxoWDKsRKkh9BkrdEBaJWb
-pshakxbLSM/DgqKcG+GjruRT5Q5cl1cllP8TKOjirOEfQw794MJVxIxjQqxOtuRx
-VNLRIG2p6dRPM0hpKHtpFIF3mYzu9q7xOcG9jFWbb5/tsH/VfV+rP+33tRUjaOKL
-NhYaCKSZUO2F6EjyQKvXI65n6JE9dWkvFvtx+wIDAQABAoIBACmbyNR1WVEH2AAq
-SHhycd48VYj/1bsNQ6kycOvg8JUU4mTnj/UwYuaZ9lSI1gc4v1YAnAFNxLZUvDBc
-C0CxDQ4ANVwuwpp2zRL0NZcoeCjzoxNsvOigWPZZxWQa5opyEwnnrJ+651DiQHJ4
-yvaHuoBvmY9MZ+MNEQjBQ+coybp2hpRtDhOe1A92CAk79oKluupdi/pmY3+9l91Z
-TMyn8qhrNY8gerImC8NGmBCy3JmO3e7lD3k8FlAr1LhCovEc/ngcYj8xr/wfsxo2
-b7Jo27nEn59HjB4yG1MH/tRcxbc0IevTBRnD0shhYXZ+4IW2m7YIkZZKZc43GSjj
-NKKPbQECgYEA8maEXoVE4VvHRAFLZ3F7F51j8eaMj+TeDkXXYUufPC1puIc0UfT+
-5Pzy1SVdACLVC9W6CGggxLw6xq++S3aGiN3cDueE4W7Sfrm/Yb8kzXPts01AL8Dx
-EXwPB+LfwqQKSjfV4AQg9poJs6QqAr0xBAIkzECxAnMQp3Eh86LmAXECgYEAvSrm
-0k6hnMJfrgjlWyYRoYy+KNZtmAruqiYpoo4rylS46N0QlqTRlBeQFdJBUwqpiBAQ
-eV2Aap8VnRIkn7j94Y0HkayVjf9qra78k8T+5yws08FlVbegF/8bVc3cZfdzn8AZ
-s7loe+DhfdL2g36l1HjW0mfVPTnTVDwIUQPSdCsCgYBBjyKL4eVwQf9R0DvRnWqa
-R3IpkZ5AqLi6CX+oC+jkQLAQPVkUNXve+N7AcRuHFuSiD8sBzQ/XxcTrycpg5Iyc
-ZczHpyxUQEHkDl7JlAXjH1CRpvoOMFPC09fI3T6BiRZTXmiU7ujvaVfoYyUNmpew
-KthC+dgl/nLppnp1R4CHsQKBgFVl0sJKgScVkMAuf+xAKWF2+jnRY7Rp6wihJdae
-vCIhUUC+28hGK97hLEjNnHPyskochnNjxJ9dphI8qI/6oZJ7allXQkTSc8Ro5NmI
-61JNXQdTnX2u4fUzU5HO15qotWf+/xtlrkeOY/27iVIfkJl02/YsrdVwD3lNiKua
-QB31AoGBAMv28LQ1jpCiKGxplgXzvZ+a0Zm5m9OpQ1bV7qTTa6jZsYjrW8Zi/E5P
-V727TM3oExslBYjF+onYY9zRqVZlxTyQn1GWC3kCO/swz/XKTQJyZ9cm4QIgTxl9
-b5ARNKkE3FhOpnImALWpyHAxqV4aPtBJtURGxHD9Wr2wVeG++mt1
------END RSA PRIVATE KEY-----

+ 0 - 59
conf/nginx/cert/www.xyzshops.cn.pem

@@ -1,59 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFljCCBH6gAwIBAgIQD31bNBE8c271eXQzDsEDfjANBgkqhkiG9w0BAQsFADBu
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMS0wKwYDVQQDEyRFbmNyeXB0aW9uIEV2ZXJ5d2hlcmUg
-RFYgVExTIENBIC0gRzEwHhcNMjAwNzE3MDAwMDAwWhcNMjEwNzE4MTIwMDAwWjAa
-MRgwFgYDVQQDEw93d3cueHl6c2hvcHMuY24wggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQCzHk8avV98L4Ekw3mFf0yOS+9onaQrGSJpkdwwMOhKWXMu2O9m
-HB37X5hkEnkSraWUHEis5MruiUHePQAUYrP6Tc/Hkatnm4Cihu/p58YtqunsFlYv
-k1S6fzBCMOB6BiVUhuc8zA66EtsV0FXQsVIQCzL3WzGhYMqxEqSH0GSt0QFolZum
-yFqTFstIz8OCopwb4aOu5FPlDlyXVyWU/xMo6OKs4R9DDv3gwlXEjGNCrE625HFU
-0tEgbanp1E8zSGkoe2kUgXeZjO72rvE5wb2MVZtvn+2wf9V9X6s/7fe1FSNo4os2
-FhoIpJlQ7YXoSPJAq9cjrmfokT11aS8W+3H7AgMBAAGjggKCMIICfjAfBgNVHSME
-GDAWgBRVdE+yck/1YLpQ0dfmUVyaAYca1zAdBgNVHQ4EFgQUPGiiZ/YH6U/eivGA
-6Nrq7Iwp784wJwYDVR0RBCAwHoIPd3d3Lnh5enNob3BzLmNuggt4eXpzaG9wcy5j
-bjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MEwGA1UdIARFMEMwNwYJYIZIAYb9bAECMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8v
-d3d3LmRpZ2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQIBMIGABggrBgEFBQcBAQR0MHIw
-JAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBKBggrBgEFBQcw
-AoY+aHR0cDovL2NhY2VydHMuZGlnaWNlcnQuY29tL0VuY3J5cHRpb25FdmVyeXdo
-ZXJlRFZUTFNDQS1HMS5jcnQwCQYDVR0TBAIwADCCAQYGCisGAQQB1nkCBAIEgfcE
-gfQA8gB3APZclC/RdzAiFFQYCDCUVo7jTRMZM7/fDC8gC8xO8WTjAAABc1pqDXwA
-AAQDAEgwRgIhAMyX1ko7auS/AnOXTTsvypvgUv6T6NYJpofIArVGe88YAiEAhG/2
-eVK2eVGFQcsH4isd4fZLCLHE8XxCHScED0QB/LgAdwBc3EOS/uarRUSxXprUVuYQ
-N/vV+kfcoXOUsl7m9scOygAAAXNaag2sAAAEAwBIMEYCIQDRgE5ddaSmrI5T6lnz
-5jljR0N6jU8c4YIgytTrwT9niwIhAJ/HD+1aGa2J0Hav8RODqzY8iE3nUwOoQrhd
-I7VIjvSsMA0GCSqGSIb3DQEBCwUAA4IBAQCZ+PUH8QQ38rt6fp/cKygtErVEPlx2
-BizB8UbJJ77w5H9TPM1k7/hHXXwd32hqFzIhQR4wLOG9bluB6BxJz3L1NrBLjjkR
-ePknyTRg8u6L6yFWsh2fSxgy4af8RgJaxRGJxBGjsAxg6wxOf9MoLupRLIDCBQbA
-QpMKtsX5MDvkagEVMvY69BROi4kABeBSeSnjZENo1aZho7trOFmTjfgb0OMuMOnm
-Wup63n0W8n/yQqgMIBhYkLF9Lc/JKXg2tRmDtfa7hvyI/at8sVoaO0RYZbNhfZp+
-rkn2LPAtGBKyCDKdlZCFDLdL17tEQGqHdRmf4YFn0XMqN7ZzHKIRn5aW
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIQAnmsRYvBskWr+YBTzSybsTANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0xNzExMjcxMjQ2MTBaFw0yNzExMjcxMjQ2MTBaMG4xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xLTArBgNVBAMTJEVuY3J5cHRpb24gRXZlcnl3aGVyZSBEViBUTFMgQ0EgLSBH
-MTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALPeP6wkab41dyQh6mKc
-oHqt3jRIxW5MDvf9QyiOR7VfFwK656es0UFiIb74N9pRntzF1UgYzDGu3ppZVMdo
-lbxhm6dWS9OK/lFehKNT0OYI9aqk6F+U7cA6jxSC+iDBPXwdF4rs3KRyp3aQn6pj
-pp1yr7IB6Y4zv72Ee/PlZ/6rK6InC6WpK0nPVOYR7n9iDuPe1E4IxUMBH/T33+3h
-yuH3dvfgiWUOUkjdpMbyxX+XNle5uEIiyBsi4IvbcTCh8ruifCIi5mDXkZrnMT8n
-wfYCV6v6kDdXkbgGRLKsR4pucbJtbKqIkUGxuZI2t7pfewKRc5nWecvDBZf3+p1M
-pA8CAwEAAaOCAU8wggFLMB0GA1UdDgQWBBRVdE+yck/1YLpQ0dfmUVyaAYca1zAf
-BgNVHSMEGDAWgBQD3lA1VtFMu2bwo+IbG8OXsj3RVTAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBIGA1UdEwEB/wQIMAYBAf8C
-AQAwNAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdp
-Y2VydC5jb20wQgYDVR0fBDswOTA3oDWgM4YxaHR0cDovL2NybDMuZGlnaWNlcnQu
-Y29tL0RpZ2lDZXJ0R2xvYmFsUm9vdENBLmNybDBMBgNVHSAERTBDMDcGCWCGSAGG
-/WwBAjAqMCgGCCsGAQUFBwIBFhxodHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BT
-MAgGBmeBDAECATANBgkqhkiG9w0BAQsFAAOCAQEAK3Gp6/aGq7aBZsxf/oQ+TD/B
-SwW3AU4ETK+GQf2kFzYZkby5SFrHdPomunx2HBzViUchGoofGgg7gHW0W3MlQAXW
-M0r5LUvStcr82QDWYNPaUy4taCQmyaJ+VB+6wxHstSigOlSNF2a6vg4rgexixeiV
-4YSB03Yqp2t3TeZHM9ESfkus74nQyW7pRGezj+TC44xCagCQQOzzNmzEAP2SnCrJ
-sNE2DpRVMnL8J6xBRdjmOsC3N6cQuKuRXbzByVBjCqAA8t1L0I+9wXJerLPyErjy
-rMKWaBFLmfK/AHNF4ZihwPGOc7w6UHczBZXH5RFzJNnww+WnKuTPI0HfnVH8lg==
------END CERTIFICATE-----

+ 0 - 25
conf/nginx/fastcgi.conf

@@ -1,25 +0,0 @@
-
-fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
-fastcgi_param  QUERY_STRING       $query_string;
-fastcgi_param  REQUEST_METHOD     $request_method;
-fastcgi_param  CONTENT_TYPE       $content_type;
-fastcgi_param  CONTENT_LENGTH     $content_length;
-
-fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-fastcgi_param  REQUEST_URI        $request_uri;
-fastcgi_param  DOCUMENT_URI       $document_uri;
-fastcgi_param  DOCUMENT_ROOT      $document_root;
-fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-fastcgi_param  HTTPS              $https if_not_empty;
-
-fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
-
-fastcgi_param  REMOTE_ADDR        $remote_addr;
-fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  SERVER_ADDR        $server_addr;
-fastcgi_param  SERVER_PORT        $server_port;
-fastcgi_param  SERVER_NAME        $server_name;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param  REDIRECT_STATUS    200;

+ 0 - 25
conf/nginx/fastcgi.conf.default

@@ -1,25 +0,0 @@
-
-fastcgi_param  SCRIPT_FILENAME    $document_root$fastcgi_script_name;
-fastcgi_param  QUERY_STRING       $query_string;
-fastcgi_param  REQUEST_METHOD     $request_method;
-fastcgi_param  CONTENT_TYPE       $content_type;
-fastcgi_param  CONTENT_LENGTH     $content_length;
-
-fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-fastcgi_param  REQUEST_URI        $request_uri;
-fastcgi_param  DOCUMENT_URI       $document_uri;
-fastcgi_param  DOCUMENT_ROOT      $document_root;
-fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-fastcgi_param  HTTPS              $https if_not_empty;
-
-fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
-
-fastcgi_param  REMOTE_ADDR        $remote_addr;
-fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  SERVER_ADDR        $server_addr;
-fastcgi_param  SERVER_PORT        $server_port;
-fastcgi_param  SERVER_NAME        $server_name;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param  REDIRECT_STATUS    200;

+ 0 - 24
conf/nginx/fastcgi_params

@@ -1,24 +0,0 @@
-
-fastcgi_param  QUERY_STRING       $query_string;
-fastcgi_param  REQUEST_METHOD     $request_method;
-fastcgi_param  CONTENT_TYPE       $content_type;
-fastcgi_param  CONTENT_LENGTH     $content_length;
-
-fastcgi_param  SCRIPT_NAME        $fastcgi_script_name;
-fastcgi_param  REQUEST_URI        $request_uri;
-fastcgi_param  DOCUMENT_URI       $document_uri;
-fastcgi_param  DOCUMENT_ROOT      $document_root;
-fastcgi_param  SERVER_PROTOCOL    $server_protocol;
-fastcgi_param  HTTPS              $https if_not_empty;
-
-fastcgi_param  GATEWAY_INTERFACE  CGI/1.1;
-fastcgi_param  SERVER_SOFTWARE    nginx/$nginx_version;
-
-fastcgi_param  REMOTE_ADDR        $remote_addr;
-fastcgi_param  REMOTE_PORT        $remote_port;
-fastcgi_param  SERVER_ADDR        $server_addr;
-fastcgi_param  SERVER_PORT        $server_port;
-fastcgi_param  SERVER_NAME        $server_name;
-
-# PHP only, required if PHP was built with --enable-force-cgi-redirect
-fastcgi_param  REDIRECT_STATUS    200;

+ 0 - 109
conf/nginx/koi-utf

@@ -1,109 +0,0 @@
-
-# This map is not a full koi8-r <> utf8 map: it does not contain
-# box-drawing and some other characters.  Besides this map contains
-# several koi8-u and Byelorussian letters which are not in koi8-r.
-# If you need a full and standard map, use contrib/unicode2nginx/koi-utf
-# map instead.
-
-charset_map  koi8-r  utf-8 {
-
-    80  E282AC ; # euro
-
-    95  E280A2 ; # bullet
-
-    9A  C2A0 ;   # &nbsp;
-
-    9E  C2B7 ;   # &middot;
-
-    A3  D191 ;   # small yo
-    A4  D194 ;   # small Ukrainian ye
-
-    A6  D196 ;   # small Ukrainian i
-    A7  D197 ;   # small Ukrainian yi
-
-    AD  D291 ;   # small Ukrainian soft g
-    AE  D19E ;   # small Byelorussian short u
-
-    B0  C2B0 ;   # &deg;
-
-    B3  D081 ;   # capital YO
-    B4  D084 ;   # capital Ukrainian YE
-
-    B6  D086 ;   # capital Ukrainian I
-    B7  D087 ;   # capital Ukrainian YI
-
-    B9  E28496 ; # numero sign
-
-    BD  D290 ;   # capital Ukrainian soft G
-    BE  D18E ;   # capital Byelorussian short U
-
-    BF  C2A9 ;   # (C)
-
-    C0  D18E ;   # small yu
-    C1  D0B0 ;   # small a
-    C2  D0B1 ;   # small b
-    C3  D186 ;   # small ts
-    C4  D0B4 ;   # small d
-    C5  D0B5 ;   # small ye
-    C6  D184 ;   # small f
-    C7  D0B3 ;   # small g
-    C8  D185 ;   # small kh
-    C9  D0B8 ;   # small i
-    CA  D0B9 ;   # small j
-    CB  D0BA ;   # small k
-    CC  D0BB ;   # small l
-    CD  D0BC ;   # small m
-    CE  D0BD ;   # small n
-    CF  D0BE ;   # small o
-
-    D0  D0BF ;   # small p
-    D1  D18F ;   # small ya
-    D2  D180 ;   # small r
-    D3  D181 ;   # small s
-    D4  D182 ;   # small t
-    D5  D183 ;   # small u
-    D6  D0B6 ;   # small zh
-    D7  D0B2 ;   # small v
-    D8  D18C ;   # small soft sign
-    D9  D18B ;   # small y
-    DA  D0B7 ;   # small z
-    DB  D188 ;   # small sh
-    DC  D18D ;   # small e
-    DD  D189 ;   # small shch
-    DE  D187 ;   # small ch
-    DF  D18A ;   # small hard sign
-
-    E0  D0AE ;   # capital YU
-    E1  D090 ;   # capital A
-    E2  D091 ;   # capital B
-    E3  D0A6 ;   # capital TS
-    E4  D094 ;   # capital D
-    E5  D095 ;   # capital YE
-    E6  D0A4 ;   # capital F
-    E7  D093 ;   # capital G
-    E8  D0A5 ;   # capital KH
-    E9  D098 ;   # capital I
-    EA  D099 ;   # capital J
-    EB  D09A ;   # capital K
-    EC  D09B ;   # capital L
-    ED  D09C ;   # capital M
-    EE  D09D ;   # capital N
-    EF  D09E ;   # capital O
-
-    F0  D09F ;   # capital P
-    F1  D0AF ;   # capital YA
-    F2  D0A0 ;   # capital R
-    F3  D0A1 ;   # capital S
-    F4  D0A2 ;   # capital T
-    F5  D0A3 ;   # capital U
-    F6  D096 ;   # capital ZH
-    F7  D092 ;   # capital V
-    F8  D0AC ;   # capital soft sign
-    F9  D0AB ;   # capital Y
-    FA  D097 ;   # capital Z
-    FB  D0A8 ;   # capital SH
-    FC  D0AD ;   # capital E
-    FD  D0A9 ;   # capital SHCH
-    FE  D0A7 ;   # capital CH
-    FF  D0AA ;   # capital hard sign
-}

+ 0 - 103
conf/nginx/koi-win

@@ -1,103 +0,0 @@
-
-charset_map  koi8-r  windows-1251 {
-
-    80  88 ; # euro
-
-    95  95 ; # bullet
-
-    9A  A0 ; # &nbsp;
-
-    9E  B7 ; # &middot;
-
-    A3  B8 ; # small yo
-    A4  BA ; # small Ukrainian ye
-
-    A6  B3 ; # small Ukrainian i
-    A7  BF ; # small Ukrainian yi
-
-    AD  B4 ; # small Ukrainian soft g
-    AE  A2 ; # small Byelorussian short u
-
-    B0  B0 ; # &deg;
-
-    B3  A8 ; # capital YO
-    B4  AA ; # capital Ukrainian YE
-
-    B6  B2 ; # capital Ukrainian I
-    B7  AF ; # capital Ukrainian YI
-
-    B9  B9 ; # numero sign
-
-    BD  A5 ; # capital Ukrainian soft G
-    BE  A1 ; # capital Byelorussian short U
-
-    BF  A9 ; # (C)
-
-    C0  FE ; # small yu
-    C1  E0 ; # small a
-    C2  E1 ; # small b
-    C3  F6 ; # small ts
-    C4  E4 ; # small d
-    C5  E5 ; # small ye
-    C6  F4 ; # small f
-    C7  E3 ; # small g
-    C8  F5 ; # small kh
-    C9  E8 ; # small i
-    CA  E9 ; # small j
-    CB  EA ; # small k
-    CC  EB ; # small l
-    CD  EC ; # small m
-    CE  ED ; # small n
-    CF  EE ; # small o
-
-    D0  EF ; # small p
-    D1  FF ; # small ya
-    D2  F0 ; # small r
-    D3  F1 ; # small s
-    D4  F2 ; # small t
-    D5  F3 ; # small u
-    D6  E6 ; # small zh
-    D7  E2 ; # small v
-    D8  FC ; # small soft sign
-    D9  FB ; # small y
-    DA  E7 ; # small z
-    DB  F8 ; # small sh
-    DC  FD ; # small e
-    DD  F9 ; # small shch
-    DE  F7 ; # small ch
-    DF  FA ; # small hard sign
-
-    E0  DE ; # capital YU
-    E1  C0 ; # capital A
-    E2  C1 ; # capital B
-    E3  D6 ; # capital TS
-    E4  C4 ; # capital D
-    E5  C5 ; # capital YE
-    E6  D4 ; # capital F
-    E7  C3 ; # capital G
-    E8  D5 ; # capital KH
-    E9  C8 ; # capital I
-    EA  C9 ; # capital J
-    EB  CA ; # capital K
-    EC  CB ; # capital L
-    ED  CC ; # capital M
-    EE  CD ; # capital N
-    EF  CE ; # capital O
-
-    F0  CF ; # capital P
-    F1  DF ; # capital YA
-    F2  D0 ; # capital R
-    F3  D1 ; # capital S
-    F4  D2 ; # capital T
-    F5  D3 ; # capital U
-    F6  C6 ; # capital ZH
-    F7  C2 ; # capital V
-    F8  DC ; # capital soft sign
-    F9  DB ; # capital Y
-    FA  C7 ; # capital Z
-    FB  D8 ; # capital SH
-    FC  DD ; # capital E
-    FD  D9 ; # capital SHCH
-    FE  D7 ; # capital CH
-    FF  DA ; # capital hard sign
-}

+ 0 - 27
conf/nginx/lrlzssl/214455844540210.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAmqpHA74SPQSjvja1EJpsHfNebq3MGUNNH1XSU7Kuf0aXqUtH
-AKab87czUjow2DqoY1qajiUPvK9r7Sy18AV7c1CqZFhurOE99kJiQVhyoCDzpyI5
-TpPpqwLxWc4TRRFKPwX6HPXKbXGjDKl+wq8sNExqFsEM3C+zVJrmf1S1lqoc+Rwq
-gH2qcaGfoytw/k/4Mzkj1FemrLIw7J27yApC1bDqsw9nURekw1J6e7VRpD2WS59Q
-Y0HXggF96/5x8TQoIO2JDZ4BJgXl4l47hhlHvwv1HXORarZfSlsv2m90RZQ8mKvf
-50+8mZWffbCOpQEbZcjB2nqmYF8rW3DnNGVLrwIDAQABAoIBAE+XnSAB6mTYRGOY
-x6kZrtXi7g/LBKNjjQa5JZnI9B+vdlC62nktREgxWQnRxF0iIpGuiKbpz6VsKQBO
-5/ny+EqpkmY9VAdHipl2JBY4rBRXoMu7wv37BF7rDsUGVchPU4QHUWUh3+BegGf9
-uav6daccQ+QdyL5vFbxOUpvoPeKgLTDd7afZ+mCljGPYMyfEt9EijHFMqbL+ple5
-JfFfjBlI3faQEyy1DWeyuyxGXMyhRzhURxB9af+ov7NCu9U1F90LXKu1dCCfUYdP
-qwamCtKtgbtg96oRIuTHjKili6D6Ry3A/fHFmuFQSLFkDqn8s/OADzzBAQSXHcq8
-0JDFVfECgYEA6FebKQco0g6tsMc4uNCV+6zfWfc5PrE7+bBr+kom1Cn90ZNWxZuC
-WClqTBk5+44go0e9H9NSk1nbiVZ+Cffc1phJfAfZXvlKP0gpF/9oLAXT0Z9MfQX3
-oGkphW0sugz8OvYw4d/sMJdH/RmdQRHo7K+/cAjM6kVK56l8ZCRAzmMCgYEAqmnj
-Bs3gzHbujRET5dvmpw5TXr8gqRyw0fGNbBf/DQTllMtEombWNomKZog9qYebXS4X
-TErbUIGTKIyOfGiFWta5M00iQcn38wEgdZ+cd0aRkVonHgaV3uHX6z+3Mfs3jysf
-9ADlDW/H7wsIPExPOtbbpijRFAnFiDGUHeoCGUUCgYEA2T8pHrjKC3ecIuJ1ACJR
-S01+XmHSzfLs0HCM1jBFlDZbVX3+MbFRtFutP9CKrdNcYzAt/7cZzBvGMemE2o8/
-mAw3EdlJAAv6x6cSfZTcc+VTBPt9ip1syDnskAzgOGrx4bPXSyyUbW7W6irsJi63
-66/9QaWI7TizbF/GpuBbFF8CgYBYJiWVI3Gg0fRba/YK9FC/IR3m6J6QW5LrRjON
-Mmxv45SN/wclqmQsGcFJgDfFNawb6veKMz52yk/ArdQWbkpszp1F+CQ8O6jSPkb4
-EPPyjsJFmYiac3WasN/rhC3S4MvAduI0aTISXTviXqaH6kEhgnpj3MEpyFQxOtQP
-FTi4sQKBgB/RROc9+U4cLg5PT3HQFAmmWKEy5Ipi9X56fu3HGZ1J9MTCTkiT5FI8
-nrua5nIkHQu9sFVMy9eIxyzlgSyqWGkuAddP8U580xwTKOrAzsGj2E5rMNpJScfU
-sglwwbRQLGw1IPi+OOl+ypwifRmVPuc7f6mwabJs92YtndbEkUxy
------END RSA PRIVATE KEY-----

+ 0 - 67
conf/nginx/lrlzssl/214455844540210.pem

@@ -1,67 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHAjCCBeqgAwIBAgIQBZtCZ5l71ytxHRvdITrA1DANBgkqhkiG9w0BAQsFADBe
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMR0wGwYDVQQDExRHZW9UcnVzdCBSU0EgQ0EgMjAxODAe
-Fw0xODAyMDIwMDAwMDBaFw0yMTAyMDExMjAwMDBaMHsxCzAJBgNVBAYTAkNOMRIw
-EAYDVQQHDAnkuIrmtbfluIIxNjA0BgNVBAoMLeS4iua1t+S4veS6uuS4veWmhuWM
-luWmhuWTgeiCoeS7veaciemZkOWFrOWPuDELMAkGA1UECxMCSVQxEzARBgNVBAMM
-CioubHJsei5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCaqkcD
-vhI9BKO+NrUQmmwd815urcwZQ00fVdJTsq5/RpepS0cAppvztzNSOjDYOqhjWpqO
-JQ+8r2vtLLXwBXtzUKpkWG6s4T32QmJBWHKgIPOnIjlOk+mrAvFZzhNFEUo/Bfoc
-9cptcaMMqX7Cryw0TGoWwQzcL7NUmuZ/VLWWqhz5HCqAfapxoZ+jK3D+T/gzOSPU
-V6assjDsnbvICkLVsOqzD2dRF6TDUnp7tVGkPZZLn1BjQdeCAX3r/nHxNCgg7YkN
-ngEmBeXiXjuGGUe/C/Udc5Fqtl9KWy/ab3RFlDyYq9/nT7yZlZ99sI6lARtlyMHa
-eqZgXytbcOc0ZUuvAgMBAAGjggOdMIIDmTAfBgNVHSMEGDAWgBSQWP+wnHWoUVR3
-se3yo0MWOJ5sxTAdBgNVHQ4EFgQUYDrBCOL5t9tSCboEXLcWltJhYwswHwYDVR0R
-BBgwFoIKKi5scmx6LmNvbYIIbHJsei5jb20wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjA+BgNVHR8ENzA1MDOgMaAvhi1odHRw
-Oi8vY2RwLmdlb3RydXN0LmNvbS9HZW9UcnVzdFJTQUNBMjAxOC5jcmwwTAYDVR0g
-BEUwQzA3BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGln
-aWNlcnQuY29tL0NQUzAIBgZngQwBAgIwdQYIKwYBBQUHAQEEaTBnMCYGCCsGAQUF
-BzABhhpodHRwOi8vc3RhdHVzLmdlb3RydXN0LmNvbTA9BggrBgEFBQcwAoYxaHR0
-cDovL2NhY2VydHMuZ2VvdHJ1c3QuY29tL0dlb1RydXN0UlNBQ0EyMDE4LmNydDAJ
-BgNVHRMEAjAAMIIB9QYKKwYBBAHWeQIEAgSCAeUEggHhAd8AdwCkuQmQtBhYFIe7
-E6LMZ3AKPDWYBPkb37jjd80OyA3cEAAAAWFVS7MIAAAEAwBIMEYCIQCEstmyyu8A
-h+TaSzVpfBo0Y1zIR2vz4uNBR9hCZjXpZgIhAMCB8ZG2xC/9ocPUb2Mqw2S9PArJ
-08M3Mi1GyQZWcpXVAHYAh3W/51l8+IxDmV+9827/Vo1HVjb/SrVgwbTq/16ggw8A
-AAFhVUuztwAABAMARzBFAiEAodMtu0ETxA7twPrR9weX8wPSFg62piyZOWncuM1P
-tVMCIGsl+rTTObtAg2n+7hegG5oMuDhLOCzaGGQRLDYVCOnVAHUA7ku9t3XOYLrh
-Qmkfq+GeZqMPfl+wctiDAMR7iXqo/csAAAFhVUu2EAAABAMARjBEAiBeJCh4tIHR
-kPzGvLUArrmqFi3Tuuceh9cP0cZrqg2sNAIgWfeS9oBzV5WHkPIfG6EzIXba1aHc
-dypJULrUkn/c1o8AdQBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZEwAA
-AWFVS7XpAAAEAwBGMEQCIEKX8A81ZaZYJWhIpu/A0WFV7tzcMvHdlmKHjnkCe3aE
-AiBQQ37XBuJo7PCPug0GjjxN/9QNmii8ProYjhlIfYYHozANBgkqhkiG9w0BAQsF
-AAOCAQEATsCM1Vi2mBWhXgsTUXOmoVS6WHiIkaCJrrzpaJvx8M/3hHPXYs2hXJVK
-MHnB0Nm8olasxFWC+HajoaSUz1ngI4IA0idXQHJ0BC5aIC86LX10q3xZVsPqQzdJ
-yEaybjVirbA7NKKCwqesjHW+1lmxcXSBJzxD042AwdjkMIhJQ+Q13IVITz8YvhOZ
-apdheiVOUMH1vs+/CQzBVUA3GMpaZ5R1mrrlOTSLnQO2AXLupmovoQQxcDeFcjCM
-8RTuESfUBolqKQ/SBzj8zLoAH7xNA7pAiFlUFkAzgQJ3MGC7ydxgK25x6huwxYoU
-u1SPcYpnHcDe6dvsvsIotIVhwf861Q==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIEizCCA3OgAwIBAgIQBUb+GCP34ZQdo5/OFMRhczANBgkqhkiG9w0BAQsFADBh
-MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
-d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
-QTAeFw0xNzExMDYxMjIzNDVaFw0yNzExMDYxMjIzNDVaMF4xCzAJBgNVBAYTAlVT
-MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5kaWdpY2VydC5j
-b20xHTAbBgNVBAMTFEdlb1RydXN0IFJTQSBDQSAyMDE4MIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAv4rRY03hGOqHXegWPI9/tr6HFzekDPgxP59FVEAh
-150Hm8oDI0q9m+2FAmM/n4W57Cjv8oYi2/hNVEHFtEJ/zzMXAQ6CkFLTxzSkwaEB
-2jKgQK0fWeQz/KDDlqxobNPomXOMJhB3y7c/OTLo0lko7geG4gk7hfiqafapa59Y
-rXLIW4dmrgjgdPstU0Nigz2PhUwRl9we/FAwuIMIMl5cXMThdSBK66XWdS3cLX18
-4ND+fHWhTkAChJrZDVouoKzzNYoq6tZaWmyOLKv23v14RyZ5eqoi6qnmcRID0/i6
-U9J5nL1krPYbY7tNjzgC+PBXXcWqJVoMXcUw/iBTGWzpwwIDAQABo4IBQDCCATww
-HQYDVR0OBBYEFJBY/7CcdahRVHex7fKjQxY4nmzFMB8GA1UdIwQYMBaAFAPeUDVW
-0Uy7ZvCj4hsbw5eyPdFVMA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwEgYDVR0TAQH/BAgwBgEB/wIBADA0BggrBgEFBQcBAQQo
-MCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmRpZ2ljZXJ0LmNvbTBCBgNVHR8E
-OzA5MDegNaAzhjFodHRwOi8vY3JsMy5kaWdpY2VydC5jb20vRGlnaUNlcnRHbG9i
-YWxSb290Q0EuY3JsMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIBFhxo
-dHRwczovL3d3dy5kaWdpY2VydC5jb20vQ1BTMA0GCSqGSIb3DQEBCwUAA4IBAQAw
-8YdVPYQI/C5earp80s3VLOO+AtpdiXft9OlWwJLwKlUtRfccKj8QW/Pp4b7h6QAl
-ufejwQMb455OjpIbCZVS+awY/R8pAYsXCnM09GcSVe4ivMswyoCZP/vPEn/LPRhH
-hdgUPk8MlD979RGoUWz7qGAwqJChi28uRds3thx+vRZZIbEyZ62No0tJPzsSGSz8
-nQ//jP8BIwrzBAUH5WcBAbmvgWfrKcuv+PyGPqRcc4T55TlzrBnzAzZ3oClo9fTv
-O9PuiHMKrC6V6mgi0s2sa/gbXlPCD9Z24XUMxJElwIVTDuKB0Q4YMMlnpN/QChJ4
-B0AFsQ+DU0NCO+f78Xf7
------END CERTIFICATE-----

+ 0 - 89
conf/nginx/mime.types

@@ -1,89 +0,0 @@
-
-types {
-    text/html                             html htm shtml;
-    text/css                              css;
-    text/xml                              xml;
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
-    application/javascript                js;
-    application/atom+xml                  atom;
-    application/rss+xml                   rss;
-
-    text/mathml                           mml;
-    text/plain                            txt;
-    text/vnd.sun.j2me.app-descriptor      jad;
-    text/vnd.wap.wml                      wml;
-    text/x-component                      htc;
-
-    image/png                             png;
-    image/tiff                            tif tiff;
-    image/vnd.wap.wbmp                    wbmp;
-    image/x-icon                          ico;
-    image/x-jng                           jng;
-    image/x-ms-bmp                        bmp;
-    image/svg+xml                         svg svgz;
-    image/webp                            webp;
-
-    application/font-woff                 woff;
-    application/java-archive              jar war ear;
-    application/json                      json;
-    application/mac-binhex40              hqx;
-    application/msword                    doc;
-    application/pdf                       pdf;
-    application/postscript                ps eps ai;
-    application/rtf                       rtf;
-    application/vnd.apple.mpegurl         m3u8;
-    application/vnd.ms-excel              xls;
-    application/vnd.ms-fontobject         eot;
-    application/vnd.ms-powerpoint         ppt;
-    application/vnd.wap.wmlc              wmlc;
-    application/vnd.google-earth.kml+xml  kml;
-    application/vnd.google-earth.kmz      kmz;
-    application/x-7z-compressed           7z;
-    application/x-cocoa                   cco;
-    application/x-java-archive-diff       jardiff;
-    application/x-java-jnlp-file          jnlp;
-    application/x-makeself                run;
-    application/x-perl                    pl pm;
-    application/x-pilot                   prc pdb;
-    application/x-rar-compressed          rar;
-    application/x-redhat-package-manager  rpm;
-    application/x-sea                     sea;
-    application/x-shockwave-flash         swf;
-    application/x-stuffit                 sit;
-    application/x-tcl                     tcl tk;
-    application/x-x509-ca-cert            der pem crt;
-    application/x-xpinstall               xpi;
-    application/xhtml+xml                 xhtml;
-    application/xspf+xml                  xspf;
-    application/zip                       zip;
-
-    application/octet-stream              bin exe dll;
-    application/octet-stream              deb;
-    application/octet-stream              dmg;
-    application/octet-stream              iso img;
-    application/octet-stream              msi msp msm;
-
-    application/vnd.openxmlformats-officedocument.wordprocessingml.document    docx;
-    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet          xlsx;
-    application/vnd.openxmlformats-officedocument.presentationml.presentation  pptx;
-
-    audio/midi                            mid midi kar;
-    audio/mpeg                            mp3;
-    audio/ogg                             ogg;
-    audio/x-m4a                           m4a;
-    audio/x-realaudio                     ra;
-
-    video/3gpp                            3gpp 3gp;
-    video/mp2t                            ts;
-    video/mp4                             mp4;
-    video/mpeg                            mpeg mpg;
-    video/quicktime                       mov;
-    video/webm                            webm;
-    video/x-flv                           flv;
-    video/x-m4v                           m4v;
-    video/x-mng                           mng;
-    video/x-ms-asf                        asx asf;
-    video/x-ms-wmv                        wmv;
-    video/x-msvideo                       avi;
-}

+ 1 - 1
config/cache.php

@@ -17,7 +17,7 @@ return [
     // 驱动方式
     'type'   => 'redis',
     // 缓存保存目录
-    'path'   => 'tcp://lredis:6379',
+    'path'   => 'tcp://redis:6379',
     // 缓存前缀
     'prefix' => '',
     // 缓存有效期 0表示永久缓存

+ 0 - 53
docker-compose.yml

@@ -1,53 +0,0 @@
-version: "3.7"
-
-services:
-  lnginx:
-    image: nginx:alpine
-    ports:
-      - "80:80"
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD/conf/nginx/nginx-prod-http.conf:/etc/nginx/nginx.conf:ro
-      - $PWD:/var/www/html
-    links:
-      - lfpm
-    container_name: "logic-nginx"
-    command: [nginx,'-g','daemon off;']
-
-  lredis:
-    image: redis:alpine
-    ports:
-      - "6380:6379"
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD/conf/redis/6379.conf:/etc/redis/redis.conf
-      - $PWD/conf/redis:/var/redis
-    container_name: "logic-redis"
-    command: [redis-server,"/etc/redis/redis.conf"]
-
-  lfpm:
-    image: php-fpm:alpine
-    volumes:
-      - $PWD/conf/etc/localtime:/etc/localtime:ro
-      - $PWD:/var/www/html
-      - $PWD/conf/php-fpm/php.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: "logic-web"
-    command: [docker-php-fpm-start]
-    links:
-      - lredis
-    depends_on:
-      - lredis
-
-  lphp:
-    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:
-      - lredis
-    container_name: "logic-php"
-    depends_on:
-      - "lredis"

+ 13 - 0
docker/api/compose.env

@@ -0,0 +1,13 @@
+#ReadMine Nigix 端口
+ACCNGINX_PORT=80
+#商城部署到容器的根目录
+ROOT_PATH=/var/www/html
+ADMIN_PATH=/mnt/admin
+#商城部署到容器的根目录
+REDIS_PATH=/mnt/redisdata
+
+#docker 网络名称
+DOCKER_NET_NAME=api_network
+#docker 网络名称
+ACCESS_RUNTIME_PATH=/mnt/runtime/apisongcang
+ACCESS_QUEUELOG_PATH=/mnt/runtime/apisongcang

docker-compose-mac.yml → docker/api/docker-compose-mac.yml


docker-compose-test.yml → docker/api/docker-compose-test.yml


docker-compose-windows.yml → docker/api/docker-compose-windows.yml


+ 56 - 0
docker/api/docker-compose.yml

@@ -0,0 +1,56 @@
+version: "3.7"
+
+services:
+  nginx:
+    image: nginx:alpine
+    ports:
+      - ${ACCNGINX_PORT}:80
+    volumes:
+      - ../../:${ROOT_PATH}
+      - ${ADMIN_PATH}:${ROOT_PATH}/admin
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/nginx/api.conf:/etc/nginx/nginx.conf:ro
+    container_name: "api-nginx"
+    command: [ nginx,'-g','daemon off;' ]
+    networks:
+      - ${DOCKER_NET_NAME}
+
+  redis:
+    image: redis:alpine
+    ports:
+      - 6380:6379
+    volumes:
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/redis/6379.conf:/etc/redis/redis.conf
+      - ../conf/redis:/var/redis
+      - ${REDIS_PATH}:/data
+    container_name: "api-redis"
+    command: [ redis-server,"/etc/redis/redis.conf" ]
+    networks:
+      - ${DOCKER_NET_NAME}
+
+  web:
+    image: php-fpm:alpine
+    volumes:
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../../:/var/www/html
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
+    container_name: "api-web"
+    command: [php-fpm]
+    networks:
+      - ${DOCKER_NET_NAME}
+
+  cli:
+    image: php-zts:7.3.18
+    volumes:
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - ..:/var/www/html
+    container_name: "api-php"
+    networks:
+      - ${DOCKER_NET_NAME}
+
+networks:
+  api_network:
+    external: true

conf/crontab/debug-root → docker/conf/crontab/debug-root


conf/crontab/docker-start → docker/conf/crontab/docker-start


conf/crontab/root → docker/conf/crontab/root


conf/etc/hosts → docker/conf/etc/hosts


conf/etc/localtime → docker/conf/etc/localtime


+ 1 - 0
conf/nginx/nginx-prod-http.conf

@@ -60,6 +60,7 @@ http
             include        fastcgi_params;
         }
     }
+
     server
     {
         listen       80;

conf/nginx/nginx-debug-http.conf → docker/conf/nginx/nginx-debug-http.conf


conf/nginx/nginx-prod-https.conf → docker/conf/nginx/nginx-prod-https.conf


conf/nginx/nginx-test-http.conf → docker/conf/nginx/nginx-test-http.conf


conf/nginx/nginx.conf.default → docker/conf/nginx/nginx.conf.default


conf/nginx/scgi_params → docker/conf/nginx/scgi_params


conf/nginx/uwsgi_params → docker/conf/nginx/uwsgi_params


conf/nginx/win-utf → docker/conf/nginx/win-utf


conf/php-fpm/docker-php-fpm-start → docker/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://lredis:6379"
+session.save_path = "tcp://redis:6379"
 
 ;session.save_handler = files
 

conf/php-fpm/php-fpm.conf → docker/conf/php-fpm/php-fpm.conf


+ 3 - 3
conf/php-fpm/php.ini

@@ -103,7 +103,7 @@
 ;   Development Value: On
 ;   Production Value: Off
 
-; member_info
+; error_reporting
 ;   Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
 ;   Development Value: E_ALL
 ;   Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
@@ -457,7 +457,7 @@ memory_limit = 128M
 ; Development Value: E_ALL
 ; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT
 ; http://php.net/error-reporting
-error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT & ~E_NOTICE
+error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT
 
 ; This directive controls whether or not and where PHP will output errors,
 ; notices and warnings too. Error output is very useful during development, but
@@ -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://lredis:6379"
+session.save_path = "tcp://redis:6379"
 
 ;session.save_handler = files
 

conf/php/docker-php-spwan-start → docker/conf/php/docker-php-spwan-start


conf/php/docker-php-start → docker/conf/php/docker-php-start


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

@@ -1325,7 +1325,7 @@ bcmath.scale = 0
 ; http://php.net/session.save-handler
 ;session.save_handler = file
 session.save_handler = redis
-session.save_path = tcp://lredis:6379
+session.save_path = tcp://redis:6379
 
 ; Argument passed to save_handler.  In the case of files, this is the path
 ; where data files are stored. Note: Windows users have to change this

+ 1 - 1
conf/php/php.ini

@@ -1325,7 +1325,7 @@ bcmath.scale = 0
 ; http://php.net/session.save-handler
 ;session.save_handler = file
 session.save_handler = redis
-session.save_path = tcp://lredis:6379
+session.save_path = tcp://redis:6379
 
 ; Argument passed to save_handler.  In the case of files, this is the path
 ; where data files are stored. Note: Windows users have to change this

conf/queue/docker-queue-start → docker/conf/queue/docker-queue-start


conf/redis/6379.conf → docker/conf/redis/6379.conf


conf/searcher/docker-search-start → docker/conf/searcher/docker-search-start


+ 1 - 1
thinkphp/library/think/cache/driver/Redis.php

@@ -23,7 +23,7 @@ use think\cache\Driver;
 class Redis extends Driver
 {
     protected $options = [
-        'host'       => 'tcp://lredis',
+        'host'       => 'tcp://redis',
         'port'       => 6379,
         'password'   => '',
         'select'     => 0,

+ 1 - 1
thinkphp/library/think/session/driver/Redis.php

@@ -19,7 +19,7 @@ class Redis implements SessionHandlerInterface
     /** @var \Redis */
     protected $handler = null;
     protected $config  = [
-        'host'         => 'tcp://lredis', // redis主机
+        'host'         => 'tcp://redis', // redis主机
         'port'         => 6379, // redis端口
         'password'     => '', // 密码
         'select'       => 0, // 操作库