From aa885e4b410aaf66e933b8cb98613b846e9e2f00 Mon Sep 17 00:00:00 2001
From: dawuliao <dawu.liao@emdoor.com>
Date: Mon, 26 Jun 2023 14:08:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[feature]=20=E6=9C=AC=E5=9C=B0=E5=90=AF?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/yarn.lock         | 11 +++--------
 server/public/.htaccess |  8 --------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/admin/yarn.lock b/admin/yarn.lock
index 3d06ce999..9bbde1467 100644
--- a/admin/yarn.lock
+++ b/admin/yarn.lock
@@ -1802,10 +1802,10 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3:
     d "^1.0.1"
     ext "^1.1.2"
 
-esbuild-darwin-arm64@0.14.53:
+esbuild-windows-64@0.14.53:
   version "0.14.53"
-  resolved "https://registry.npmmirror.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.53.tgz"
-  integrity sha512-otJwDU3hnI15Q98PX4MJbknSZ/WSR1I45il7gcxcECXzfN4Mrpft5hBDHXNRnCh+5858uPXBXA1Vaz2jVWLaIA==
+  resolved "https://registry.npmmirror.com/esbuild-windows-64/-/esbuild-windows-64-0.14.53.tgz"
+  integrity sha512-s9skQFF0I7zqnQ2K8S1xdLSfZFsPLuOGmSx57h2btSEswv0N0YodYvqLcJMrNMXh6EynOmWD7rz+0rWWbFpIHQ==
 
 esbuild@^0.14.47:
   version "0.14.53"
@@ -2223,11 +2223,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
-
 function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"
diff --git a/server/public/.htaccess b/server/public/.htaccess
index cbc786893..e69de29bb 100644
--- a/server/public/.htaccess
+++ b/server/public/.htaccess
@@ -1,8 +0,0 @@
-<IfModule mod_rewrite.c>
-  Options +FollowSymlinks -Multiviews
-  RewriteEngine On
-
-  RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteCond %{REQUEST_FILENAME} !-f
-  RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L]
-</IfModule>
-- 
Gitee


From cabd0759a3fea4920eddaec269c7416ef06006ee Mon Sep 17 00:00:00 2001
From: dawuliao <dawu.liao@emdoor.com>
Date: Mon, 26 Jun 2023 17:19:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[feature]=20=E6=B7=BB=E5=8A=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=20=E4=B8=8E=20=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E7=B4=A0=E6=9D=90=E7=AE=A1=E7=90=86=EF=BC=8C=20=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E7=BC=93=E5=AD=98redis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/components/material/file.vue        |  5 +
 admin/src/components/material/hook.ts         | 13 ++-
 admin/src/components/material/index.vue       | 91 ++++++++++++++++++-
 admin/src/views/material/index.vue            |  4 +
 server/.example.env                           |  2 +-
 .../adminapi/controller/UploadController.php  | 19 +++-
 server/app/adminapi/lists/file/FileLists.php  |  8 +-
 server/app/common/enum/FileEnum.php           |  3 +-
 server/app/common/service/UploadService.php   | 87 +++++++++++++++++-
 .../common/service/storage/engine/Server.php  |  2 +-
 server/config/cache.php                       |  8 ++
 server/config/project.php                     |  5 +
 12 files changed, 234 insertions(+), 13 deletions(-)

diff --git a/admin/src/components/material/file.vue b/admin/src/components/material/file.vue
index a9f050033..fef7d719b 100644
--- a/admin/src/components/material/file.vue
+++ b/admin/src/components/material/file.vue
@@ -3,6 +3,11 @@
         <div class="file-item relative" :style="{ height: fileSize, width: fileSize }">
             <el-image class="image" v-if="type == 'image'" fit="contain" :src="uri"></el-image>
             <video class="video" v-else-if="type == 'video'" :src="uri"></video>
+            <el-image
+                class="image"
+                v-else
+                src="https://img95.699pic.com/element/40103/3946.png_860.png"
+            ></el-image>
             <div
                 v-if="type == 'video'"
                 class="absolute left-1/2 top-1/2 translate-x-[-50%] translate-y-[-50%] rounded-full w-5 h-5 flex justify-center items-center bg-[rgba(0,0,0,0.3)]"
diff --git a/admin/src/components/material/hook.ts b/admin/src/components/material/hook.ts
index 611453bb7..ddd68e626 100644
--- a/admin/src/components/material/hook.ts
+++ b/admin/src/components/material/hook.ts
@@ -55,6 +55,15 @@ export function useCate(type: number) {
         getCateLists()
     }
 
+    const handleAddChildCate = async (value: string, pid: number) => {
+        await fileCateAdd({
+            type,
+            name: value,
+            pid: pid
+        })
+        getCateLists()
+    }
+
     // 编辑分组
     const handleEditCate = async (value: string, id: number) => {
         await fileCateEdit({
@@ -82,6 +91,7 @@ export function useCate(type: number) {
         cateId,
         cateLists,
         handleAddCate,
+        handleAddChildCate,
         handleEditCate,
         handleDeleteCate,
         getCateLists,
@@ -105,7 +115,8 @@ export function useFile(
     const fileParams = reactive({
         name: '',
         type: type,
-        cid: cateId
+        cid: cateId,
+        source: ''
     })
     const { pager, getLists, resetPage } = usePaging({
         fetchFun: fileList,
diff --git a/admin/src/components/material/index.vue b/admin/src/components/material/index.vue
index 72660bbdd..53640a99b 100644
--- a/admin/src/components/material/index.vue
+++ b/admin/src/components/material/index.vue
@@ -42,6 +42,20 @@
                                                         </el-dropdown-item>
                                                     </div>
                                                 </popover-input>
+                                                <popover-input
+                                                    @confirm="handleAddChildCate($event, data.id)"
+                                                    size="default"
+                                                    width="400px"
+                                                    :limit="20"
+                                                    show-limit
+                                                    teleported
+                                                >
+                                                    <div>
+                                                        <el-dropdown-item>
+                                                            添加分组
+                                                        </el-dropdown-item>
+                                                    </div>
+                                                </popover-input>
                                                 <div @click="handleDeleteCate(data.id)">
                                                     <el-dropdown-item>删除分组</el-dropdown-item>
                                                 </div>
@@ -91,6 +105,16 @@
                     >
                         <el-button type="primary">本地上传</el-button>
                     </upload>
+                    <upload
+                        v-if="type == 'file'"
+                        class="mr-3"
+                        :data="{ cid: cateId }"
+                        :type="type"
+                        :show-progress="true"
+                        @change="refresh"
+                    >
+                        <el-button type="primary">本地上传</el-button>
+                    </upload>
                     <el-button
                         v-if="mode == 'page'"
                         :disabled="!select.length"
@@ -124,6 +148,21 @@
                         </div>
                     </popup>
                 </div>
+                <el-select
+                    v-model="fileParams.source"
+                    placeholder="请选择文件来源"
+                    size="large"
+                    clearable
+                    style="margin-right: 20px"
+                    class="w-50"
+                >
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    />
+                </el-select>
                 <el-input
                     class="w-60"
                     placeholder="请输入名称"
@@ -138,6 +177,7 @@
                         </el-button>
                     </template>
                 </el-input>
+
                 <div class="flex items-center ml-2">
                     <el-tooltip content="列表视图" placement="top">
                         <div
@@ -208,9 +248,31 @@
                                 >
                                     <el-button type="primary" link> 重命名 </el-button>
                                 </popover-input>
-                                <el-button type="primary" link @click="handlePreview(item.uri)">
+                                <el-button
+                                    v-if="item.type === 10 || item.type === 20"
+                                    type="primary"
+                                    link
+                                    @click="handlePreview(item.uri)"
+                                >
                                     查看
                                 </el-button>
+
+                                <el-button
+                                    v-if="item.type === 10 || item.type === 20"
+                                    type="primary"
+                                    link
+                                    @click="textCopy(item.uri)"
+                                    style="margin-left: 1px"
+                                    >地址</el-button
+                                >
+                                <el-link
+                                    v-else
+                                    type="primary"
+                                    :underline="false"
+                                    style="margin-left: 25px"
+                                    :href="item.uri"
+                                    >下载</el-link
+                                >
                             </div>
                         </li>
                     </ul>
@@ -359,6 +421,7 @@
             </div>
         </div>
         <preview v-model="showPreview" :url="previewUrl" :type="type" />
+        <input ref="textCopys" id="textCopys" value="" style="opacity: 0; position: absolute" />
     </div>
 </template>
 
@@ -367,6 +430,7 @@ import { useCate, useFile } from './hook'
 import FileItem from './file.vue'
 import Preview from './preview.vue'
 import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
 const props = defineProps({
     fileSize: {
         type: String,
@@ -403,6 +467,17 @@ const typeValue = computed<number>(() => {
             return 0
     }
 })
+const options = [
+    {
+        value: '0',
+        label: '后台上传'
+    },
+    {
+        value: '1',
+        label: '前端上传'
+    }
+]
+
 const visible: Ref<boolean> = inject('visible')!
 const previewUrl = ref('')
 const showPreview = ref(false)
@@ -411,6 +486,7 @@ const {
     cateId,
     cateLists,
     handleAddCate,
+    handleAddChildCate,
     handleEditCate,
     handleDeleteCate,
     getCateLists,
@@ -492,6 +568,19 @@ onMounted(() => {
 defineExpose({
     clearSelect
 })
+
+const textCopys = ref()
+const textCopy = (uri: string) => {
+    const text = uri // 复制文本内容
+    const input = textCopys.value
+    input.value = text // 修改input的内容
+    input.select() // 选中文本
+    document.execCommand('copy') // 浏览器复制
+    ElMessage({
+        message: '地址复制成功',
+        type: 'success'
+    })
+}
 </script>
 
 <style scoped lang="scss">
diff --git a/admin/src/views/material/index.vue b/admin/src/views/material/index.vue
index 834bb01cc..7fcfbd91c 100644
--- a/admin/src/views/material/index.vue
+++ b/admin/src/views/material/index.vue
@@ -32,6 +32,10 @@ const tabsMap = [
     {
         type: 'video',
         name: '视频'
+    },
+    {
+        type: 'file',
+        name: '文件'
     }
 ]
 const activeTab = ref('image')
diff --git a/server/.example.env b/server/.example.env
index 8b889989b..6daec7cb0 100644
--- a/server/.example.env
+++ b/server/.example.env
@@ -1 +1 @@
-APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 127.0.0.1
DATABASE = test
USERNAME = username
PASSWORD = password
HOSTPORT = 3306
CHARSET = utf8
DEBUG = true
PREFIX = la_

[LANG]
default_lang = zh-cn

[PROJECT]
UNIQUE_IDENTIFICATION = likeadmin
# 演示环境
DEMO_ENV = false
\ No newline at end of file
+APP_DEBUG=true

[APP]
DEFAULT_TIMEZONE=Asia/Shanghai
APP_NAME=mylikeadmin
APP_ENV=local
APP_URL=http://mylikeadmin.cc

[DATABASE]
TYPE=mysql
HOSTNAME=127.0.0.1
DATABASE=test
USERNAME=username
PASSWORD=password
HOSTPORT=3306
CHARSET=utf8
DEBUG=true
PREFIX=la_

[LANG]
default_lang=zh-cn

[PROJECT]
UNIQUE_IDENTIFICATION=likeadmin
# 演示环境
DEMO_ENV=false
#开启redis缓速
[CACHE]
host="127.0.0.1"
password=123456
driver=redis

[REDIS]
host="127.0.0.1"
port=6379
password=123456
\ No newline at end of file
diff --git a/server/app/adminapi/controller/UploadController.php b/server/app/adminapi/controller/UploadController.php
index 1bee7dd30..12c38bf76 100644
--- a/server/app/adminapi/controller/UploadController.php
+++ b/server/app/adminapi/controller/UploadController.php
@@ -60,4 +60,21 @@ class UploadController extends BaseAdminController
         }
     }
 
-}
\ No newline at end of file
+    /**
+     * @notes 上传文件
+     * @return Json
+     * @author dw
+     * @date 2023/06/26
+     */
+    public function file()
+    {
+        try {
+            $cid = $this->request->post('cid', 0);
+            $result = UploadService::file($cid);
+            return $this->success('上传成功', $result);
+        } catch (Exception $e) {
+            return $this->fail($e->getMessage());
+        }
+    }
+
+}
diff --git a/server/app/adminapi/lists/file/FileLists.php b/server/app/adminapi/lists/file/FileLists.php
index 31d0c9695..f5973ae2a 100644
--- a/server/app/adminapi/lists/file/FileLists.php
+++ b/server/app/adminapi/lists/file/FileLists.php
@@ -37,7 +37,7 @@ class FileLists extends BaseAdminDataLists implements ListsSearchInterface
     public function setSearch(): array
     {
         return [
-            '=' => ['type', 'cid'],
+            '=' => ['type', 'cid', 'source'],
             '%like%' => ['name']
         ];
     }
@@ -57,7 +57,7 @@ class FileLists extends BaseAdminDataLists implements ListsSearchInterface
         $lists = (new File())->field(['id,cid,type,name,uri,create_time'])
             ->order('id', 'desc')
             ->where($this->searchWhere)
-            ->where('source', FileEnum::SOURCE_ADMIN)
+//            ->where('source', FileEnum::SOURCE_ADMIN)
             ->limit($this->limitOffset, $this->limitLength)
             ->select()
             ->toArray();
@@ -80,7 +80,7 @@ class FileLists extends BaseAdminDataLists implements ListsSearchInterface
     public function count(): int
     {
         return (new File())->where($this->searchWhere)
-            ->where('source', FileEnum::SOURCE_ADMIN)
+//            ->where('source', FileEnum::SOURCE_ADMIN)
             ->count();
     }
-}
\ No newline at end of file
+}
diff --git a/server/app/common/enum/FileEnum.php b/server/app/common/enum/FileEnum.php
index 5fbc820df..347c91770 100644
--- a/server/app/common/enum/FileEnum.php
+++ b/server/app/common/enum/FileEnum.php
@@ -27,4 +27,5 @@ class FileEnum
     const SOURCE_ADMIN = 0;  // 后台
     const SOURCE_USER = 1;   // 用户
 
-}
\ No newline at end of file
+
+}
diff --git a/server/app/common/service/UploadService.php b/server/app/common/service/UploadService.php
index 32e2bf40b..15a0167d1 100644
--- a/server/app/common/service/UploadService.php
+++ b/server/app/common/service/UploadService.php
@@ -19,6 +19,7 @@ use app\common\enum\FileEnum;
 use app\common\model\file\File;
 use app\common\service\storage\Driver as StorageDriver;
 use Exception;
+use think\facade\Env;
 
 
 class UploadService
@@ -54,7 +55,7 @@ class UploadService
             }
 
             // 上传文件
-            $saveDir = $saveDir . '/' .  date('Ymd');
+            $saveDir = self::getUploadUrl($saveDir);
             if (!$StorageDriver->upload($saveDir)) {
                 throw new Exception($StorageDriver->getError());
             }
@@ -123,7 +124,7 @@ class UploadService
             }
 
             // 上传文件
-            $saveDir = $saveDir . '/' .  date('Ymd');
+            $saveDir = self::getUploadUrl($saveDir);
             if (!$StorageDriver->upload($saveDir)) {
                 throw new Exception($StorageDriver->getError());
             }
@@ -161,4 +162,84 @@ class UploadService
         }
     }
 
-}
\ No newline at end of file
+    /**
+     * @notes 上传文件
+     * @param $cid
+     * @param int $sourceId
+     * @param int $source
+     * @param string $saveDir
+     * @return array
+     * @throws Exception
+     * @author dw
+     * @date 2023/06/26
+     */
+    public static function file($cid, int $sourceId = 0, int $source = FileEnum::SOURCE_ADMIN, string $saveDir = 'uploads/file')
+    {
+        try {
+            $config = [
+                'default' => ConfigService::get('storage', 'default', 'local'),
+                'engine'  => ConfigService::get('storage') ?? [ 'local' => [] ],
+            ];
+
+            // 2、执行文件上传
+            $StorageDriver = new StorageDriver($config);
+            $StorageDriver->setUploadFile('file');
+            $fileName = $StorageDriver->getFileName();
+            $fileInfo = $StorageDriver->getFileInfo();
+
+            // 校验上传文件后缀
+            if (!in_array(strtolower($fileInfo['ext']), config('project.file_file'))) {
+                throw new Exception("上传文件不允许上传" . $fileInfo['ext'] . "文件");
+            }
+
+            // 上传文件
+            $saveDir = self::getUploadUrl($saveDir);
+            if (!$StorageDriver->upload($saveDir)) {
+                throw new Exception($StorageDriver->getError());
+            }
+
+            // 3、处理文件名称
+            if (strlen($fileInfo['name']) > 128) {
+                $name = substr($fileInfo['name'], 0, 123);
+                $nameEnd = substr($fileInfo['name'], strlen($fileInfo['name']) - 5, strlen($fileInfo['name']));
+                $fileInfo['name'] = $name . $nameEnd;
+            }
+
+            // 4、写入数据库中
+            $file = File::create([
+                'cid'         => $cid,
+                'type'        => FileEnum::FILE_TYPE,
+                'name'        => $fileInfo['name'],
+                'uri'         => $saveDir . '/' . str_replace("\\", "/", $fileName),
+                'source'      => $source,
+                'source_id'   => $sourceId,
+                'create_time' => time(),
+            ]);
+
+            // 5、返回结果
+            return [
+                'id'   => $file['id'],
+                'cid'  => $file['cid'],
+                'type' => $file['type'],
+                'name' => $file['name'],
+                'uri'  => FileService::getFileUrl($file['uri']),
+                'url'  => $file['uri']
+            ];
+
+        } catch (Exception $e) {
+            throw new Exception($e->getMessage());
+        }
+    }
+
+    /**
+     * @notes 上传地址
+     * @param $saveDir
+     * @return string
+     * @author dw
+     * @date 2023/06/26
+     */
+    private static function getUploadUrl($saveDir):string
+    {
+        return $saveDir . '/' . Env::get('APP.APP_ENV', 'local') . '/' . date('Ymd');
+    }
+}
diff --git a/server/app/common/service/storage/engine/Server.php b/server/app/common/service/storage/engine/Server.php
index 07bf0d517..77f6e725f 100644
--- a/server/app/common/service/storage/engine/Server.php
+++ b/server/app/common/service/storage/engine/Server.php
@@ -42,7 +42,7 @@ abstract class Server
         }
 
         // 校验上传文件后缀
-        $limit = array_merge(config('project.file_image'), config('project.file_video'));
+        $limit = array_merge(config('project.file_image'), config('project.file_video'),config('project.file_file'));
         if (!in_array(strtolower($this->file->extension()), $limit)) {
             throw new Exception('不允许上传' . $this->file->extension() . '后缀文件');
         }
diff --git a/server/config/cache.php b/server/config/cache.php
index 7ec579945..80d008698 100644
--- a/server/config/cache.php
+++ b/server/config/cache.php
@@ -32,6 +32,14 @@ return [
             'host'   => env('cache.host','like-redis'),
             //端口
             'port'   => env('cache.port','6379'),
+            //密码
+            'password' => env('cache.password', '123456'),
+            //选择库
+            'select' => '3',
+            // 缓存前缀
+            'prefix' => 'la_',
+            // 缓存有效期 0表示永久缓存
+            'expire' => 0,
         ],
     ],
 ];
diff --git a/server/config/project.php b/server/config/project.php
index 3ba585da1..8b9d03b71 100644
--- a/server/config/project.php
+++ b/server/config/project.php
@@ -74,6 +74,11 @@ return [
         'wmv', 'avi', 'mpg', 'mpeg', '3gp', 'mov', 'mp4', 'flv', 'f4v', 'rmvb', 'mkv'
     ],
 
+    //上传文件的格式 (文件)
+    'file_file' => [
+        'zip','rar','txt','pdf','doc','docx','xls','xlsx','ppt','pptx','csv','txt','ftr','7z','gz'
+    ],
+
     // 登录设置
     'login' => [
         // 登录方式：1-账号密码登录；2-手机短信验证码登录
-- 
Gitee