dev

crontab/control/minutes.php

@@ -457,6 +457,24 @@ class minutesControl extends BaseCronControl
         }
     }
 
+    //更新统计业务数据
+    public function statOp()
+    {
+        Log::short_name('stat');
+        while (true)
+        {
+            try {
+                $this->_update_earlist_send();
+                $this->_calc_arrears();
+
+            } catch (Exception $ex) {
+                Log::record($ex->getMessage(), Log::ERR);
+            }
+
+            sleep(1);
+        }
+    }
+
     private function _update_earlist_send()
     {
         //查找最早的充值中的订单时间

docker/compose/docker-compose.networks.yml

@@ -0,0 +1,3 @@
+networks:
+  homecuda_network:
+    external: true

docker/compose/homecuda/ReadMe.MD

@@ -0,0 +1,9 @@
+## macc
+对应模块mobile,老版本的处理充值。
+
+## racc
+对应模块racc,新的独立版本的处理充值。
+
+
+# Port映射表 
+acc-> 8100:80

docker/compose/homecuda/acc/docker-compose.yml

@@ -1,29 +0,0 @@
-version: "3.7"
-
-services:
-  nginx:
-    image: nginx:alpine
-    ports:
-      - 8100:80
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/merchant:/var/www/html/merchant
-    container_name: "panda-nginx"
-    command: [nginx,'-g','daemon off;']
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-
-  mobile:
-    image: php-zts:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-      - ../conf/php/mobile-spwan-start:/usr/local/bin/docker-spwan-start
-    container_name: "panda-mobile"
-    command: ['docker-spwan-start']

docker/compose/homecuda/admin/docker-compose.yml

@@ -1,32 +1,51 @@
-version: "3.7"
+version: "3.9"
+
+include:
+  - ../../docker-compose.networks.yml
 
 services:
-  mchsrv:
-    image: php-zts:7.3.18
+  nginx:
+    image: nginx:alpine
     ports:
-      - "9102:9102"
+      - ${ADMINGINX_PORT}:80
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/nginx/admin.conf:/etc/nginx/nginx.conf:ro
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${MERCHANT_PATH}:${SHOP_ROOT_PATH}/merchant
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-adnginx"
+    command: [ nginx,'-g','daemon off;' ]
+    extra_hosts:
+      - docker.hostip:172.17.0.1
+    networks:
+      - ${DOCKER_NET_NAME}
+
+  mch:
+    image: php-zts:7.3.18
+    volumes:
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/php/mch-spwan-start:/usr/local/bin/docker-spwan-start
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-merchant"
-    command: [docker-spwan-start]
+      - ../conf/php/spwan-start:/usr/local/bin/spwan-start
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: '${CONTAINER_PREFIX}-admch'
+    command: [ spwan-start,"/mchsrv/mchsrv_run.php","mchsrv.log" ]
+    networks:
+      - ${DOCKER_NET_NAME}
 
-  websrv:
+  web:
     image: php-fpm:alpine
-    ports:
-      - 9000:9000
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
       - ../conf/php-fpm/php-fpm.conf:/usr/local/etc/php-fpm.conf
-      - /mnt/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-web"
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: '${CONTAINER_PREFIX}-adweb'
     command: [php-fpm]
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
+    networks:
+      - ${DOCKER_NET_NAME}

docker/compose/homecuda/admin_vendor/docker-compose.yml

@@ -1,18 +0,0 @@
-version: "3.7"
-
-services:
-  nginx:
-    image: nginx:alpine
-    ports:
-      - "8080:80"
-    volumes:
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/nginx/nginx_vendor.conf:/etc/nginx/nginx.conf:ro
-    container_name: "yl-nginx"
-    command: [nginx,'-g','daemon off;']
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
-    deploy:
-      resources:
-        limits:
-          cpus: '8'

docker/compose/homecuda/cli/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.9"
 
 services:
   phpcli:
@@ -7,7 +7,7 @@ services:
       - /mnt/xyzshop:/var/www/html
       - /mnt/xyzshop/docker/compose/homecuda/conf/etc/localtime:/etc/localtime:ro
       - /mnt/xyzshop/docker/compose/homecuda/conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/upload:/var/www/html/data/upload
+      - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
     container_name: "panda-php"
 
@@ -20,29 +20,4 @@ services:
       - /mnt/upload:/var/www/html/data/upload
       - /mnt/shoplog:/var/www/html/data/log
       - ../conf/php/vender-init:/usr/local/bin/vender-init
-    container_name: "panda-swoole"
-
-  vender:
-    image: php-zts:7.3.18
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/vender-init:/usr/local/bin/vender-init
-      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-vender"
-    command: ['vender-init']
-
-  pythoncli:
-    image: pycpu:3.7.10
-#    ports:
-#      - 5000:5000
-    volumes:
-      - /mnt/xyzshop/docker/compose/homecuda/conf/etc/localtime:/etc/localtime:ro
-      - /mnt/xyzshop:/var/www/html
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-python"
-    extra_hosts:
-      - "docker.hostip:172.17.0.1"
+    container_name: "panda-swoole"

docker/compose/homecuda/compose.env

@@ -0,0 +1,24 @@
+#Mobile接入层Nigix端口
+MACCNGINX_PORT=8100
+#Refill接入层Nginx端口
+RACCNGINX_PORT=8200
+#Admin后台Nginx端口
+ADMINGINX_PORT=8300
+#ReadMine Nigix 端口
+RMINE_NGINX_PORT=8080
+#主站上传文件路径
+SHOP_UPLOAD_PATH=/mnt/upload
+#日志路径
+SHOP_LOG_PATH=/mnt/shoplog
+#机构后台页面路径
+MERCHANT_PATH=/mnt/merchant
+#大数据存储路径
+STDATA_PATH=/mnt/stdata
+#docker 网络名称
+DOCKER_NET_NAME=homecuda_network
+#docker 容器名称前缀
+CONTAINER_PREFIX=shome
+#商城部署到容器的根目录
+SHOP_ROOT_PATH=/var/www/html
+#系统REDIS端口
+SHOP_REDIS_PORT=6379

docker/compose/homecuda/conf/crontab/master_root

@@ -0,0 +1,17 @@
+# do daily/weekly/monthly maintenance
+# min	hour	day	month	weekday	command
+#*/15	*	*	*	*	run-parts /etc/periodic/15min
+#0	*	*	*	*	run-parts /etc/periodic/hourly
+#0	2	*	*	*	run-parts /etc/periodic/daily
+#0	3	*	*	6	run-parts /etc/periodic/weekly
+#0	5	1	*	*	run-parts /etc/periodic/monthly
+#0   3   *   *   *   php /var/www/html/crontab/index.php date index
+#0   9   *   *   *   php /var/www/html/crontab/index.php date nine_clock
+#0   10  *   *   *   php /var/www/html/crontab/index.php date ten_clock
+*    *   *   *   *   php /var/www/html/crontab/index.php minutes index
+#0   10-20/1 *   *   *   php /var/www/html/crontab/index.php hour index
+#0   3   1   */1 *   php /var/www/html/crontab/index.php month index
+*    *   *   *   *   echo "test" >> /var/test.log
+
+#0   1   *   *   *   php /var/www/html/crontab/index.php date _order_stats
+

docker/compose/homecuda/conf/nginx/admin.conf

@@ -0,0 +1,124 @@
+user nginx;
+worker_processes  16;
+error_log   /var/www/html/data/log/anginx.log  debug;
+worker_rlimit_nofile 10240;
+
+events {
+    worker_connections  8192;
+    multi_accept on;
+    use epoll;
+}
+
+http 
+{
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    underscores_in_headers on;
+    client_max_body_size 32M;
+    client_body_buffer_size 1024K;
+
+    tcp_nopush on;
+
+    sendfile            on;
+    keepalive_timeout   300;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    server 
+    {
+    	listen       80;
+        set  $folder_name /var/www/html;
+        server_name 192.168.3.104;
+        root $folder_name;
+        index index.html index.php; 
+
+    	proxy_connect_timeout 500s;
+        proxy_read_timeout 500s;
+        proxy_send_timeout 500s;
+
+        fastcgi_connect_timeout 75;
+        fastcgi_read_timeout 600;   
+        fastcgi_send_timeout 600;
+        fastcgi_buffer_size  32K;
+        fastcgi_buffers      32 32K;
+
+        set_real_ip_from 100.64.0.0/10;
+        real_ip_header X-Forwarded-For;
+
+        charset utf-8;
+
+        location /data/log {
+            deny all;
+            return 403;
+        }
+        location / {
+            index  index.html index.htm index.php;
+        }
+
+        location ~ /mobile {
+            deny all;
+            return 403;
+        }
+
+        location ~ /racc {
+            deny all;
+            return 403;
+        }
+
+        location /mshop {
+            root $folder_name;
+            autoindex on;        
+            index  index.html index.htm index.php;
+	        try_files $uri $uri/ /mshop/index.html;
+        }
+
+        location /plot {
+            root $folder_name;
+            proxy_pass         http://docker.hostip:5000;
+            proxy_redirect     off;
+
+            proxy_set_header   Host                 $host;
+            proxy_set_header   X-Real-IP            $remote_addr;
+            proxy_set_header   X-Forwarded-For      $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Proto    $scheme;
+        }
+
+        location /merchant {
+            root $folder_name;
+            autoindex on;
+            index  index.html index.htm index.php;
+            try_files $uri $uri/ /merchant/index.html;
+        }
+
+        location ~ /mchsrv/[/\w]+\.php$ {
+            root           $folder_name;
+            fastcgi_pass   mch:9102;
+            fastcgi_index  index.php;
+            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
+            fastcgi_param SIGN $http_sign;
+            include fastcgi_params;
+        }
+
+        location ~ \.php$ {
+	        add_header Cache-Control no-store;
+            root           $folder_name;
+            fastcgi_pass   web:9000;
+            fastcgi_index  index.php;
+            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
+            fastcgi_buffer_size  1024K;
+            fastcgi_buffers      32 1024K;
+            proxy_buffer_size  128k;     #设置缓冲区的大小和数量
+            proxy_buffers 100  128k;     #
+            proxy_read_timeout 900s;
+            proxy_send_timeout 900s;
+            fastcgi_read_timeout 900;
+            fastcgi_send_timeout 900;
+            keepalive_timeout    900;
+
+            include        fastcgi_params;
+        }
+    }
+}

docker/compose/homecuda/conf/nginx/macc.conf

@@ -0,0 +1,67 @@
+user nginx;
+worker_processes  16;
+error_log   /var/www/html/data/log/mnginx.log info;
+worker_rlimit_nofile 10240;
+
+events {
+    worker_connections  8192;
+    multi_accept on;
+    use epoll;
+}
+
+http 
+{
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    underscores_in_headers on;
+    client_max_body_size 32M;
+    client_body_buffer_size 1024K;
+
+    tcp_nopush on;
+
+    sendfile            on;
+    keepalive_timeout   300;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    server 
+    {
+    	listen       80;
+        set  $folder_name /var/www/html;
+        server_name 192.168.3.104;
+        root $folder_name;
+        index index.html index.php; 
+
+    	proxy_connect_timeout 500s;
+        proxy_read_timeout 500s;
+        proxy_send_timeout 500s;
+
+        fastcgi_connect_timeout 75;
+        fastcgi_read_timeout 600;   
+        fastcgi_send_timeout 600;
+        fastcgi_buffer_size  32K;
+        fastcgi_buffers      32 32K;
+
+        set_real_ip_from 100.64.0.0/10;
+        real_ip_header X-Forwarded-For;
+
+        charset utf-8;
+
+        location ~ /mobile/[/\w]+\.php$ {
+            root           $folder_name;
+            fastcgi_pass   macc:9000;
+            fastcgi_index  index.php;
+            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
+            fastcgi_param  SIGN $http_sign;
+            include fastcgi_params;
+        }
+
+        location / {
+            deny all;
+            return 403;
+        }
+    }
+}

docker/compose/homecuda/conf/nginx/racc.conf

@@ -0,0 +1,68 @@
+user nginx;
+worker_processes  16;
+error_log   /var/www/html/data/log/rnginx.log debug;
+worker_rlimit_nofile 10240;
+
+events {
+    worker_connections  8192;
+    multi_accept on;
+    use epoll;
+}
+
+http 
+{
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    underscores_in_headers on;
+    client_max_body_size 32M;
+    client_body_buffer_size 1024K;
+
+    tcp_nopush on;
+
+    sendfile            on;
+    keepalive_timeout   300;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    server 
+    {
+    	listen       80;
+        set  $folder_name /var/www/html;
+        server_name 192.168.3.104;
+        root $folder_name;
+        index index.html index.php; 
+
+    	proxy_connect_timeout 500s;
+        proxy_read_timeout 500s;
+        proxy_send_timeout 500s;
+
+        fastcgi_connect_timeout 75;
+        fastcgi_read_timeout 600;   
+        fastcgi_send_timeout 600;
+        fastcgi_buffer_size  32K;
+        fastcgi_buffers      32 32K;
+
+        set_real_ip_from 100.64.0.0/10;
+        real_ip_header X-Forwarded-For;
+
+        charset utf-8;
+
+
+        location ~ /racc/[/\w]+\.php$ {
+            root           $folder_name;
+            fastcgi_pass   racc:9000;
+            fastcgi_index  index.php;
+            fastcgi_param  SCRIPT_FILENAME  $folder_name$fastcgi_script_name;
+            fastcgi_param  SIGN $http_sign;
+            include fastcgi_params;
+        }
+
+        location / {
+            deny all;
+            return 403;
+        }
+    }
+}

docker/compose/homecuda/conf/php/mch-spwan-start

@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-spawn-fcgi -a 0.0.0.0 -p 9102 -F 1 -f "php /var/www/html/mchsrv/mchsrv_run.php"
-
-
-time=$(date "+%Y%m%d")
-
-if [ ! -f "/var/www/html/data/log/${time}-mchsrv.log" ]; then
-    touch "/var/www/html/data/log/${time}-mchsrv.log"
-fi
-
-tail -f "/var/www/html/data/log/${time}-mchsrv.log"

docker/compose/homecuda/conf/php/mobile-spwan-start

@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-spawn-fcgi -a 0.0.0.0 -p 9000 -F 1 -f "php /var/www/html/mobile/mobile_run.php"
-
-time=$(date "+%Y%m%d")
-
-if [ ! -f "/var/www/html/data/log/${time}-mobile.log" ]; then
-    touch "/var/www/html/data/log/${time}-mobile.log"
-fi
-
-tail -f "/var/www/html/data/log/${time}-mobile.log"

docker/compose/homecuda/conf/php/spwan-start

@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+
+cmd="php /var/www/html$1"
+time=$(date "+%Y%m%d")
+file="/var/www/html/data/log/${time}-$2"
+
+spawn-fcgi -a 0.0.0.0 -p 9000 -F 1 -f "$cmd"
+
+#trap 'echo "Container is exiting"; exit' EXIT
+#tail -f /dev/null
+
+if [ ! -f $file ]; then
+    touch $file
+fi
+
+tail -f $file

docker/compose/homecuda/conf/php/vapi-spwan-start

@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-spawn-fcgi -a 0.0.0.0 -p 9100 -F 1 -f "php /var/www/html/vapi/vapi.php"
-
-time=$(date "+%Y%m%d")
-
-if [ ! -f "/var/www/html/data/log/${time}-vapi.log" ]; then
-    touch "/var/www/html/data/log/${time}-vapi.log"
-fi
-
-tail -f "/var/www/html/data/log/${time}-vapi.log"

docker/compose/homecuda/conf/php/vender-init

@@ -1,3 +1,3 @@
 #!/bin/sh
-cd /var/www/html
+cd /var/wwww/html
 php ./composer.phar require phpoffice/phpspreadsheet

docker/compose/homecuda/container.env

@@ -0,0 +1,2 @@
+
+#mobile 模块接入层配置

docker/compose/homecuda/cpenv

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# shellcheck disable=SC2039
+dest_dirs=("macc" "admin" "vendor" "cli" "cluster" "master-crond" "racc" "slave-crond" "worker")
+src_file=".env"
+
+for dir in "${dest_dirs[@]}"; do
+    cp "$src_file" "$dir/"
+    echo "$dir/"
+done

docker/compose/homecuda/database/docker-compose.yml

@@ -1,19 +0,0 @@
-version: "3.7"
-
-services:
-  mysql:
-    image: mysql:latest
-    ports:
-      - 3306:3306
-    volumes:
-      - /mnt/homedb/logs:/var/log/mysql
-      - /mnt/homedb/data:/var/lib/mysql
-      - /mnt/homedb/conf/my.cnf:/etc/my.cnf
-    container_name: docker-mysqld
-    restart: always
-    environment:
-      MYSQL_ROOT_PASSWORD: 55668899
-    deploy:
-      resources:
-        limits:
-          cpus: '16'

docker/compose/homecuda/macc/docker-compose.yml

@@ -0,0 +1,37 @@
+version: "3.9"
+
+include:
+  - ../../docker-compose.networks.yml
+
+services:
+  nginx:
+    image: nginx:alpine
+    ports:
+      - ${MACCNGINX_PORT}:80
+    volumes:
+      - ../../../../:${SHOP_ROOT_PATH}
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/nginx/macc.conf:/etc/nginx/nginx.conf:ro
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${MERCHANT_PATH}:${SHOP_ROOT_PATH}/merchant
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-mnginx"
+    command: [nginx,'-g','daemon off;']
+    extra_hosts:
+      - docker.hostip:172.17.0.1
+    networks:
+      - ${DOCKER_NET_NAME}
+
+  macc:
+    image: php-zts:7.3.18
+    volumes:
+      - ../../../../:${SHOP_ROOT_PATH}
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php.ini:/usr/local/etc/php/php.ini
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+      - ../conf/php/spwan-start:/usr/local/bin/spwan-start
+    container_name: "${CONTAINER_PREFIX}-macc"
+    command: [ spwan-start,"/mobile/mobile_run.php","mobile.log" ]
+    networks:
+      - ${DOCKER_NET_NAME}

docker/compose/homecuda/master-crond/docker-compose.yml

@@ -1,36 +1,45 @@
 version: "3.7"
 
+include:
+  - ../../docker-compose.networks.yml
+
 services:
   crontabsrv:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/root:/var/spool/cron/crontabs/root
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-crontab"
+      - ../conf/crontab/master_root:/var/spool/cron/crontabs/root
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-master-crontab"
     command: [crond,"-f"]
+    networks:
+      - ${DOCKER_NET_NAME}
 
   cronsec:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-cronsec"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','second_queue']
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-master-cronsec"
+    command: [php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','second_queue']
+    networks:
+      - ${DOCKER_NET_NAME}
 
   accedit:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-accedit"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','account_edit']
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-master-accedit"
+    command: [php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','account_edit']
+    networks:
+      - ${DOCKER_NET_NAME}

docker/compose/homecuda/plot/docker-compose.yml

@@ -1,14 +0,0 @@
-version: "3.7"
-
-services:
-  flasksrv:
-    image: pycpu:3.7.10
-    ports:
-      - "5000:5000"
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-flask"
-    command: ['python','app.py']

docker/compose/homecuda/racc/docker-compose.yml

@@ -0,0 +1,35 @@
+version: "3.9"
+
+include:
+  - ../../docker-compose.networks.yml
+
+services:
+  nginx:
+    image: nginx:alpine
+    ports:
+      - ${RACCNGINX_PORT}:80
+    volumes:
+      - ../../../../:${SHOP_ROOT_PATH}
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/nginx/racc.conf:/etc/nginx/nginx.conf:ro
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${MERCHANT_PATH}:${SHOP_ROOT_PATH}/merchant
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-rnginx"
+    command: [nginx,'-g','daemon off;']
+    networks:
+      - ${DOCKER_NET_NAME}
+
+  racc:
+    image: php-zts:7.3.18
+    volumes:
+      - ../../../../:${SHOP_ROOT_PATH}
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+      - ../conf/php/spwan-start:/usr/local/bin/spwan-start
+    container_name: "${CONTAINER_PREFIX}-racc"
+    command: [ spwan-start,"/racc/racc_run.php","racc.log" ]
+    networks:
+      - ${DOCKER_NET_NAME}

docker/compose/homecuda/slave-crond/docker-compose.yml

@@ -1,61 +1,58 @@
 version: "3.7"
 
+include:
+  - ../../docker-compose.networks.yml
+
 services:
   crontabslave:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
       - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-slavecron"
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-slave-cron"
     command: [crond,"-f"]
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
+    networks:
+      - ${DOCKER_NET_NAME}
 
   taska:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-taska"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','task']
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-slave-taska"
+    command: [php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','task']
+    networks:
+      - ${DOCKER_NET_NAME}
 
   taskb:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - ../conf/crontab/slave_root:/var/spool/cron/crontabs/root
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-taskb"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','task']
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-slave-taskb"
+    command: [php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','task']
+    networks:
+      - ${DOCKER_NET_NAME}
 
   statutil:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-statutil"
-    command: [php,"/var/www/html/crontab/index.php",'minutes','stat_util']
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-slave-stat"
+    command: [php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','stat']
+    networks:
+      - ${DOCKER_NET_NAME}

docker/compose/homecuda/statcalc/docker-compose.yml

@@ -1,42 +0,0 @@
-version: "3.7"
-
-services:
-  mamount:
-    image: pycpu:3.7.10
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-mamount"
-    command: ['python','mamount_lack.py', '-h', '192.168.3.104', '-p', '6379']
-
-  mpratios:
-    image: pycpu:3.7.10
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-mpratios"
-    command: ['python','mprofit_ratio.py', '-h', '192.168.3.104', '-p', '6379']
-
-  mtimesratios:
-    image: pycpu:3.7.10
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-mtimesratios"
-    command: [ 'python','mtimesratio.py', '-h', '192.168.3.104', '-p', '6379' ]
-
-  chspeedratio:
-    image: pycpu:3.7.10
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-chspeedratio"
-    command: ['python','chspeedratio.py', '-h', '192.168.3.104', '-p', '6379']

docker/compose/homecuda/statwriter/docker-compose.yml

@@ -1,16 +0,0 @@
-version: "3.7"
-
-services:
-  qreader:
-    image: pycpu:3.7.10
-    volumes:
-      - ../../../../:/var/www/html
-      - ../conf/etc/localtime:/etc/localtime:ro
-      - /mnt/shoplog:/var/www/html/data/log
-      - /mnt/stdata:/var/www/html/data/stdata
-    container_name: "panda-qreader"
-    command: ['python','qreader.py','-h', '192.168.3.104', '-p', '6379']
-    deploy:
-      resources:
-        limits:
-          cpus: '8'

docker/compose/homecuda/storage/docker-compose.yml

@@ -1,18 +1,18 @@
 version: "3.7"
 
+include:
+  - ../../docker-compose.networks.yml
+
 services:
   redisrv:
     image: redis:alpine
     ports:
-      - "6379:6379"
+      - ${SHOP_REDIS_PORT}:6379
     volumes:
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/redis/6379.conf:/etc/redis/redis.conf
       - /mnt/redisdata:/data
-    restart: always
     container_name: "panda-redis"
     command: [redis-server,"/etc/redis/redis.conf"]
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
+    networks:
+      - ${DOCKER_NET_NAME}

docker/compose/homecuda/vendor/docker-compose.yml

@@ -0,0 +1,20 @@
+version: "3.9"
+
+include:
+  - ../../docker-compose.networks.yml
+
+services:
+  nginx:
+    image: nginx:alpine
+    env_file:
+      - ../.env
+    ports:
+      - ${RMINE_NGINX_PORT}:80
+    volumes:
+      - ../conf/etc/localtime:/etc/localtime:ro
+      - ../conf/nginx/nginx_vendor.conf:/etc/nginx/nginx.conf:ro
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+    container_name: "readmine-nginx"
+    command: [nginx,'-g','daemon off;']
+    networks:
+      - ${DOCKER_NET_NAME}

docker/compose/homecuda/worker/docker-compose.yml

@@ -1,39 +1,44 @@
-version: "3.7"
+version: "3.9"
+
+include:
+  - ../../docker-compose.networks.yml
 
 services:
   cordsrv:
     image: php-swool-redis:latest
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php-swoole-debug.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/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","1"]
-    deploy:
-      resources:
-        limits:
-          cpus: '8'
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-wcodispatcher"
+    command: [php,"${SHOP_ROOT_PATH}/rdispatcher/codispatcher.php","1"]
+    networks:
+      - ${DOCKER_NET_NAME}
 
   queuesrv:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-queue"
-    command: [php,"/var/www/html/queue/index.php", "queue", "index"]
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-wqueue"
+    command: [php,"${SHOP_ROOT_PATH}/queue/index.php", "queue", "index"]
+    networks:
+      - ${DOCKER_NET_NAME}
 
   searcher:
     image: php-zts-debug:7.3.18
     volumes:
-      - ../../../../:/var/www/html
+      - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
       - ../conf/php/php.ini:/usr/local/etc/php/php.ini
-      - /data/shop_share/upload:/var/www/html/data/upload
-      - /mnt/shoplog:/var/www/html/data/log
-    container_name: "panda-searcher"
-    command: [php, "/var/www/html/searcher.php"]
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
+    container_name: "${CONTAINER_PREFIX}-wsearcher"
+    command: [php, "${SHOP_ROOT_PATH}/searcher.php"]
+    networks:
+      - ${DOCKER_NET_NAME}

docker/compose/netcreate

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+DOCKER_NETWORK=`docker network ls | grep $1 | wc -l`
+if [ $DOCKER_NETWORK -eq 0 ]; then
+  echo "docker network create $1"
+  docker network create $1
+fi
+
+docker network ls | grep $1

fooder.php

@@ -1,11 +1,6 @@
 <?php
 
 require_once(BASE_CORE_PATH .   '/lrlz.php');
-require_once(BASE_MOBILE_PATH . '/config/config.ini.php');
-require_once(BASE_MOBILE_PATH . '/framework/function/function.php');
-require_once(BASE_MOBILE_PATH . '/util/errcode.php');
-require_once(BASE_MOBILE_PATH . '/control/log.php');
-
 require_once(BASE_CORE_PATH . '/framework/libraries/queue.php');
 require_once(BASE_CORE_PATH . '/framework/libraries/tpl.php');
 require_once(BASE_CORE_PATH . '/framework/function/core.php');

helper/fcgisrv/BaseServer.php

@@ -68,7 +68,7 @@ abstract class BaseServer
         while(($ret = fcgi_accept()) >= 0)
         {
             $mem = memory_get_usage();
-            Log::record("index = {$i} memory={$mem} ",Log::DEBUG);
+            Log::record("index = $i memory=$mem ",Log::DEBUG);
             ++$i;
 
             $start = microtime(true);

helper/fcgisrv/RAccServer.php

@@ -8,6 +8,7 @@ require_once(BASE_CORE_PATH . '/framework/function/http.php');
 require_once(BASE_ROOT_PATH . '/helper/session_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/sensitive_word/dfa.php');
 require_once(BASE_ROOT_PATH . '/helper/exceptionex.php');
+
 require_once(BASE_HELPER_PATH . '/fcgisrv/BaseServer.php');
 require_once(BASE_HELPER_PATH . '/refill/util.php');
 
@@ -20,6 +21,7 @@ use errcode;
 
 class RAccServer extends BaseServer
 {
+
     public function __construct($subPath)
     {
         parent::__construct($subPath);
@@ -40,6 +42,35 @@ class RAccServer extends BaseServer
         return self::$stInstance;
     }
 
+    protected function is_exclude($file)
+    {
+        $exister = function ($file,$subex)
+        {
+            $path = BASE_ROOT_PATH . "/" . $this->mSubPath . "/$subex";
+            $basename = basename($file);
+            $tmp = "$path/$basename";
+
+            return file_exists($tmp);
+        };
+
+        $ret = parent::is_exclude($file);
+        if ($ret) {
+            return true;
+        }
+
+        global $config;
+        $exclude_dirs = $config['racc_exclude_dirs'];
+
+        foreach ($exclude_dirs as $dir)
+        {
+            if($exister($file,$dir)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     function handle_req($file)
     {
         try
@@ -48,7 +79,7 @@ class RAccServer extends BaseServer
             if(file_exists($file))
             {
                 if($this->is_exclude($file)) {
-                    Log::record("Call {$file}",Log::DEBUG);
+                    Log::record("Call $file", Log::DEBUG);
                     include $file;
                 } else {
                     Base::mobile_control();

mobile/index.php

@@ -4,6 +4,9 @@
  *
  *
  */
+
+
+require_once(BASE_PATH . '/config/config.ini.php');
 require_once(BASE_PATH . '/util/errcode.php');
 require_once(BASE_PATH . '/framework/function/function.php');
-require_once(BASE_PATH . '/control/control.php');
+require_once(BASE_PATH . '/control/control.php');

racc/config/config.ini.php

@@ -1,3 +1,5 @@
 <?php
 defined('InShopNC') or exit('Access Invalid!');
 
+$config['racc_exclude_dirs'] = ['callback/lingzh','callback/mh'];
+

racc/control/refill.php

@@ -1,6 +1,5 @@
 <?php
 
-require_once(BASE_ROOT_PATH . '/mobile/control/merchant.php');
 require_once(BASE_HELPER_PATH . '/refill/RefillFactory.php');
 require_once(BASE_HELPER_PATH . '/mtopcard/mtopcard.php');
 require_once(BASE_HELPER_PATH . '/model/member_info.php');

racc/framework/function/function.php

@@ -5,120 +5,5 @@
  * 公共方法
  *
  */
-defined('InShopNC') or exit('Access Invalid!');
-
-
-require_once(BASE_CORE_PATH . '/framework/libraries/model.php');
-require_once(BASE_DATA_PATH . '/model/member.model.php');
-require_once(BASE_MOBILE_PATH . '/util/errcode.php');
-
-function output_data($datas, $extend_data = array(),$code = 200) 
-{
-    $data = array();
-    $data['code'] = $code;
-
-    if(!empty($extend_data)) {
-        $data = array_merge($data, $extend_data);
-    }
-
-    $data['datas'] = $datas;
-
-    if(!empty($_GET['callback'])) {
-        echo $_GET['callback'].'('.json_encode($data).')';
-    } else {
-        echo json_encode($data);
-    }
-}
-
-function output_error($message, $extend_data = array(),$code = 200) {
-    $datas = array('error' => $message);
-    output_data($datas, $extend_data,$code);
-}
-
-function joutput_data($datas,$type='')
-{
-    $data = [];
-
-    $code = errcode::Success;
-    $data['code'] = $code;
-    $data['message'] = errcode::msg($code);
-
-    $data['datas'] = $datas;
-
-    if($_SESSION['client_type'] != 'ajax')
-    {
-        $contents = ob_get_clean();
-        if(!empty($contents)) {
-            Log::record($contents,Log::ERR);
-        }
-        ob_start();
-    }
 
-    if(!empty($type) && $type == 'web') {
-        echo(json_encode($data,JSON_UNESCAPED_UNICODE));
-    } else {
-        echo(json_encode($data));
-    }
-}
-
-function joutput_error($code,$message = '',$type='')
-{
-    if(empty($message)) {
-        $message = errcode::msg($code);
-    }
-
-    $data = array();
-    $data['code'] = $code;
-    $data['message'] =  $message;
-    $data['datas'] = null;
-
-    if($_SESSION['client_type'] != 'ajax')
-    {
-        $contents = ob_get_clean();
-        if(!empty($contents)) {
-            Log::record($contents,Log::ERR);
-        }
-        ob_start();
-    }
-    Log::record("code = {$code} message = {$message}",Log::ERR);
-
-    if(!empty($type) && $type == 'web') {
-        echo(json_encode($data,JSON_UNESCAPED_UNICODE));
-    } else {
-        echo(json_encode($data,JSON_UNESCAPED_UNICODE));
-    }
-}
-
-function mobile_page($page_count,$totalnum = false)
-{
-    $extend_data = array();
-    $current_page = intval($_GET['curpage']);
-    if($current_page <= 0) {
-        $current_page = 1;
-    }
-    if($current_page >= $page_count) {
-        $extend_data['hasmore'] = false;
-    } else {
-        $extend_data['hasmore'] = true;
-    }
-    $extend_data['page_total'] = $page_count;
-    if($totalnum !== false) {
-        $extend_data['total_num'] = $totalnum;
-    }
-
-    return $extend_data;
-}
-
-/**
- * 过滤html标签,js代码,css样式标签
- * @param $str
- * @return mixed
- */
-function remove_tags($str) {
-    $str = preg_replace( "@<script(.*?)</script>@is", "", $str );
-    $str = preg_replace( "@<iframe(.*?)</iframe>@is", "", $str );
-    $str = preg_replace( "@<style(.*?)</style>@is", "", $str );
-    $str = preg_replace( "@<(.*?)>@is", "", $str );
-
-    return $str;
-}
+defined('InShopNC') or exit('Access Invalid!');

racc/index.php

@@ -5,5 +5,7 @@
  *
  */
 
-require_once(BASE_PATH . '/control/merchant.php');
-require_once(BASE_PATH . '/control/lzbase.php');
+require_once(BASE_PATH . '/config/config.ini.php');
+require_once(BASE_PATH . '/util/errcode.php');
+require_once(BASE_PATH . '/framework/function/function.php');
+require_once(BASE_PATH . '/control/merchant.php');

racc/racc.php

@@ -9,7 +9,6 @@ define('BASE_PATH', BASE_ROOT_PATH . '/racc');
 require_once(BASE_ROOT_PATH . '/global.php');
 require_once(BASE_ROOT_PATH . '/fooder.php');
 require_once(BASE_PATH . '/index.php');
-
 require_once(BASE_ROOT_PATH . '/helper/http_header.php');
 require_once(BASE_ROOT_PATH . '/helper/session.php');
 require_once(BASE_ROOT_PATH . '/helper/img_helper.php');
@@ -34,8 +33,8 @@ require_once(BASE_ROOT_PATH . '/helper/third_author/wxauthor.php');
 require_once(BASE_ROOT_PATH . '/helper/fcode/present_manager.php');
 require_once(BASE_ROOT_PATH . '/helper/url_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/activity_helper.php');
-
 require_once(BASE_HELPER_PATH . '/refill/util.php');
+require_once(BASE_HELPER_PATH . '/fcgisrv/RAccServer.php');
 
 function all_channels() {
     return ['refill'];
@@ -43,7 +42,7 @@ function all_channels() {
 
 Base::mobile_init();
 $trdid = Thread::getCurrentThreadId();
-Log::record("thread id = {$trdid}",Log::INFO);
+Log::record("thread id = $trdid",Log::INFO);
 
 $gMessageStates = new MsgStates();
 StatesHelper::init();