Skip to content

Commit 67f0e6b

Browse files
elunezelunez
committed
[代码完善] 由于免费图床过于不稳定，影响体验，因此删除图床管理模块。 富文本，markdown 替换为使用本地存储上传图片。如想继续使用，可以直接在其官网管理数据 https://sm.ms/ 
1 parent 0e6105c commit 67f0e6b

24 files changed

Lines changed: 113 additions & 871 deletions

‎eladmin-common/src/main/java/me/zhengjie/utils/ElAdminConstant.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ public class ElAdminConstant {
4141
* 常用接口
4242
*/
4343
public static class Url {
44-
// 免费图床
45-
public static final String SM_MS_URL = "https://sm.ms/api";
4644
// IP归属地查询
4745
public static final String IP_URL = "http://whois.pconline.com.cn/ipJson.jsp?ip=%s&json=true";
4846
}

‎eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@
4343
* @date 2018-12-27
4444
*/
4545
public class FileUtil extends cn.hutool.core.io.FileUtil {
46+
4647
private static final Logger log = LoggerFactory.getLogger(FileUtil.class);
48+
4749
/**
4850
* 系统临时目录
4951
* <br>
@@ -75,6 +77,13 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
7577
*/
7678
private static final DecimalFormat DF = new DecimalFormat("0.00");
7779

80+
public static final String IMAGE = "图片";
81+
public static final String TXT = "文档";
82+
public static final String MUSIC = "音乐";
83+
public static final String VIDEO = "视频";
84+
public static final String OTHER = "其他";
85+
86+
7887
/**
7988
* MultipartFile转File
8089
*/
@@ -217,15 +226,15 @@ public static String getFileType(String type) {
217226
String video = "avi mpg mpe mpeg asf wmv mov qt rm mp4 flv m4v webm ogv ogg";
218227
String image = "bmp dib pcp dif wmf gif jpg tif eps psd cdr iff tga pcd mpt png jpeg";
219228
if (image.contains(type)) {
220-
return "图片";
229+
return IMAGE;
221230
} else if (documents.contains(type)) {
222-
return "文档";
231+
return TXT;
223232
} else if (music.contains(type)) {
224-
return "音乐";
233+
return MUSIC;
225234
} else if (video.contains(type)) {
226-
return "视频";
235+
return VIDEO;
227236
} else {
228-
return "其他";
237+
return OTHER;
229238
}
230239
}
231240

‎eladmin-system/src/main/resources/config/application.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,3 @@ code:
5353
#密码加密传输，前端公钥加密，后端私钥解密
5454
rsa:
5555
private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
56-
57-
# sm.ms 图床的 token
58-
smms:
59-
token: 1oOP3ykFDI0K6ifmtvU7c8Y1eTWZSlyl

‎eladmin-tools/src/main/java/me/zhengjie/domain/Picture.java‎

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎eladmin-tools/src/main/java/me/zhengjie/repository/PictureRepository.java‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎eladmin-tools/src/main/java/me/zhengjie/rest/LocalStorageController.java‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
import lombok.RequiredArgsConstructor;
1919
import me.zhengjie.annotation.Log;
2020
import me.zhengjie.domain.LocalStorage;
21+
import me.zhengjie.exception.BadRequestException;
2122
import me.zhengjie.service.LocalStorageService;
2223
import me.zhengjie.service.dto.LocalStorageQueryCriteria;
24+
import me.zhengjie.utils.FileUtil;
25+
import me.zhengjie.utils.SecurityUtils;
2326
import org.springframework.data.domain.Pageable;
2427
import org.springframework.http.HttpStatus;
2528
import org.springframework.http.ResponseEntity;
@@ -67,6 +70,19 @@ public ResponseEntity<Object> create(@RequestParam String name, @RequestParam("f
6770
return new ResponseEntity<>(HttpStatus.CREATED);
6871
}
6972

73+
@Log("上传图片")
74+
@PostMapping("/pictures")
75+
@ApiOperation("上传图片")
76+
public ResponseEntity<Object> upload(@RequestParam MultipartFile file){
77+
// 判断文件是否为图片
78+
String suffix = FileUtil.getExtensionName(file.getOriginalFilename());
79+
if(!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))){
80+
throw new BadRequestException("只能上传图片");
81+
}
82+
LocalStorage localStorage = localStorageService.create(null, file);
83+
return new ResponseEntity<>(localStorage, HttpStatus.OK);
84+
}
85+
7086
@ApiOperation("修改文件")
7187
@PutMapping
7288
@PreAuthorize("@el.check('storage:edit')")

‎eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,9 @@ public interface LocalStorageService {
5656
* 上传
5757
* @param name 文件名称
5858
* @param file 文件
59+
* @return
5960
*/
60-
void create(String name, MultipartFile file);
61+
LocalStorage create(String name, MultipartFile file);
6162

6263
/**
6364
* 编辑

‎eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)