Skip to content

Commit 0ca54dc

Browse files
osuuuosuuu
committed
⬆️优化依赖
1 parent 2ff267b commit 0ca54dc

File tree

695 files changed

+58915
-13435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

695 files changed

+58915
-13435
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020

2121

2222
## 程序功能
23-
* 支持第三方云储存，本地、阿里云 OSS、腾讯云 COS、七牛云
24-
* 支持多桶储存，可同时添加多个对象存储桶管理
23+
* 支持第三方云储存，本地、阿里云OSS、腾讯云COS、七牛云KODO、又拍云USS、华为云OBS等等
24+
* 支持多桶储存，可同时添加多个对象存储桶管理，适合团队多桶协作
2525
* 多图上传、拖拽上传、粘贴上传、上传预览、全屏预览、一键复制图片外链
2626
* 多用户管理、分组管理；不同分组用户控制不同的存储桶
2727
* 完整的权限控制功能，不同用户组可分配不同的操作权限，控制其上传删除及查看
2828
* 完整的可视化日志功能，记录用户所有操作，方便事件溯源
2929
* 全局配置用户初始剩余储存空间、设置指定用户剩余储存空间
3030
* 支持接口上传、接口删除
31-
* 原创Geek扁平化页面风格，简约大气；前端使用vue开发，前后端分离
31+
* 原创Geek扁平化页面风格，高性能 / 精致 / 优雅 / 简洁而不简单
3232

3333

3434
## 安装要求

‎app/common.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99

1010
// 程序版本
11-
define("VERSION", "1.1");
11+
define("VERSION", "1.2.0");
1212
// 版本号
13-
define("RELRAASE_TIME", "20220217");
13+
define("RELRAASE_TIME", "20220219");
1414
// 本地存储根目录
1515
define("FOLDER", "LightPicture/");
1616
// TOKEN KEY

‎app/controller/Api.php

Lines changed: 12 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,16 @@ public function upload(Request $request)
4242
return $this->create(null, '图片大小超出限制', 400);
4343
}
4444
$user = UserModel::where("Secret_key", $key)->find();
45-
if(!isset($user) ||$user['state'] == 0) return $this->create(null, '用户不存在或被停用', 400);
45+
if (!isset($user) || $user['state'] == 0) return $this->create(null, '用户不存在或被停用', 400);
4646

4747
$allSize = ImagesModel::where('user_id', $user['id'])->sum('size');
48-
if($allSize + $_FILES["file"]['size'] > $user['capacity']){
48+
if ($allSize + $_FILES["file"]['size'] > $user['capacity']) {
4949
return $this->create(null, '您的存储配额不足', 400);
5050
}
51-
51+
5252
$role = RoleModel::find($user['role_id']);
53-
$result = $this->toUpload($_FILES["file"], $role['storage_id']);
53+
$UploadCLass = new UploadCLass;
54+
$result = $UploadCLass->create($_FILES["file"], $role['storage_id']);
5455
if ($result['state'] == 1) {
5556
$img = new ImagesModel;
5657
$img->save([
@@ -70,29 +71,7 @@ public function upload(Request $request)
7071
}
7172
}
7273

73-
/**
74-
* 上传
75-
*/
76-
public function toUpload($file, $sid)
77-
{
78-
$UploadCLass = new UploadCLass;
79-
$storage = StorageModel::find($sid);
80-
switch ($storage['type']) {
81-
case 'local':
82-
return $UploadCLass->location_upload($file, $sid);
83-
break;
84-
case 'cos':
85-
return $UploadCLass->tencent_upload($file, $sid);
86-
break;
87-
case 'oss':
88-
return $UploadCLass->aliyuncs_upload($file, $sid);
89-
break;
90-
case 'kodo':
91-
return $UploadCLass->qiniu_upload($file, $sid);
92-
break;
93-
default:
94-
}
95-
}
74+
9675

9776
// 删除
9877
public function delete(Request $request)
@@ -104,54 +83,34 @@ public function delete(Request $request)
10483
}
10584
if (!$id) return $this->create([], '图片id为空', 400);
10685
$user = UserModel::where("Secret_key", $key)->find();
107-
if(!isset($user) ||$user['state'] == 0) return $this->create(null, '用户不存在或被停用', 400);
86+
if (!isset($user) || $user['state'] == 0) return $this->create(null, '用户不存在或被停用', 400);
10887
$role = RoleModel::find($user['role_id']);
10988
$imgs = ImagesModel::find($id);
11089
$uid = $user['id'];
90+
$UploadCLass = new UploadCLass;
11191

11292
if ($role['is_admin'] == 1) {
113-
$this->toDel($imgs["path"], $imgs['storage_id']);
93+
$UploadCLass->delete($imgs["path"], $imgs['storage_id']);
11494
$name = $imgs['name'];
11595
$imgs->delete();
11696
$this->setLog($uid, "删除了图片", "ID:" . $id, $name, 2);
11797
return $this->create($name, '删除成功', 200);
11898
} else if ($role['is_del_own'] == 1 && $imgs['user_id'] == $uid) {
119-
$this->toDel($imgs["path"], $imgs['storage_id']);
99+
$UploadCLass->delete($imgs["path"], $imgs['storage_id']);
120100
$name = $imgs['name'];
121101
$imgs->delete();
122102
$this->setLog($uid, "删除了图片", "ID:" . $id, $name, 2);
123103
return $this->create($name, '删除成功', 200);
124104
} else if ($role['is_del_all'] == 1 && $imgs['storage_id'] == $role['storage_id']) {
125-
$this->toDel($imgs["path"], $imgs['storage_id']);
105+
$UploadCLass->delete($imgs["path"], $imgs['storage_id']);
126106
$name = $imgs['name'];
127107
$imgs->delete();
128108
$this->setLog($uid, "删除了图片", "ID:" . $id, $name, 2);
129109
return $this->create($name, '删除成功', 200);
130110
} else {
131111
return $this->create('当前角色组没有删除权限', '删除失败', 400);
132112
}
133-
134113
}
135114

136-
// 删除
137-
public function toDel($path, $sid)
138-
{
139-
$UploadCLass = new UploadCLass;
140-
$storage = StorageModel::find($sid);
141-
switch ($storage['type']) {
142-
case 'local':
143-
return $UploadCLass->location_delete($path, $sid);
144-
break;
145-
case 'cos':
146-
return $UploadCLass->tencent_delete($path, $sid);
147-
break;
148-
case 'oss':
149-
return $UploadCLass->aliyuncs_delete($path, $sid);
150-
break;
151-
case 'kodo':
152-
return $UploadCLass->qiniu_delete($path, $sid);
153-
break;
154-
default:
155-
}
156-
}
115+
157116
}

‎app/controller/Images.php

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,22 @@ public function delete(Request $request, $id)
7575
$userInfo = UserModel::find($uid);
7676
$role = RoleModel::find($userInfo['role_id']);
7777
$imgs = ImagesModel::find($id);
78+
$UploadCLass = new UploadCLass;
7879

7980
if ($role['is_admin'] == 1) {
80-
$this->toDel($imgs["path"], $imgs['storage_id']);
81+
$UploadCLass->delete($imgs["path"], $imgs['storage_id']);
8182
$name = $imgs['name'];
8283
$imgs->delete();
8384
$this->setLog($uid, "删除了图片", "ID:".$id, $name,2);
8485
return $this->create($name, '删除成功', 200);
8586
} else if ($role['is_del_own'] == 1 && $imgs['user_id'] == $uid) {
86-
$this->toDel($imgs["path"], $imgs['storage_id']);
87+
$UploadCLass->delete($imgs["path"], $imgs['storage_id']);
8788
$name = $imgs['name'];
8889
$imgs->delete();
8990
$this->setLog($uid, "删除了图片", "ID:".$id, $name,2);
9091
return $this->create($name, '删除成功', 200);
9192
} else if ($role['is_del_all'] == 1 && $imgs['storage_id'] == $role['storage_id']) {
92-
$this->toDel($imgs["path"], $imgs['storage_id']);
93+
$UploadCLass->delete($imgs["path"], $imgs['storage_id']);
9394
$name = $imgs['name'];
9495
$imgs->delete();
9596
$this->setLog($uid, "删除了图片", "ID:".$id, $name,2);
@@ -98,26 +99,4 @@ public function delete(Request $request, $id)
9899
return $this->create('当前角色组没有删除权限', '删除失败', 400);
99100
}
100101
}
101-
102-
// 删除
103-
public function toDel($path, $sid)
104-
{
105-
$UploadCLass = new UploadCLass;
106-
$storage = StorageModel::find($sid);
107-
switch ($storage['type']) {
108-
case 'local':
109-
return $UploadCLass->location_delete($path, $sid);
110-
break;
111-
case 'cos':
112-
return $UploadCLass->tencent_delete($path, $sid);
113-
break;
114-
case 'oss':
115-
return $UploadCLass->aliyuncs_delete($path, $sid);
116-
break;
117-
case 'kodo':
118-
return $UploadCLass->qiniu_delete($path, $sid);
119-
break;
120-
default:
121-
}
122-
}
123102
}

‎app/controller/Storage.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,11 @@ public function type()
114114
{
115115
$result = array(
116116
'local' => '本地存储',
117-
'cos' => '腾讯云cos',
118-
'oss' => '阿里云oss',
119-
'kodo' => '七牛云kodo',
117+
'cos' => '腾讯云 COS',
118+
'oss' => '阿里云 OSS',
119+
'kodo' => '七牛云 KODO',
120+
'uss' => '又拍云 USS',
121+
'obs' => '华为云 OBS',
120122
);
121123
return $this->create($result, '成功', 200);
122124
}

‎app/controller/User.php

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,15 @@ public function info(Request $request)
3636
$scheme = $request->scheme();
3737
$user = UserModel::find($uid);
3838
$role = RoleModel::find($user['role_id']);
39-
$user['role'] = $role;
39+
$user['role'] = array(
40+
"is_add" => $role['is_add'],
41+
"is_admin" => $role['is_admin'],
42+
"is_del_all" => $role['is_del_all'],
43+
"is_del_own" => $role['is_del_own'],
44+
"is_read" => $role['is_read'],
45+
"is_read_all" => $role['is_read_all'],
46+
"name" => $role['name']
47+
);
4048
$user['scheme'] = $scheme;
4149
$user['url'] = $url;
4250
$user['capacity'] = (int)$user['capacity'];
@@ -139,13 +147,13 @@ public function log(Request $request)
139147
$query['type'] = $data['type'];
140148
if ($data['type'] == 1) unset($query['type']);
141149

142-
if($role['is_admin'] == 1){
143-
if($data['read'] == 1){
150+
if ($role['is_admin'] == 1) {
151+
if ($data['read'] == 1) {
144152
$query['uid'] = $uid;
145-
}else{
153+
} else {
146154
unset($query['uid']);
147155
}
148-
}else{
156+
} else {
149157
$query['uid'] = $uid;
150158
}
151159

0 commit comments

Comments
 (0)