正在显示
3 个修改的文件
包含
2 行增加
和
26 行删除
| @@ -124,27 +124,4 @@ class BaseController extends Controller | @@ -124,27 +124,4 @@ class BaseController extends Controller | ||
| 124 | $response = response($result,$result_code,$this->header); | 124 | $response = response($result,$result_code,$this->header); |
| 125 | throw new HttpResponseException($response); | 125 | throw new HttpResponseException($response); |
| 126 | } | 126 | } |
| 127 | - | ||
| 128 | - /** | ||
| 129 | - * @remark :返回json | ||
| 130 | - * @name :success | ||
| 131 | - * @author :lyh | ||
| 132 | - * @method :post | ||
| 133 | - * @time :2023/8/28 10:18 | ||
| 134 | - */ | ||
| 135 | - function success(array $data = [], string $code = Code::SUCCESS, bool $objectData = false): JsonResponse | ||
| 136 | - { | ||
| 137 | - if ($objectData) { | ||
| 138 | - $data = (object)$data; | ||
| 139 | - } | ||
| 140 | - $code = Code::fromValue($code); | ||
| 141 | - $response = [ | ||
| 142 | - 'code' => $code->value, | ||
| 143 | - 'data' => $data, | ||
| 144 | - 'message' => $code->description, | ||
| 145 | - ]; | ||
| 146 | - $this->header['token'] = $this->token; | ||
| 147 | - return response()->json($response,200,$this->header); | ||
| 148 | - } | ||
| 149 | - | ||
| 150 | } | 127 | } |
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | namespace App\Http\Controllers\Aside\Collect; | 3 | namespace App\Http\Controllers\Aside\Collect; |
| 4 | 4 | ||
| 5 | +use App\Enums\Common\Code; | ||
| 5 | use App\Http\Controllers\Aside\BaseController; | 6 | use App\Http\Controllers\Aside\BaseController; |
| 6 | use App\Http\Logic\Aside\CollectLogic; | 7 | use App\Http\Logic\Aside\CollectLogic; |
| 7 | 8 | ||
| @@ -22,6 +23,6 @@ class CollectController extends BaseController | @@ -22,6 +23,6 @@ class CollectController extends BaseController | ||
| 22 | public function index(CollectLogic $collectLogic) | 23 | public function index(CollectLogic $collectLogic) |
| 23 | { | 24 | { |
| 24 | $data = $collectLogic->collect_data(); | 25 | $data = $collectLogic->collect_data(); |
| 25 | - return $this->success($data); | 26 | + $this->response('success',Code::SUCCESS,$data); |
| 26 | } | 27 | } |
| 27 | } | 28 | } |
| @@ -7,9 +7,7 @@ use App\Http\Controllers\Bside\BaseController; | @@ -7,9 +7,7 @@ use App\Http\Controllers\Bside\BaseController; | ||
| 7 | use App\Http\Logic\Bside\BTemplate\BTemplateLogic; | 7 | use App\Http\Logic\Bside\BTemplate\BTemplateLogic; |
| 8 | use App\Http\Requests\Bside\Template\TemplateRequest; | 8 | use App\Http\Requests\Bside\Template\TemplateRequest; |
| 9 | use App\Models\Template\BTemplate; | 9 | use App\Models\Template\BTemplate; |
| 10 | -use App\Models\Template\BTemplateMain; | ||
| 11 | use App\Models\Template\Setting; | 10 | use App\Models\Template\Setting; |
| 12 | -use App\Models\Template\Template; | ||
| 13 | 11 | ||
| 14 | class BTemplateController extends BaseController | 12 | class BTemplateController extends BaseController |
| 15 | { | 13 | { |
-
请 注册 或 登录 后发表评论