dev

docker/compose/xyzt/acc/docker-compose.yml

@@ -0,0 +1,67 @@
+version: "3.7"
+
+services:
+  nginxsrv:
+    image: nginx:alpine
+    ports:
+      - "8080:80"
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
+      - /nfs/upload:/var/www/html/data/upload
+      - /nfs/tmerchant:/var/www/html/merchant
+    container_name: "panda-nginx"
+    command: [nginx,'-g','daemon off;']
+    extra_hosts:
+      - "docker.hostip:172.17.0.1"
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
+
+  mobilesrv:
+    image: php-zts:7.3.18
+    ports:
+      - "9100:9100"
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+      - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
+    container_name: "panda-mobile"
+    command: ['docker-spwan-start']
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
+
+  phpcli:
+    image: php-zts-debug:7.3.18
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+    container_name: "panda-php"
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
+
+  phpswoole:
+    image: php-swool-redis:latest
+    volumes:
+      - ../../../../:/var/www/html
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
+      - /nfs/upload:/var/www/html/data/upload
+      - /mnt/testlog:/var/www/html/data/log
+    container_name: "panda-swoole"
+    deploy:
+      resources:
+        limits:
+          cpus: '8'

docker/compose/xyzt/arw/docker-compose.yml

@@ -1,50 +1,6 @@
 version: "3.7"
 
 services:
-  nginxsrv:
-    image: nginx:alpine
-    ports:
-      - "8080:80"
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - /nfs/upload:/var/www/html/data/upload
-      - /nfs/tmerchant:/var/www/html/merchant
-    container_name: "panda-nginx"
-    command: [nginx,'-g','daemon off;']
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-
-  mobilesrv:
-    image: php-zts:7.3.18
-    ports:
-      - "9100:9100"
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /nfs/upload:/var/www/html/data/upload
-      - /mnt/testlog:/var/www/html/data/log
-      - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
-    container_name: "panda-mobile"
-    command: ['docker-spwan-start']
-
-#  cordsrv:
-#    image: php-swool-hook:7.3.18
-#    volumes:
-#      - ../../../../:/var/www/html
-#      - ../conf/etc/localtime:/etc/localtime:ro
-#      - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
-#      - /nfs/upload:/var/www/html/data/upload
-#      - /mnt/testlog:/var/www/html/data/log
-#    container_name: "panda-codispatcher"
-#    command: [php,"/var/www/html/rdispatcher/coall.php","1"]
-#    deploy:
-#      resources:
-#        limits:
-#          cpus: '8'
-
   cordsrv:
     image: php-swool-redis:latest
     volumes:
@@ -54,7 +10,7 @@ services:
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-codispatcher"
-    command: [php,"/var/www/html/rdispatcher/codispatcher.php","16"]
+    command: [php,"/var/www/html/rdispatcher/codispatcher.php","32"]
     deploy:
       resources:
         limits:
@@ -91,6 +47,10 @@ services:
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/testlog:/var/www/html/data/log
     container_name: "panda-php"
+    deploy:
+      resources:
+        limits:
+          cpus: '8'
 
   phpswoole:
     image: php-swool-redis:latest
@@ -100,4 +60,8 @@ services:
       - ../conf/php/php-swoole.ini:/usr/local/etc/php/php.ini
       - /nfs/upload:/var/www/html/data/upload
       - /mnt/testlog:/var/www/html/data/log
-    container_name: "panda-swoole"
+    container_name: "panda-swoole"
+    deploy:
+      resources:
+        limits:
+          cpus: '8'

helper/PHPExcel/PHPExcel/Calculation/Functions.php

@@ -573,7 +573,6 @@ class PHPExcel_Calculation_Functions {
 				return 4;
 		} elseif(is_array($value)) {
 				return 64;
-				break;
 		} elseif(is_string($value)) {
 			//	Errors
 			if ((strlen($value) > 0) && ($value{0} == '#')) {