登录、上传文件优化

app/admin/controller/User.php

@@ -29,24 +29,35 @@ class User extends Base
         $rs = json_decode($rs, true);
 
         if (!isset($rs['code']) || $rs['code'] != 0) return json_show(1004, $rs['message']);
+        
+        if ($rs['data']['level'] == 1) {
+            //超管
+            $data = array_merge($rs['data'], [
+                'role_name' => '',
+                'role_level' => $rs['data']['level'] ?? '',
+                'role_id' => '',
+            ]);
 
-        $role = Db::name('user_role')
-            ->where(['uid' => $rs['data']['id'], 'is_main' => 1, 'is_del' => 0])
-            ->findOrEmpty();
+        } else {
 
-        if (empty($role)) return json_show(1004, '没有默认角色，无法登录');
+            $role = Db::name('user_role')
+                ->where(['uid' => $rs['data']['id'], 'is_main' => 1, 'is_del' => 0])
+                ->findOrEmpty();
 
-        $roleinfo = Db::name('role')
-            ->where(['id' => $role['roleid']])
-            ->field('role_name')
-            ->find();
+            if (empty($role)) return json_show(1004, '没有默认角色，无法登录，请联系管理员');
 
-        //数据合并
-        $data = array_merge($rs['data'], [
-            'role_name' => $roleinfo['role_name'] ?? '',
-            'role_level' => $rs['data']['level'] ?? '',
-            'role_id' => $role['roleid'] ?? '',
-        ]);
+            $roleinfo = Db::name('role')
+                ->where(['id' => $role['roleid']])
+                ->field('role_name')
+                ->find();
+
+            //数据合并
+            $data = array_merge($rs['data'], [
+                'role_name' => $roleinfo['role_name'] ?? '',
+                'role_level' => $rs['data']['level'] ?? '',
+                'role_id' => $role['roleid'] ?? '',
+            ]);
+        }
 
         return json_show(0, '登录成功', $data);
 

app/common.php

@@ -213,18 +213,20 @@ function UploadImg($files)
         //验证
         validate(['imgFile' => ['fileSize' => 10240000, 'fileExt' => 'jpg,jpeg,png,bmp,gif', 'fileMime' => 'image/jpeg,image/png,image/gif']])->check(['imgFile' => $files]);
 
-        foreach ($files as $file) {
+        //文件存放路径
+        $root = config('filesystem.disks.public.root') . DIRECTORY_SEPARATOR;
+        $url = 'topic' . DIRECTORY_SEPARATOR . date("Ymd") . DIRECTORY_SEPARATOR;
 
-            //文件存放路径
-            $root = config('filesystem.disks.public.root') . DIRECTORY_SEPARATOR;
-            $url = 'topic' . DIRECTORY_SEPARATOR . date("Ymd");
+        if (is_dir($root . $url) == false) mkdir($root . $url, 0777, true);
+
+        foreach ($files as $file) {
 
             //文件名
             $file_name = str_replace('.' . $file->getOriginalExtension(), "_" . date('YmdHis') . '.' . $file->getOriginalExtension(), $file->getOriginalName());
 
             $file->move($root . $url, $file_name);
 
-            $temp = ["url" => $url . DIRECTORY_SEPARATOR . $file_name, "name" => $file->getOriginalName()];
+            $temp = ["url" => $url . $file_name, "name" => $file->getOriginalName()];
             $savename[] = $temp;
         }
 
@@ -243,8 +245,7 @@ function UploadFile($files)
     $files = !is_array($files) ? [$files] : $files;
     try {
         //验证
-        validate(['imgFile' => ['fileSize' => 10240000, 'fileExt' => 'xlsx,xls,pdf,zip,rar,7z,doc,docx']])->check(['imgFile' =>
-            $files]);
+        validate(['imgFile' => ['fileSize' => 10240000, 'fileExt' => 'xlsx,xls,pdf,zip,rar,7z,doc,docx']])->check(['imgFile' => $files]);
 
         foreach ($files as $file) {
 //            $url = Filesystem::disk('public')->putFile('files/' . date("Ymd"), $file, function () use ($file) {
@@ -256,14 +257,14 @@ function UploadFile($files)
 
             //文件存放路径
             $root = config('filesystem.disks.public.root') . DIRECTORY_SEPARATOR;
-            $url = 'files' . DIRECTORY_SEPARATOR . date("Ymd");
+            $url = 'files' . DIRECTORY_SEPARATOR . date("Ymd") . DIRECTORY_SEPARATOR;
 
             //文件名
             $file_name = str_replace('.' . $file->getOriginalExtension(), "_" . date('YmdHis') . '.' . $file->getOriginalExtension(), $file->getOriginalName());
 
             $file->move($root . $url, $file_name);
 
-            $temp = ["url" => $url . DIRECTORY_SEPARATOR . $file_name, "name" => $file->getOriginalName()];
+            $temp = ["url" => $url . $file_name, "name" => $file->getOriginalName()];
 
             $savename[] = $temp;
         }
@@ -296,14 +297,14 @@ function UploadVideo($files)
 
             //文件存放路径
             $root = config('filesystem.disks.public.root') . DIRECTORY_SEPARATOR;
-            $url = 'video' . DIRECTORY_SEPARATOR . date("Ymd");
+            $url = 'video' . DIRECTORY_SEPARATOR . date("Ymd") . DIRECTORY_SEPARATOR;
 
             //文件名
             $file_name = str_replace('.' . $file->getOriginalExtension(), "_" . date('YmdHis') . '.' . $file->getOriginalExtension(), $file->getOriginalName());
 
             $file->move($root . $url, $file_name);
 
-            $temp = ["url" => $url . DIRECTORY_SEPARATOR . $file_name, "name" => $file->getOriginalName()];
+            $temp = ["url" => $url . $file_name, "name" => $file->getOriginalName()];
 
             $savename[] = $temp;
         }