Merge branch 'colonel' into 'pre_release'

update BaseException

See merge request bp/goods!51

application/exception/BaseException.php

@@ -33,11 +33,11 @@ class BaseException extends \Exception
         $this->msg = $params['msg'] ?? Registry::get('config')->exception->user->msg;
 
         if (isset($params['cus']) && $this->cus && isset($this->cus[intval($params['cus'])]) && $this->base_code) {
-            return $this->setCusMsg($params['cus']);
+            return $this->setCusMsg($params['cus'],$params['data']??'');
         }
     }
 
-    public function setCusMsg($cus)
+    public function setCusMsg($cus,$data = '')
     {
         //每个服务都有自己的codePrefix
         $appid = \Yaf\Application::app()->getConfig()->get("appid");
@@ -48,7 +48,7 @@ class BaseException extends \Exception
         $base_code = intval($this->base_code);
 
         $this->code = $codePrefix + $base_code + $cus_code;
-        $this->msg = isset($params['data']) ? vsprintf($this->cus[$cus_code],$params['data']) : $this->cus[$cus_code];
+        $this->msg = !empty($data) ? vsprintf($this->cus[$cus_code],$data) : $this->cus[$cus_code];
     }
 
     public function __get($name): bool