dev

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

@@ -23,7 +23,7 @@ services:
     volumes:
       - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - ../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
     container_name: "${CONTAINER_PREFIX}-admin-taska"
@@ -75,7 +75,7 @@ services:
     volumes:
       - ../../../../:${SHOP_ROOT_PATH}
       - ../conf/etc/localtime:/etc/localtime:ro
-      - ../conf/php/php-debug.ini:/usr/local/etc/php/php.ini
+      - ../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
     container_name: "${CONTAINER_PREFIX}-slave-stat"
@@ -90,8 +90,8 @@ services:
       - ../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
-      - /nfs/ylupload:/var/www/html/data/upload
-      - /mnt/yllog:/var/www/html/data/log
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-mch-taska"
     command: [ php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','merchant_task' ]
 
@@ -102,7 +102,7 @@ services:
       - ../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
-      - /nfs/ylupload:/var/www/html/data/upload
-      - /mnt/yllog:/var/www/html/data/log
+      - ${SHOP_UPLOAD_PATH}:${SHOP_ROOT_PATH}/data/upload
+      - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-mch-taskb"
     command: [ php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','merchant_task' ]

docker/compose/yl/yl-slave/docker-compose.yml

@@ -12,8 +12,8 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-slave-cron"
     command: [crond,"-f"]
-#    networks:
-#      - ${DOCKER_NET_NAME}
+    networks:
+      - ${DOCKER_NET_NAME}
 
   taska:
     image: php-zts:7.3.18
@@ -25,8 +25,8 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-admin-taska"
     command: [php,"/var/www/html/crontab/index.php",'minutes','admin_task']
-#    networks:
-#      - ${DOCKER_NET_NAME}
+    networks:
+      - ${DOCKER_NET_NAME}
 
   taskb:
     image: php-zts:7.3.18
@@ -38,8 +38,8 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-admin-taskb"
     command: [php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','admin_task']
-#    networks:
-#      - ${DOCKER_NET_NAME}
+    networks:
+      - ${DOCKER_NET_NAME}
 
   taskc:
     image: php-zts:7.3.18
@@ -51,8 +51,8 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-admin-taskc"
     command: [ php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','admin_task' ]
-#    networks:
-#      - ${DOCKER_NET_NAME}
+    networks:
+      - ${DOCKER_NET_NAME}
 
   taskd:
     image: php-zts:7.3.18
@@ -64,8 +64,8 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-admin-taskd"
     command: [ php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','admin_task' ]
-#    networks:
-#      - ${DOCKER_NET_NAME}
+    networks:
+      - ${DOCKER_NET_NAME}
 
   statutil:
     image: php-zts:7.3.18
@@ -77,8 +77,8 @@ services:
       - ${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}
+    networks:
+      - ${DOCKER_NET_NAME}
 
   mtaska:
     image: php-zts:7.3.18
@@ -91,8 +91,8 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-mch-taska"
     command: [ php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','merchant_task' ]
-#    networks:
-#      - ${DOCKER_NET_NAME}
+    networks:
+      - ${DOCKER_NET_NAME}
 
   mtaskb:
     image: php-zts:7.3.18
@@ -105,9 +105,9 @@ services:
       - ${SHOP_LOG_PATH}:${SHOP_ROOT_PATH}/data/log
     container_name: "${CONTAINER_PREFIX}-mch-taskb"
     command: [ php,"${SHOP_ROOT_PATH}/crontab/index.php",'minutes','merchant_task' ]
-#    networks:
-#      - ${DOCKER_NET_NAME}
+    networks:
+      - ${DOCKER_NET_NAME}
 
-#  networks:
-#    net_ylshop:
-#      external: true
+networks:
+  net_ylshop:
+    external: true

helper/refill/api/mh/dixin_normal/RefillCallBack.php

@@ -21,7 +21,6 @@ class RefillCallBack implements refill\IRefillCallBack
     //[$order_id, $success, $can_try, $need_handle, $official_sn]
     public function notify($params): array
     {
-
         $order_sn = $params['merchant_no'];
         $order_info = Model('vr_order')->getOrderInfo(['order_sn' => $order_sn]);