Merge branch 'master' into dev

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -98,7 +98,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'headerOther' => ['width' => '120'],
                 ],
                 'CREATE_USER_NAME' => [
-                    'header' => 'Stockist Name', // 创建人姓名
+                    'header' => 'Creator Name', // 创建人姓名
                     'headerOther' => ['width' => '120'],
                 ],
                 'SN' => [

common/components/SwooleAsyncTimer.php

@@ -71,7 +71,9 @@ class SwooleAsyncTimer extends SwooleAsyncTimerComponent implements SocketInterf
             // 初始化备份历史奖金数据表
 //            TaskFunc::initAutoBakBalance();
             // 初始化自动发送钉钉推送消息
-            TaskFunc::initAutoSendDingTalk();
+            if (YII_ENV == YII_ENV_PROD) {
+                TaskFunc::initAutoSendDingTalk();
+            }
         }
     }
 

common/libs/taskQueue/TaskFunc.php

@@ -62,8 +62,11 @@ class TaskFunc
      * 自动送钉钉提醒
      */
     public static function autoSendDingTalkTable() {
+        $ip = 'https://ng-frontend-api.elken.com';
+//        $ip = 'http://16.163.228.151:8026';
+
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, 'http://16.163.228.151:8026/v1/site/send-notice');
+        curl_setopt($curl, CURLOPT_URL, $ip . '/v1/site/send-notice');
         curl_setopt($curl, CURLOPT_TIMEOUT, 5000);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);

console/controllers/ToolController.php

@@ -126,6 +126,13 @@ class ToolController extends BaseController
         echo '清空成功'.PHP_EOL;
     }
 
+    /**
+     * 清空缓存
+     */
+    public function actionClearConfigCache() {
+        \Yii::$app->cache->delete(Cache::SYSTEM_CONFIG_KEY);
+        echo '清空成功: ' . Cache::SYSTEM_CONFIG_KEY . PHP_EOL;
+    }
 
     /**
      * 重置接点和推荐数量
@@ -172,8 +179,10 @@ class ToolController extends BaseController
      * 自动送钉钉提醒
      */
     public function actionAutoSendDingTalkTable() {
+        $ip = 'https://ng-frontend-api.elken.com';
+//        $ip = 'http://16.163.228.151:8026';
         $curl = curl_init();
-        curl_setopt($curl, CURLOPT_URL, 'http://16.163.228.151:8026/v1/site/send-notice');
+        curl_setopt($curl, CURLOPT_URL, $ip . '/v1/site/send-notice');
         curl_setopt($curl, CURLOPT_TIMEOUT, 5000);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);