wesmiler

app/Helpers/common.php

@@ -1356,6 +1356,19 @@ if (!function_exists('lang')) {
     }
 }
 
+if (!function_exists('web_lang')) {
+    function web_lang($msg, $replace = [], $local = '')
+    {
+        $local = $local? $local : session('locale_lang');
+        $local = $local ? $local : config('app.locale');
+        $data = __('api.' . $msg, $replace, $local);
+        if (strpos($data, 'api', 0) !== false) {
+            return __($msg, $replace, $local);
+        }
+        return __('api.' . $msg, $replace, $local);
+    }
+}
+
 if (!function_exists('message')) {
 
     /**
@@ -1394,7 +1407,8 @@ if (!function_exists('showJson')) {
      */
     function showJson($msg = "操作成功", $success = true, $data = [], $code = 0, $type = 'json')
     {
-        $result = ['success' => $success, 'msg' => lang($msg), 'data' => $data];
+
+        $result = ['success' => $success, 'msg' => web_lang($msg), 'data' => $data];
         if ($success) {
             $result['code'] = 0;
         } else {

app/Http/Controllers/Api/LangController.php

@@ -17,11 +17,11 @@ class LangController extends webApp
     public function switch(){
         $locale = request()->get('locale');
         if(empty($locale)){
-            return message('2101',false);
+            return showJson('2101',false);
         }
         RedisService::set("caches:locale:lang_{$this->userId}", $locale, 24 * 3600);
         RedisService::keyDel('caches:config:app_*');
         session('lang_locale', $locale);
-        return message(2102);
+        return showJson(2102);
     }
 }

app/Http/Controllers/Api/LoginController.php

@@ -19,7 +19,7 @@ class LoginController extends webApp
     public function login(){
         $code = request()->all();
         if(empty($code)){
-            return message('code参数错误',false);
+            return showJson('code参数错误',false);
         }
 
         // 授权
@@ -27,11 +27,11 @@ class LoginController extends webApp
         $status = isset($this->userInfo['status'])? $this->userInfo['status'] : '';
         $userId = isset($this->userInfo['id'])? $this->userInfo['id'] : 0;
         if(empty($this->userInfo) || empty($openid) || $userId<=0){
-            return message('用户授权失败',false);
+            return showJson('用户授权失败',false);
         }
 
         if($status != 1){
-            return message('用户账户已被冻结不可操作',false);
+            return showJson('用户账户已被冻结不可操作',false);
         }
 
         // 获取授权TOKEN
@@ -46,7 +46,7 @@ class LoginController extends webApp
 
         // 用户信息
         RedisService::set("auths:info:{$userId}", $this->userInfo, 4*24*3600);
-        return message('获取授权成功', true, $result);
+        return showJson('获取授权成功', true, $result);
     }
 
     public function register()
@@ -57,6 +57,6 @@ class LoginController extends webApp
     public function sendmsm()
     {
         $username = request()->post('username');
-        return message(1011, true);
+        return showJson(1011, true);
     }
 }

app/Http/Controllers/Api/TestController.php

@@ -17,6 +17,6 @@ class TestController extends webApp
     public function check()
     {
         
-        return message('获取结果');
+        return showJson('获取结果');
     }
 }

app/Http/Controllers/Api/v1/AccountController.php

@@ -25,9 +25,9 @@ class AccountController extends webApp
         $params['user_id'] = isset($params['user_id'])? $params['user_id'] : $this->userId;
         $datas = AccountLogService::make()->getDataList($params, $pageSize);
         if($datas){
-            return message(1010, true, $datas);
+            return showJson(1010, true, $datas);
         }else{
-            return message(1009, false);
+            return showJson(1009, false);
         }
 
     }
@@ -59,7 +59,7 @@ class AccountController extends webApp
 //            ['id'=>97,'name'=>'等级烧伤损失'],
         ];
 
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
 
 
     }
@@ -73,7 +73,7 @@ class AccountController extends webApp
         $coinType =request()->post('coin_type',1);
         $userType =request()->post('user_type',1);
         $datas = AccountLogService::make()->getCountsByType($this->userId, $coinType, $userType);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -86,6 +86,6 @@ class AccountController extends webApp
         $pageSize = request()->post('pageSize', 15);
         $params['user_id'] = isset($params['user_id'])? $params['user_id'] : $this->userId;
         $datas = BalanceLogService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 }

app/Http/Controllers/Api/v1/AddressController.php

@@ -24,7 +24,7 @@ class AddressController extends webApp
         $pageSize = request()->post('pageSize', 15);
         $params['user_id'] = $this->userId;
         $datas = MemberAddressService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -37,13 +37,13 @@ class AddressController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'save');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MemberAddressService::make()->saveData($this->userId, $params)){
-            return message(MemberAddressService::make()->getError(), false,111);
+            return showJson(MemberAddressService::make()->getError(), false,111);
         }else{
-            return message(MemberAddressService::make()->getError(), true, $result);
+            return showJson(MemberAddressService::make()->getError(), true, $result);
         }
     }
 
@@ -54,9 +54,9 @@ class AddressController extends webApp
     public function delete()
     {
         if(!MemberAddressService::make()->delete()){
-            return message(MemberAddressService::make()->getError(), false);
+            return showJson(MemberAddressService::make()->getError(), false);
         }else{
-            return message(MemberAddressService::make()->getError(), true);
+            return showJson(MemberAddressService::make()->getError(), true);
         }
     }
 

app/Http/Controllers/Api/v1/ArticleController.php

@@ -23,7 +23,7 @@ class ArticleController extends webApp
         $params =request()->post();
         $pageSize = request()->post('pageSize', 15);
         $datas = ArticleService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -33,7 +33,7 @@ class ArticleController extends webApp
     public function category()
     {
         $datas = ArticleService::make()->getCategory();
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -44,7 +44,7 @@ class ArticleController extends webApp
     {
         $type = request()->post('type', 0);
         $datas = ArticleService::make()->getCateList($type);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -54,13 +54,13 @@ class ArticleController extends webApp
     {
         $id = request()->post('id',0);
         if(empty($id)){
-            return message(2501, false);
+            return showJson(2501, false);
         }
 
         if($info = ArticleService::make()->getInfo($id, $this->userId)){
-            return message(1010, true, $info);
+            return showJson(1010, true, $info);
         }else{
-            return message(1009, false);
+            return showJson(1009, false);
         }
     }
 
@@ -72,18 +72,18 @@ class ArticleController extends webApp
     {
         $type = request()->post('type','');
         if(empty($type)){
-            return message(2501, false);
+            return showJson(2501, false);
         }
 
         $pageId = ConfigService::make()->getConfigByCode("page_{$type}");
         if($pageId<=0){
-            return message(1032, false);
+            return showJson(1032, false);
         }
 
         if($info = ArticleService::make()->getInfo($pageId)){
-            return message(1010, true, $info);
+            return showJson(1010, true, $info);
         }else{
-            return message(1009, false);
+            return showJson(1009, false);
         }
     }
 }

app/Http/Controllers/Api/v1/ComplaintController.php

@@ -23,7 +23,7 @@ class ComplaintController extends webApp
         $params =request()->post();
         $pageSize = request()->post('pageSize', 15);
         $datas = ComplaintService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -33,13 +33,13 @@ class ComplaintController extends webApp
     {
         $id = request()->post('id',0);
         if(empty($id)){
-            return message(2501, false);
+            return showJson(2501, false);
         }
 
         if($info = ComplaintService::make()->getInfo($id)){
-            return message(1010, true, $info);
+            return showJson(1010, true, $info);
         }else{
-            return message(1009, false);
+            return showJson(1009, false);
         }
     }
 
@@ -52,13 +52,13 @@ class ComplaintController extends webApp
         $params = request()->post();
         $params = $validator->check($params, 'submit');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(ComplaintService::make()->submit($this->userId, $params)){
-            return message(1035, true);
+            return showJson(1035, true);
         }else{
-            return message(1036, false);
+            return showJson(1036, false);
         }
     }
 }

app/Http/Controllers/Api/v1/GoodsController.php

@@ -25,10 +25,10 @@ class GoodsController extends webApp
            $params = request()->post();
            $pageSize = request()->post('pageSize', 0);
            $datas = GoodsService::make()->getDataList($params, $pageSize,'', $this->userId);
-           return message(1010, true, $datas);
+           return showJson(1010, true, $datas);
        } catch (\Exception $exception){
            RedisService::set("caches:request:error_goods_index", ['trace'=>$exception->getTrace()], 7200);
-           return message(1018, false, ['error'=>env('APP_DEBUG')? $exception->getMessage() : '']);
+           return showJson(1018, false, ['error'=>env('APP_DEBUG')? $exception->getshowJson() : '']);
        }
     }
 
@@ -42,10 +42,10 @@ class GoodsController extends webApp
             $params = request()->post();
             $pageSize = request()->post('pageSize', 0);
             $datas = GoodsService::make()->getDataList($params, $pageSize,'lev_a.*,lev_c.name as merch_name', $this->userId);
-            return message(1010, true, $datas);
+            return showJson(1010, true, $datas);
         } catch (\Exception $exception){
             RedisService::set("caches:request:error_goods_index", ['trace'=>$exception->getTrace()], 7200);
-            return message(1018, false, ['error'=>env('APP_DEBUG')? $exception->getTrace() : '']);
+            return showJson(1018, false, ['error'=>env('APP_DEBUG')? $exception->getTrace() : '']);
         }
     }
 
@@ -58,7 +58,7 @@ class GoodsController extends webApp
         $params = request()->post();
         $pageSize = request()->post('pageSize', 99);
         $datas = GoodsCategoryService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -69,7 +69,7 @@ class GoodsController extends webApp
     {
         $id = request()->post('id', 0);
         $info = GoodsService::make()->getInfo($id, $this->userId);
-        return message(1010, true, $info);
+        return showJson(1010, true, $info);
     }
 
     /**
@@ -92,10 +92,10 @@ class GoodsController extends webApp
                 'status'=> 2,
             ];
             $datas = GoodsService::make()->getDataList($params, $pageSize);
-            return message(1010, true, $datas);
+            return showJson(1010, true, $datas);
         } catch (\Exception $exception){
             RedisService::set("caches:request:error_goods_recommend", ['trace'=>$exception->getTrace()], 7200);
-            return message(1018, false, ['error'=>env('APP_DEBUG')? $exception->getMessage() : '']);
+            return showJson(1018, false, ['error'=>env('APP_DEBUG')? $exception->getshowJson() : '']);
         }
 
     }
@@ -110,13 +110,13 @@ class GoodsController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'submit');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = GoodsService::make()->submit($this->userId, $params)){
-            return message(GoodsService::make()->getError(), false);
+            return showJson(GoodsService::make()->getError(), false);
         }else{
-            return message(GoodsService::make()->getError(), true, $result);
+            return showJson(GoodsService::make()->getError(), true, $result);
         }
     }
 
@@ -127,9 +127,9 @@ class GoodsController extends webApp
     public function status()
     {
         if(!$result = GoodsService::make()->status()){
-            return message(GoodsService::make()->getError(), false);
+            return showJson(GoodsService::make()->getError(), false);
         }else{
-            return message(GoodsService::make()->getError(), true, $result);
+            return showJson(GoodsService::make()->getError(), true, $result);
         }
     }
 

app/Http/Controllers/Api/v1/IndexController.php

@@ -27,10 +27,10 @@ class IndexController extends webApp
             $pageSize = request()->post('pageSize', 0);
             $params['is_recommend'] = 1;
             $datas = VideoService::make()->getIndexList($params, $pageSize,'', $this->userId);
-            return message(1010, true, $datas);
+            return showJson(1010, true, $datas);
         } catch (\Exception $exception){
-            RedisService::set("caches:request:error_video_index", ['error'=>$exception->getMessage(),'trace'=>$exception->getTrace()], 7200);
-            return message(1018, false, ['error'=>env('APP_DEBUG')? $exception->getMessage() : '']);
+            RedisService::set("caches:request:error_video_index", ['error'=>$exception->getshowJson(),'trace'=>$exception->getTrace()], 7200);
+            return showJson(1018, false, ['error'=>env('APP_DEBUG')? $exception->getshowJson() : '']);
         }
     }
 
@@ -88,7 +88,7 @@ class IndexController extends webApp
             return showJson(1010, true, $config);
         } catch (\Exception $exception) {
             RedisService::set("caches:request:error_config", ['trace' => $exception->getTrace()], 7200);
-            return showJson(1018, false, ['error' => env('APP_DEBUG') ? $exception->getMessage() : '']);
+            return showJson(1018, false, ['error' => env('APP_DEBUG') ? $exception->getshowJson() : '']);
         }
     }
 

app/Http/Controllers/Api/v1/LiveCategoryController.php

@@ -16,7 +16,7 @@ class LiveCategoryController extends webApp
      */
     public function options()
     {
-        return message(1010,true, LiveCategoryService::make()->options());
+        return showJson(1010,true, LiveCategoryService::make()->options());
     }
 
     /**
@@ -26,6 +26,6 @@ class LiveCategoryController extends webApp
     public function search()
     {
         $params = request()->all();
-        return message(1010,true, LiveCategoryService::make()->search($params));
+        return showJson(1010,true, LiveCategoryService::make()->search($params));
     }
 }

app/Http/Controllers/Api/v1/LiveController.php

@@ -24,10 +24,10 @@ class LiveController extends webApp
         $pageSize = request()->post('pageSize', 0);
         $params['is_recommend'] = 1;
         $datas = LiveService::make()->getDataList($params, $pageSize,'', $this->userId);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
        } catch (\Exception $exception){
-           RedisService::set("caches:request:error_live_index", ['error'=>$exception->getMessage(),'trace'=>$exception->getTrace()], 7200);
-           return message(1018, false, ['error'=>env('APP_DEBUG')? $exception->getMessage() : '']);
+           RedisService::set("caches:request:error_live_index", ['error'=>$exception->getshowJson(),'trace'=>$exception->getTrace()], 7200);
+           return showJson(1018, false, ['error'=>env('APP_DEBUG')? $exception->getshowJson() : '']);
        }
     }
 
@@ -40,7 +40,7 @@ class LiveController extends webApp
         $params =request()->post();
         $pageSize = request()->post('pageSize', 15);
         $datas = LiveService::make()->getUserList($params, $pageSize, $this->userId);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -52,7 +52,7 @@ class LiveController extends webApp
         $params =request()->post();
         $pageSize = request()->post('pageSize', 15);
         $datas = LiveService::make()->getGiftList($params, $pageSize, $this->userId);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -63,9 +63,9 @@ class LiveController extends webApp
     {
         $id = request()->post('id',0);
         if(!$result = LiveService::make()->updatePlay($this->userId, $id)){
-            return message(LiveService::make()->getError(), false);
+            return showJson(LiveService::make()->getError(), false);
         }else{
-            return message(LiveService::make()->getError(), true, $result);
+            return showJson(LiveService::make()->getError(), true, $result);
         }
     }
 
@@ -76,7 +76,7 @@ class LiveController extends webApp
     public function getUrl()
     {
         $urls = LiveService::make()->getLiveUrl($this->userId);
-        return message(1010, true, $urls);
+        return showJson(1010, true, $urls);
     }
 
     /**
@@ -89,13 +89,13 @@ class LiveController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'info');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$info = LiveService::make()->getInfo($params['id'], $this->userId)){
-            return message(LiveService::make()->getError(),false);
+            return showJson(LiveService::make()->getError(),false);
         }else{
-            return message(1010,true, $info);
+            return showJson(1010,true, $info);
         }
     }
 
@@ -106,9 +106,9 @@ class LiveController extends webApp
     public function status()
     {
         if(!$result = LiveService::make()->status()){
-            return message(LiveService::make()->getError(), false);
+            return showJson(LiveService::make()->getError(), false);
         }else{
-            return message(LiveService::make()->getError(), true, $result);
+            return showJson(LiveService::make()->getError(), true, $result);
         }
     }
 
@@ -120,9 +120,9 @@ class LiveController extends webApp
     {
         $params = request()->post();
         if(!$result = LiveService::make()->like($this->userId, $params)){
-            return message(LiveService::make()->getError(), false);
+            return showJson(LiveService::make()->getError(), false);
         }else{
-            return message(LiveService::make()->getError(), true, $result);
+            return showJson(LiveService::make()->getError(), true, $result);
         }
     }
 
@@ -136,13 +136,13 @@ class LiveController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'create');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = LiveService::make()->create($this->userId, $params)){
-            return message(LiveService::make()->getError(),false);
+            return showJson(LiveService::make()->getError(),false);
         }else{
-            return message(LiveService::make()->getError(),true, $result);
+            return showJson(LiveService::make()->getError(),true, $result);
         }
     }
 
@@ -154,9 +154,9 @@ class LiveController extends webApp
     {
         $params = request()->all();
         if(!$result = LiveService::make()->reward($this->userId, $params)){
-            return message(LiveService::make()->getError(),false);
+            return showJson(LiveService::make()->getError(),false);
         }else{
-            return message(LiveService::make()->getError(),true, $result);
+            return showJson(LiveService::make()->getError(),true, $result);
         }
     }
 }

app/Http/Controllers/Api/v1/LoginController.php

@@ -26,14 +26,14 @@ class LoginController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'email_login');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if (!$result = MemberService::make()->loginByEmail($params)) {
-            return message(MemberService::make()->getError(), false);
+            return showJson(MemberService::make()->getError(), false);
         }
 
-        return message(MemberService::make()->getError(), true, $result);
+        return showJson(MemberService::make()->getError(), true, $result);
     }
 
     /**
@@ -45,14 +45,14 @@ class LoginController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'sms_login');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if (!$result = MemberService::make()->loginByMobile($params)) {
-            return message(MemberService::make()->getError(), false);
+            return showJson(MemberService::make()->getError(), false);
         }
 
-        return message(MemberService::make()->getError(), true, $result);
+        return showJson(MemberService::make()->getError(), true, $result);
     }
 
     /**
@@ -64,14 +64,14 @@ class LoginController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'email_register');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if (!$result = MemberService::make()->register($params)) {
-            return message(MemberService::make()->getError(), false);
+            return showJson(MemberService::make()->getError(), false);
         }
 
-        return message(MemberService::make()->getError(), true, $result);
+        return showJson(MemberService::make()->getError(), true, $result);
     }
 
     /**
@@ -84,7 +84,7 @@ class LoginController extends webApp
         $params = $validator->check($params, 'sms');
         $appSources = isset($params['app_sources']) ? $params['app_sources'] : '';
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         // 发送验证码处理
@@ -93,16 +93,16 @@ class LoginController extends webApp
         switch ($type) {
             case 'reg':
                 if (MemberService::make()->checkPhoneExists($mobile)) {
-                    return message(2009, false, ['app_url' => ConfigService::make()->getConfigByCode("app_{$appSources}_url"),], 406);
+                    return showJson(2009, false, ['app_url' => ConfigService::make()->getConfigByCode("app_{$appSources}_url"),], 406);
                 }
                 break;
         }
 
         if (!SmsService::make()->send($mobile, $type)) {
-            return message(SmsService::make()->getError(), false);
+            return showJson(SmsService::make()->getError(), false);
         }
 
-        return message(1011, true);
+        return showJson(1011, true);
     }
 
     /**
@@ -115,7 +115,7 @@ class LoginController extends webApp
         $params = $validator->check($params, 'email');
         $appSources = isset($params['app_sources']) ? $params['app_sources'] : '';
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         // 发送验证码处理
@@ -124,20 +124,20 @@ class LoginController extends webApp
         switch ($scene) {
             case 'reg':
                 if (MemberService::make()->checkExists('email', $email)) {
-                    return message(2009, false, ['app_url' => ConfigService::make()->getConfigByCode("app_{$appSources}_url"),], 406);
+                    return showJson(2009, false, ['app_url' => ConfigService::make()->getConfigByCode("app_{$appSources}_url"),], 406);
                 }
                 break;
             case 'login':
                 if (!MemberService::make()->checkExists('email',$email)) {
-                    return message(2001, false, ['app_url' => ConfigService::make()->getConfigByCode("app_{$appSources}_url"),], 406);
+                    return showJson(2001, false, ['app_url' => ConfigService::make()->getConfigByCode("app_{$appSources}_url"),], 406);
                 }
                 break;
         }
 
         if (!EmailService::make()->send($email, $scene)) {
-            return message(EmailService::make()->getError(), false);
+            return showJson(EmailService::make()->getError(), false);
         }
 
-        return message(2020, true);
+        return showJson(2020, true);
     }
 }

app/Http/Controllers/Api/v1/MemberBankController.php

@@ -21,7 +21,7 @@ class MemberBankController extends webApp
         $pageSize = isset($params['pageSize'])? $params['pageSize'] : 18;
         $params['user_id'] = $this->userId;
         $datas = MemberBankService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -45,7 +45,7 @@ class MemberBankController extends webApp
             }
         }
 
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -55,14 +55,14 @@ class MemberBankController extends webApp
     {
         $params = $validator->check(request()->all(), 'save');
         if(!is_array($params)){
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(MemberBankService::make()->saveData($this->userId, $params)){
             RedisService::clear("caches:members:banks:{$this->userId}");
-            return message(MemberBankService::make()->getError(), true);
+            return showJson(MemberBankService::make()->getError(), true);
         }else{
-            return message(MemberBankService::make()->getError(), false);
+            return showJson(MemberBankService::make()->getError(), false);
         }
     }
 
@@ -73,7 +73,7 @@ class MemberBankController extends webApp
     public function options()
     {
         $datas = MemberBankService::make()->options($this->userId);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
 
@@ -86,9 +86,9 @@ class MemberBankController extends webApp
     {
         if(MemberBankService::make()->delete()){
             RedisService::clear("caches:members:banks:{$this->userId}");
-            return message(MemberBankService::make()->getError(), true);
+            return showJson(MemberBankService::make()->getError(), true);
         }else{
-            return message(MemberBankService::make()->getError(), false);
+            return showJson(MemberBankService::make()->getError(), false);
         }
     }
 }

app/Http/Controllers/Api/v1/MemberCollectController.php

@@ -24,9 +24,9 @@ class MemberCollectController extends webApp
         $pageSize = request()->post('pageSize', 12);
         $datas = MemberCollectService::make()->getDataList($this->userId, $params, $pageSize);
         if($datas){
-            return message(1010, true, $datas);
+            return showJson(1010, true, $datas);
         }else{
-            return message(1004, false, [],'403');
+            return showJson(1004, false, [],'403');
         }
     }
 
@@ -37,9 +37,9 @@ class MemberCollectController extends webApp
     public function cancel()
     {
         if(!MemberCollectService::make()->cancel($this->userId)){
-            return message(MemberCollectService::make()->getError(), false);
+            return showJson(MemberCollectService::make()->getError(), false);
         }else{
-            return message(MemberCollectService::make()->getError(), true);
+            return showJson(MemberCollectService::make()->getError(), true);
         }
     }
 

app/Http/Controllers/Api/v1/MemberController.php

@@ -28,9 +28,9 @@ class MemberController extends webApp
         $type = request()->post('type', 'detail');
         $info = MemberService::make()->getInfo($userId? $userId : $this->userId, $type,[], $this->userId);
         if($info){
-            return message(1010, true, $info);
+            return showJson(1010, true, $info);
         }else{
-            return message(2017, false, [],403);
+            return showJson(2017, false, [],403);
         }
     }
 
@@ -43,9 +43,9 @@ class MemberController extends webApp
         $userId = request()->post('id', 0);
         $info = MemberService::make()->getHomeInfo($userId, $this->userId);
         if($info){
-            return message(1010, true, $info);
+            return showJson(1010, true, $info);
         }else{
-            return message(1004, false, [],'403');
+            return showJson(1004, false, [],'403');
         }
     }
 
@@ -57,9 +57,9 @@ class MemberController extends webApp
     {
         $params = request()->post();
         if(!$result = MemberCollectService::make()->follow($this->userId, $params)){
-            return message(MemberCollectService::make()->getError(), false);
+            return showJson(MemberCollectService::make()->getError(), false);
         }else{
-            return message(MemberCollectService::make()->getError(), true, $result);
+            return showJson(MemberCollectService::make()->getError(), true, $result);
         }
     }
 
@@ -72,13 +72,13 @@ class MemberController extends webApp
         // 上传单图统一调取方法
         $result = upload_image($request, 'file','avatar');
         if (!$result['success']) {
-            return message($result['msg'],false,['url'=>'']);
+            return showJson($result['msg'],false,['url'=>'']);
         }
 
         // 文件路径
         $file_path = $result['data']['img_path'];
         if (!$file_path) {
-            return message('上传失败',false,['url'=>'']);
+            return showJson('上传失败',false,['url'=>'']);
         }
 
         // 网络域名拼接
@@ -88,9 +88,9 @@ class MemberController extends webApp
 
         $avatar = $result['data']['img_path'];
         if(MemberService::make()->saveAvatar($this->userId, $avatar)){
-            return message(1013,true,['url'=> $file_path,'path'=> $avatar]);
+            return showJson(1013,true,['url'=> $file_path,'path'=> $avatar]);
         }else{
-            return message(1014,false,['url'=>'']);
+            return showJson(1014,false,['url'=>'']);
         }
     }
 
@@ -103,13 +103,13 @@ class MemberController extends webApp
         // 上传单图统一调取方法
         $result = upload_image($request, 'file','payment');
         if (!$result['success']) {
-            return message($result['msg'],false,['url'=>'']);
+            return showJson($result['msg'],false,['url'=>'']);
         }
 
         // 文件路径
         $file_path = $result['data']['img_path'];
         if (!$file_path) {
-            return message('上传失败',false,['url'=>'']);
+            return showJson('上传失败',false,['url'=>'']);
         }
 
         // 网络域名拼接
@@ -119,9 +119,9 @@ class MemberController extends webApp
 
         $qrcode = $result['data']['img_path'];
         if(MemberService::make()->saveQrcode($this->userId, ['wxpay'=> $qrcode])){
-            return message(1013,true,['url'=> $file_path,'path'=> $qrcode]);
+            return showJson(1013,true,['url'=> $file_path,'path'=> $qrcode]);
         }else{
-            return message(1014,false,['url'=>'']);
+            return showJson(1014,false,['url'=>'']);
         }
     }
 
@@ -134,13 +134,13 @@ class MemberController extends webApp
         // 上传单图统一调取方法
         $result = upload_image($request, 'file','payment');
         if (!$result['success']) {
-            return message($result['msg'],false,['url'=>'']);
+            return showJson($result['msg'],false,['url'=>'']);
         }
 
         // 文件路径
         $file_path = $result['data']['img_path'];
         if (!$file_path) {
-            return message('上传失败',false,['url'=>'']);
+            return showJson('上传失败',false,['url'=>'']);
         }
 
         // 网络域名拼接
@@ -150,9 +150,9 @@ class MemberController extends webApp
 
         $qrcode = $result['data']['img_path'];
         if(MemberService::make()->saveQrcode($this->userId, ['alipay'=> $qrcode])){
-            return message(1013,true,['url'=> $file_path,'path'=> $qrcode]);
+            return showJson(1013,true,['url'=> $file_path,'path'=> $qrcode]);
         }else{
-            return message(1014,false,['url'=>'']);
+            return showJson(1014,false,['url'=>'']);
         }
     }
 
@@ -167,13 +167,13 @@ class MemberController extends webApp
         $scene = isset($params['scene'])? $params['scene'] : 'modify';
         $params = $validator->check($params, $scene);
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!MemberService::make()->modify($this->userId, $params)){
-            return message(MemberService::make()->getError(),false);
+            return showJson(MemberService::make()->getError(),false);
         }else{
-            return message(1013,true);
+            return showJson(1013,true);
         }
     }
 
@@ -187,13 +187,13 @@ class MemberController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'auth');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!MemberService::make()->auth($this->userId, $params)){
-            return message(MemberService::make()->getError(),false);
+            return showJson(MemberService::make()->getError(),false);
         }else{
-            return message(MemberService::make()->getError(),true);
+            return showJson(MemberService::make()->getError(),true);
         }
     }
 
@@ -207,7 +207,7 @@ class MemberController extends webApp
         $pageSize = request()->post('pageSize', 15);
         $userId = isset($params['user_id']) && $params['user_id']>0? $params['user_id'] : $this->userId;
         $datas = MemberService::make()->getTeamList($userId, $params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
 
@@ -220,9 +220,9 @@ class MemberController extends webApp
         $params = request()->all();
         if(!ImChatService::make()->buyChat($this->userId, $params)){
             $code= ImChatService::make()->getError();
-            return message($code,false,'',$code==2403? 405 : 0);
+            return showJson($code,false,'',$code==2403? 405 : 0);
         }else{
-            return message(ImChatService::make()->getError(),true);
+            return showJson(ImChatService::make()->getError(),true);
         }
     }
 
@@ -237,14 +237,14 @@ class MemberController extends webApp
         $scene = isset($params['scene'])? $params['scene'] : 'transfer';
         $params = $validator->check($params, $scene);
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!MemberService::make()->transfer($this->userId, $params)){
             $error = MemberService::make()->getError();
-            return message($error,false,'',$error==1039?401:-1);
+            return showJson($error,false,'',$error==1039?401:-1);
         }else{
-            return message(MemberService::make()->getError(),true);
+            return showJson(MemberService::make()->getError(),true);
         }
     }
 
@@ -259,14 +259,14 @@ class MemberController extends webApp
         $scene = isset($params['scene'])? $params['scene'] : 'recharge';
         $params = $validator->check($params, $scene);
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MemberService::make()->recharge($this->userId, $params)){
             $error = MemberService::make()->getError();
-            return message($error,false, [],$error== 2035? 405:0);
+            return showJson($error,false, [],$error== 2035? 405:0);
         }else{
-            return message(MemberService::make()->getError(),true, $result);
+            return showJson(MemberService::make()->getError(),true, $result);
         }
     }
 
@@ -281,14 +281,14 @@ class MemberController extends webApp
         $scene = isset($params['scene'])? $params['scene'] : 'withdraw';
         $params = $validator->check($params, $scene);
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MemberService::make()->withdraw($this->userId, $params)){
             $error = MemberService::make()->getError();
-            return message($error,false,'',$error==1039?401:-1);
+            return showJson($error,false,'',$error==1039?401:-1);
         }else{
-            return message(MemberService::make()->getError(),true, $result);
+            return showJson(MemberService::make()->getError(),true, $result);
         }
     }
 }

app/Http/Controllers/Api/v1/MerchantController.php

@@ -26,9 +26,9 @@ class MerchantController extends webApp
         $id = request()->post('id', 0);
         $info = MerchantService::make()->getInfoById($id, $type, $this->userId);
         if($info){
-            return message(1010, true, $info);
+            return showJson(1010, true, $info);
         }else{
-            return message(2216, false, [],'404');
+            return showJson(2216, false, [],'404');
         }
     }
 
@@ -41,9 +41,9 @@ class MerchantController extends webApp
     {
         $info = MemberService::make()->getInfo($this->userId, 'home');
         if($info){
-            return message(1010, true, $info);
+            return showJson(1010, true, $info);
         }else{
-            return message(1004, false, [],'403');
+            return showJson(1004, false, [],'403');
         }
     }
 
@@ -56,7 +56,7 @@ class MerchantController extends webApp
         $params = request()->all();
         $type = isset($params['show_type'])? $params['show_type'] : 1;
         $data = MerchantCategoryService::make()->getOptions($type);
-        return message(1010, true, $data);
+        return showJson(1010, true, $data);
     }
 
     /**
@@ -68,7 +68,7 @@ class MerchantController extends webApp
         $pageSize = request()->post('pageSize', 12);
         $params = request()->all();
         $datas = MerchantService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -80,13 +80,13 @@ class MerchantController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'apply');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MerchantService::make()->apply($this->userId, $params)){
-            return message(MerchantService::make()->getError(), false);
+            return showJson(MerchantService::make()->getError(), false);
         }else{
-            return message(MerchantService::make()->getError(), true, $result);
+            return showJson(MerchantService::make()->getError(), true, $result);
         }
     }
 
@@ -99,9 +99,9 @@ class MerchantController extends webApp
     {
         $info = MerchantService::make()->getApplyInfo($this->userId);
         if($info){
-            return message(1010, true, $info);
+            return showJson(1010, true, $info);
         }else{
-            return message(1009, false);
+            return showJson(1009, false);
         }
 
     }
@@ -115,13 +115,13 @@ class MerchantController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'info');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MerchantService::make()->applyConfirm($this->userId, $params)){
-            return message(MerchantService::make()->getError(), false);
+            return showJson(MerchantService::make()->getError(), false);
         }else{
-            return message(MerchantService::make()->getError(), true, $result);
+            return showJson(MerchantService::make()->getError(), true, $result);
         }
     }
 
@@ -134,13 +134,13 @@ class MerchantController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'info');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MerchantService::make()->lock($this->userId, $params)){
-            return message(MerchantService::make()->getError(), false);
+            return showJson(MerchantService::make()->getError(), false);
         }else{
-            return message(MerchantService::make()->getError(), true, $result);
+            return showJson(MerchantService::make()->getError(), true, $result);
         }
     }
 
@@ -155,13 +155,13 @@ class MerchantController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'info');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!MerchantService::make()->modify($this->userId, $params)){
-            return message(MerchantService::make()->getError(),false);
+            return showJson(MerchantService::make()->getError(),false);
         }else{
-            return message(MerchantService::make()->getError(),true);
+            return showJson(MerchantService::make()->getError(),true);
         }
     }
 
@@ -176,13 +176,13 @@ class MerchantController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'info');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!MerchantService::make()->saveInfo($this->userId, $params)){
-            return message(MerchantService::make()->getError(),false);
+            return showJson(MerchantService::make()->getError(),false);
         }else{
-            return message(MerchantService::make()->getError(),true);
+            return showJson(MerchantService::make()->getError(),true);
         }
     }
 
@@ -196,13 +196,13 @@ class MerchantController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'collect');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MerchantService::make()->collect($this->userId, $params)){
-            return message(MerchantService::make()->getError(), false);
+            return showJson(MerchantService::make()->getError(), false);
         }else{
-            return message(MerchantService::make()->getError(), true, $result);
+            return showJson(MerchantService::make()->getError(), true, $result);
         }
     }
 
@@ -216,13 +216,13 @@ class MerchantController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'deposit');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MerchantService::make()->deposit($this->userId, $params)){
-            return message(MerchantService::make()->getError(),false);
+            return showJson(MerchantService::make()->getError(),false);
         }else{
-            return message(MerchantService::make()->getError(),true, $result);
+            return showJson(MerchantService::make()->getError(),true, $result);
         }
     }
 
@@ -236,13 +236,13 @@ class MerchantController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'reback_deposit');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = MerchantService::make()->rebackDeposit($this->userId, $params)){
-            return message(MerchantService::make()->getError(),false);
+            return showJson(MerchantService::make()->getError(),false);
         }else{
-            return message(MerchantService::make()->getError(),true);
+            return showJson(MerchantService::make()->getError(),true);
         }
     }
 }

app/Http/Controllers/Api/v1/MessageController.php

@@ -21,7 +21,7 @@ class MessageController extends webApp
     public function index()
     {
         $datas = MessageService::make()->getGroupList($this->userId);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -33,7 +33,7 @@ class MessageController extends webApp
         $params = request()->post();
         $pageSize = request()->post('pageSize', 20);
         $datas = MessageService::make()->getDataList($this->userId, $params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -45,7 +45,7 @@ class MessageController extends webApp
         $params = request()->post();
         $pageSize = request()->post('pageSize', 20);
         $datas = MessageService::make()->getLiveDataList($this->userId, $params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -57,7 +57,7 @@ class MessageController extends webApp
         $params = request()->post();
         $pageSize = request()->post('pageSize', 20);
         $datas = MessageService::make()->getDataListFromatKey($this->userId, $params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
 
@@ -77,7 +77,7 @@ class MessageController extends webApp
             ];
         }
 
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -88,9 +88,9 @@ class MessageController extends webApp
     {
         $params = request()->post();
         if(!$result = MemberSettingService::make()->setMsgData($this->userId, $params)){
-            return message(1020, false);
+            return showJson(1020, false);
         }else{
-            return message(1019, true);
+            return showJson(1019, true);
         }
     }
 
@@ -103,9 +103,9 @@ class MessageController extends webApp
         $chatKey = request()->post('chat_key','');
         $type = request()->post('type',0);
         if(!$result = MessageService::make()->setRead($this->userId, $type, $chatKey)){
-            return message(1020, false);
+            return showJson(1020, false);
         }else{
-            return message(1019, true);
+            return showJson(1019, true);
         }
     }
 
@@ -121,19 +121,19 @@ class MessageController extends webApp
         $msgType = request()->post('msg_type',1);
         if($type == 1){
             if(!$result = MessageService::make()->setHide($this->userId, $msgType)){
-                return message(1020, false);
+                return showJson(1020, false);
             }else{
-                return message(1019, true);
+                return showJson(1019, true);
             }
         }else if($type == 2){
             if(!$result = ImChatService::make()->setHide($this->userId, $chatKey)){
-                return message(1020, false);
+                return showJson(1020, false);
             }else{
-                return message(1019, true);
+                return showJson(1019, true);
             }
         }
 
-        return message(1020, false);
+        return showJson(1020, false);
     }
 
     /**
@@ -145,9 +145,9 @@ class MessageController extends webApp
         $chatKey = request()->post('chat_key','');
         $type = request()->post('msg_type', 0);
         if(!$result = MessageService::make()->clear($this->userId, $chatKey, $type)){
-            return message(1003, false);
+            return showJson(1003, false);
         }else{
-            return message(1002, true);
+            return showJson(1002, true);
         }
     }
 
@@ -159,9 +159,9 @@ class MessageController extends webApp
     {
         $type = request()->post('type', 0);
         if(!$result = MessageService::make()->clearAll($this->userId, $type)){
-            return message(1003, false);
+            return showJson(1003, false);
         }else{
-            return message(1002, true);
+            return showJson(1002, true);
         }
     }
 
@@ -173,6 +173,6 @@ class MessageController extends webApp
     public function unread()
     {
         $result = MessageService::make()->getUnreadCount($this->userId);
-        return message(1010, true, $result);
+        return showJson(1010, true, $result);
     }
 }

app/Http/Controllers/Api/v1/MusicController.php

@@ -21,7 +21,7 @@ class MusicController extends webApp
         $params = request()->post();
         $pageSize = request()->post('pageSize',20);
         $datas = MusicService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -33,9 +33,9 @@ class MusicController extends webApp
     {
         $params = request()->all();
         if(!$info = MusicService::make()->getInfo($params['hash'])){
-            return message(MusicService::make()->getError(),false);
+            return showJson(MusicService::make()->getError(),false);
         }else{
-            return message(1010,true, $info);
+            return showJson(1010,true, $info);
         }
     }
 

app/Http/Controllers/Api/v1/OrderController.php

@@ -25,7 +25,7 @@ class OrderController extends webApp
         $pageSize = request()->post('pageSize', 15);
         $params['user_id'] = $this->userId;
         $datas = OrderService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -38,7 +38,7 @@ class OrderController extends webApp
         $pageSize = request()->post('pageSize', 15);
         $params['user_id'] = isset($params['user_id'])? $params['user_id'] : 0;
         $datas = OrderService::make()->getDataList($params, $pageSize);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -51,11 +51,11 @@ class OrderController extends webApp
         $orderNo = isset($params['order_no'])? $params['order_no'] : '';
         $id = isset($params['id'])? intval($params['id']) : 0;
         if ($id<=0 && empty($orderNo)) {
-            return message(2014, false);
+            return showJson(2014, false);
         }
 
         $datas = OrderService::make()->getInfo($id>0? $id:$orderNo, $this->userId);
-        return message(1010, true, $datas);
+        return showJson(1010, true, $datas);
     }
 
     /**
@@ -68,14 +68,14 @@ class OrderController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'buy');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = OrderService::make()->buyService($this->userId, $params)){
             $error = OrderService::make()->getError();
-            return message($error, false, '',$error==1039?401: ($error == 2035? 405: -1));
+            return showJson($error, false, '',$error==1039?401: ($error == 2035? 405: -1));
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -89,14 +89,14 @@ class OrderController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'cart');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
 
         if(!$result = OrderService::make()->buyCart($this->userId, $params)){
             $error = OrderService::make()->getError();
-            return message($error, false, '',$error==1039?401:-1);
+            return showJson($error, false, '',$error==1039?401:-1);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -109,9 +109,9 @@ class OrderController extends webApp
     {
         $params = request()->all();
         if(!$result = OrderService::make()->refund($this->userId, $params)){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -123,9 +123,9 @@ class OrderController extends webApp
     {
         $params = request()->all();
         if(!$result = OrderService::make()->refundCancel($this->userId, $params)){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -137,9 +137,9 @@ class OrderController extends webApp
     {
         $params = request()->all();
         if(!$result = OrderService::make()->refundConfirm($this->userId, $params)){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -150,9 +150,9 @@ class OrderController extends webApp
     public function picker()
     {
         if(!$result = OrderService::make()->picker()){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -163,9 +163,9 @@ class OrderController extends webApp
     public function delivery()
     {
         if(!$result = OrderService::make()->delivery()){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -176,9 +176,9 @@ class OrderController extends webApp
     public function inService()
     {
         if(!$result = OrderService::make()->inService()){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -191,7 +191,7 @@ class OrderController extends webApp
         $userId = request()->post('id',0);
         $userType = request()->post('type',0);
         $result = OrdersService::make()->countByWait($userId,$userType);
-        return message(1010, true, $result);
+        return showJson(1010, true, $result);
     }
 
     /**
@@ -202,9 +202,9 @@ class OrderController extends webApp
     {
         $params = request()->all();
         if(!$result = OrderService::make()->complete($this->userId,$params)){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -218,12 +218,12 @@ class OrderController extends webApp
         $params = request()->all();
         $params = $validator->check($params, 'comment');
         if (!is_array($params)) {
-            return message($params, false);
+            return showJson($params, false);
         }
         if(!$result = OrderService::make()->comment($this->userId,$params)){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -234,9 +234,9 @@ class OrderController extends webApp
     public function delete()
     {
         if(!$result = OrderService::make()->delete()){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 
@@ -247,9 +247,9 @@ class OrderController extends webApp
     public function hide()
     {
         if(!$result = OrderService::make()->hide()){
-            return message(OrderService::make()->getError(), false);
+            return showJson(OrderService::make()->getError(), false);
         }else{
-            return message(OrderService::make()->getError(), true, $result);
+            return showJson(OrderService::make()->getError(), true, $result);
         }
     }
 }

app/Http/Controllers/Api/v1/TestController.php

@@ -22,6 +22,6 @@ class TestController extends webApp
             }
         }
 
-        return message(WalletService::make()->getError(),true, $result);
+        return showJson(WalletService::make()->getError(),true, $result);
     }
 }

app/Http/Controllers/Api/v1/VideoController.php

@@ -26,10 +26,10 @@ class VideoController extends webApp
            $pageSize = request()->post('pageSize', 0);
            $params['is_recommend'] = 1;
            $datas = VideoService::make()->getIndexList($params, $pageSize,'', $this->userId);
-           return message(1010, true, $datas);
+           return showJson(1010, true, $datas);
        } catch (\Exception $exception){
-           RedisService::set("caches:request:error_video_index", ['error'=>$exception->getMessage(),'trace'=>$exception->getTrace()], 7200);
-           return message(1018, false, ['error'=>env('APP_DEBUG')? $exception->getMessage() : '']);
+           RedisService::set("caches:request:error_video_index", ['error'=>$exception->getshowJson(),'trace'=>$exception->getTrace()], 7200);
+           return showJson(1018, false, ['error'=>env('APP_DEBUG')? $exception->getshowJson() : '']);
        }
     }
 
@@ -61,10 +61,10 @@ class VideoController extends webApp
 
             }
 
-            return message(1010, true, $datas);
+            return showJson(1010, true, $datas);
         } catch (\Exception $exception){
-            RedisService::set("caches:request:error_video_list", ['error'=>$exception->getMessage(),'trace'=>$exception->getTrace()], 7200);
-            return message(1018, false, ['error'=>env('APP_DEBUG')? $exception->getTrace() : '']);
+            RedisService::set("caches:request:error_video_list", ['error'=>$exception->getshowJson(),'trace'=>$exception->getTrace()], 7200);
+            return showJson(1018, false, ['error'=>env('APP_DEBUG')? $exception->getTrace() : '']);
         }
     }
 
@@ -77,7 +77,7 @@ class VideoController extends webApp
     {
         $id = request()->post('id', 0);
         $info = VideoService::make()->getInfo($id, $this->userId);
-        return message(1010, true, $info);
+        return showJson(1010, true, $info);
     }
 
 
@@ -89,9 +89,9 @@ class VideoController extends webApp
     {
         $params = request()->all();
         if(!$result = VideoService::make()->publish($this->userId, $params, $request)){
-            return message(VideoService::make()->getError(), false);
+            return showJson(VideoService::make()->getError(), false);
         }else{
-            return message(VideoService::make()->getError(), true, $result);
+            return showJson(VideoService::make()->getError(), true, $result);
         }
     }
 
@@ -103,9 +103,9 @@ class VideoController extends webApp
     {
         $id = request()->post('id',0);
         if(!$result = VideoService::make()->updatePlay($this->userId, $id)){
-            return message(VideoService::make()->getError(), false);
+            return showJson(VideoService::make()->getError(), false);
         }else{
-            return message(VideoService::make()->getError(), true, $result);
+            return showJson(VideoService::make()->getError(), true, $result);
         }
     }
 
@@ -117,9 +117,9 @@ class VideoController extends webApp
     {
         $params = request()->post();
         if(!$result = VideoCollectService::make()->collect($this->userId, $params)){
-            return message(VideoCollectService::make()->getError(), false);
+            return showJson(VideoCollectService::make()->getError(), false);
         }else{
-            return message(VideoCollectService::make()->getError(), true, $result);
+            return showJson(VideoCollectService::make()->getError(), true, $result);
         }
     }
 
@@ -131,9 +131,9 @@ class VideoController extends webApp
     {
         $params = request()->post();
         if(!$result = VideoCollectService::make()->collect($this->userId, $params)){
-            return message(VideoCollectService::make()->getError(), false);
+            return showJson(VideoCollectService::make()->getError(), false);
         }else{
-            return message(VideoCollectService::make()->getError(), true, $result);
+            return showJson(VideoCollectService::make()->getError(), true, $result);
         }
     }
 
@@ -144,9 +144,9 @@ class VideoController extends webApp
     public function status()
     {
         if(!$result = VideoService::make()->status()){
-            return message(VideoService::make()->getError(), false);
+            return showJson(VideoService::make()->getError(), false);
         }else{
-            return message(VideoService::make()->getError(), true, $result);
+            return showJson(VideoService::make()->getError(), true, $result);
         }
     }
 
@@ -157,9 +157,9 @@ class VideoController extends webApp
     public function delete()
     {
         if(!$result = VideoService::make()->delete()){
-            return message(VideoService::make()->getError(), false);
+            return showJson(VideoService::make()->getError(), false);
         }else{
-            return message(VideoService::make()->getError(), true);
+            return showJson(VideoService::make()->getError(), true);
         }
     }