Weenier utc项目部署 0625

app/Http/Controllers/Admin/UploadController.php

@@ -0,0 +1,83 @@
+<?php
+// +----------------------------------------------------------------------
+// | LARAVEL8.0 框架 [ LARAVEL ][ RXThinkCMF ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 LARAVEL研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: laravel开发员 <laravel.qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Http\Controllers\Admin;
+
+use Illuminate\Http\Request;
+
+/**
+ * 上传文件-控制器
+ * @author laravel开发员
+ * @since 2020/11/11
+ * Class UploadController
+ * @package App\Http\Controllers
+ */
+class UploadController extends Backend
+{
+
+    /**
+     * 上传图片
+     * @param Request $request 网络请求
+     * @return array
+     * @author laravel开发员
+     * @since 2020/11/11
+     */
+    public function uploadImage(Request $request)
+    {
+        // 上传单图统一调取方法
+        $result = upload_image($request, 'file');
+        if (!$result['success']) {
+            return message($result['message'], false);
+        }
+
+        // 文件路径
+        $file_path = $result['data']['img_path'];
+        if (!$file_path) {
+            return message("文件上传失败", false);
+        }
+
+        // 网络域名拼接
+        if (strpos($file_path, IMG_URL) === false) {
+            $file_path = IMG_URL . $file_path;
+        }
+
+        // 返回结果
+        return message(MESSAGE_OK, true, $file_path);
+    }
+
+    /**
+     * 上传文件(单个上传)
+     * @param Request $request
+     * @since 2020/11/11
+     * @author laravel开发员
+     */
+    public function uploadFile(Request $request)
+    {
+        $result = upload_file($request);
+        if (!$result['success']) {
+            $this->jsonReturn(MESSAGE_FAILED, false, $result['message']);
+        }
+        // 文件路径
+        $file_path = $result['data']['file_path'];
+        if (!$file_path) {
+            $this->jsonReturn(message("文件上传失败"));
+        }
+
+        // 网络域名拼接
+        if (strpos($file_path, IMG_URL) === false) {
+            $file_path = IMG_URL . $file_path;
+        }
+
+        // 返回结果
+        $this->jsonReturn(MESSAGE_OK, true, $file_path);
+    }
+
+}

app/Http/Controllers/RoleController.php

@@ -1,72 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | LARAVEL8.0 框架 [ LARAVEL ][ RXThinkCMF ]
-// +----------------------------------------------------------------------
-// | 版权所有 2017~2021 LARAVEL研发中心
-// +----------------------------------------------------------------------
-// | 官方网站: http://www.laravel.cn
-// +----------------------------------------------------------------------
-// | Author: laravel开发员 <laravel.qq.com>
-// +----------------------------------------------------------------------
-
-namespace App\Http\Controllers;
-
-use App\Services\RoleService;
-
-/**
- * 角色管理-控制器
- * @author laravel开发员
- * @since 2020/11/11
- * Class RoleController
- * @package App\Http\Controllers
- */
-class RoleController extends Backend
-{
-    /**
-     * 构造函数
-     * @author laravel开发员
-     * @since 2020/11/11
-     * RoleController constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->service = new RoleService();
-    }
-
-    /**
-     * 获取角色列表
-     * @return mixed
-     * @since 2020/11/11
-     * @author laravel开发员
-     */
-    public function getRoleList()
-    {
-        $result = $this->service->getRoleList();
-        return $result;
-    }
-
-    /**
-     * 获取角色权限列表
-     * @author laravel开发员
-     * @since 2020/11/11
-     */
-    public function getPermissionList()
-    {
-        $result = $this->service->getPermissionList();
-        return $result;
-    }
-
-    /**
-     * 保存权限
-     * @return mixed
-     * @since 2020/11/11
-     * @author laravel开发员
-     */
-    public function savePermission()
-    {
-        $result = $this->service->savePermission();
-        return $result;
-    }
-
-}

app/Services/EmailService.php

@@ -86,8 +86,9 @@ class EmailService extends BaseService
             $template = str_replace('{code}', $code, $template);
             // 上锁
             RedisService::set($cacheKey.'_lock', ['email'=> $email, 'code'=> $code, 'date'=> date('Y-m-d H:i:s')], rand(5, 10));
-            if ($result =Mail::send('emails.index', ['title' => $title,'template'=> $template], function ($message) use ($email, $template) {
+            if (Mail::send('emails.index', ['title' => $title,'template'=> $template], function ($message) use ($email, $template, &$result) {
                 $to = $email;
+                $message->from($this->config['username'],'UTC交易平台');
                 $message->to($to)->subject($template);
             })) {
                 RedisService::set($cacheKey, ['email'=> $email, 'code'=> $code, 'date'=> date('Y-m-d H:i:s')], 300);