Merge branch 'colonel' into test

application/modules/Job/controllers/Colonelwallet.php

@@ -80,7 +80,7 @@ class ColonelwalletController extends Job
                 'third_order_id_type' => $payInfo['type'],
                 'third_order_desc'    => self::getThirdOrderDesc($payInfo),
                 'amount'              => $payInfo['reward'],
-                'extra'               => $payInfo
+                'extra'               => ''
             ];
         }
         $httpParams['list'] = $list;

deploy/job/run-colonel-order.job

 type=command
-command=bash docker run --rm   -e LANG=en_US.UTF-8 -e TZ=Asia/Shanghai --net=bridge -h "`hostname`"  --cap-add SYS_PTRACE  --privileged docker2.yidian.com:5000/publish/bp-goods-azkaban-test-10-image  /bin/bash -c "cd /home/services && sh start_job.sh test ColonelOrder index a=3&b=4"
+command=docker run --rm -e YIDIAN_LOCAL_IP=10.138.0.27 -e YIDIAN_LOCAL_PORT= -e ORIGIN_SERVICE_PORT= -e LANG=en_US.UTF-8 -e TZ=Asia/Shanghai --net=bridge -h "`hostname`" --cap-add SYS_PTRACE --privileged docker2.yidian.com:5000/publish/bp-goods-azkaban-test-107-image /bin/bash -c "sysctl -w net.core.somaxconn=65535 && cd /home/services && sh start_job.sh test Colonelorder index a=3"
\ No newline at end of file

deploy/job/run-colonel-wallet.job

 type=command
-command=bash docker run --rm   -e LANG=en_US.UTF-8 -e TZ=Asia/Shanghai --net=bridge -h "`hostname`"  --cap-add SYS_PTRACE  --privileged docker2.yidian.com:5000/publish/bp-goods-azkaban-test-10-image  /bin/bash -c "cd /home/services && sh start_job.sh test ColonelWallet index a=3&b=4"
+command=docker run --rm -e YIDIAN_LOCAL_IP=10.138.0.27 -e YIDIAN_LOCAL_PORT= -e ORIGIN_SERVICE_PORT= -e LANG=en_US.UTF-8 -e TZ=Asia/Shanghai --net=bridge -h "`hostname`" --cap-add SYS_PTRACE --privileged docker2.yidian.com:5000/publish/bp-goods-azkaban-test-107-image /bin/bash -c "sysctl -w net.core.somaxconn=65535 && cd /home/services && sh start_job.sh test Colonelwallet index a=3"
 dependencies=run-colonel-order
\ No newline at end of file