From 412885a5a36ee26c9e74b4ab25302b9cd017b6f0 Mon Sep 17 00:00:00 2001 From: ainimini Date: Fri, 15 Nov 2019 00:45:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E4=BA=91=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 15 +- .../fc/test/common/base/BaseController.java | 13 +- .../fc/test/common/exception/MyException.java | 41 ++++ .../common/exception/enums/ErrorEnum.java | 42 ++++ .../admin/QiNiuCloudController.java | 66 ++++++ .../fc/test/service/QiNiuCloudService.java | 66 ++++++ src/main/java/com/fc/test/util/Result.java | 65 +++++ src/main/resources/application-dev.yml | 11 + .../templates/admin/fileCloud/list.html | 224 ++++++++++++++++++ 9 files changed, 534 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/fc/test/common/exception/MyException.java create mode 100644 src/main/java/com/fc/test/common/exception/enums/ErrorEnum.java create mode 100644 src/main/java/com/fc/test/controller/admin/QiNiuCloudController.java create mode 100644 src/main/java/com/fc/test/service/QiNiuCloudService.java create mode 100644 src/main/java/com/fc/test/util/Result.java create mode 100644 src/main/resources/templates/admin/fileCloud/list.html diff --git a/pom.xml b/pom.xml index 9fc0b32..6af011f 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,20 @@ mail 1.4.7 - + + + + com.qiniu + qiniu-java-sdk + [7.2.0, 7.2.99] + + + + + org.projectlombok + lombok + 1.18.6 + diff --git a/src/main/java/com/fc/test/common/base/BaseController.java b/src/main/java/com/fc/test/common/base/BaseController.java index dc67d5b..8b67584 100644 --- a/src/main/java/com/fc/test/common/base/BaseController.java +++ b/src/main/java/com/fc/test/common/base/BaseController.java @@ -5,14 +5,7 @@ import java.util.Date; import com.fc.test.common.domain.AjaxResult; import com.fc.test.model.custom.TitleVo; -import com.fc.test.service.SysDatasService; -import com.fc.test.service.SysFileDatasService; -import com.fc.test.service.SysFileService; -import com.fc.test.service.SysNoticeService; -import com.fc.test.service.SysOperLogService; -import com.fc.test.service.SysPermissionService; -import com.fc.test.service.SysRoleService; -import com.fc.test.service.SysUserService; +import com.fc.test.service.*; import com.fc.test.util.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.propertyeditors.CustomDateEditor; @@ -61,6 +54,10 @@ public class BaseController //公告 @Autowired public SysNoticeService sysNoticeService; + + /*文件上传云库*/ + @Autowired + private QiNiuCloudService qiNiuCloudService; /** * 将前台传递过来的日期格式的字符串，自动转化为Date类型 */ diff --git a/src/main/java/com/fc/test/common/exception/MyException.java b/src/main/java/com/fc/test/common/exception/MyException.java new file mode 100644 index 0000000..d997e2b --- /dev/null +++ b/src/main/java/com/fc/test/common/exception/MyException.java @@ -0,0 +1,41 @@ +package com.fc.test.common.exception; + + +import com.fc.test.common.exception.enums.ErrorEnum; +import lombok.Data; + +/** + * MyException + * + * @author bobbi + * @date 2018/10/07 13:54 + * @email 571002217@qq.com + * @description 自定义异常 + */ +@Data +public class MyException extends RuntimeException{ + private String msg; + private int code = 500; + + public MyException(){ + super(ErrorEnum.UNKNOWN.getMsg()); + this.msg= ErrorEnum.UNKNOWN.getMsg(); + } + + + public MyException(ErrorEnum eEnum, Throwable e){ + super(eEnum.getMsg(),e); + this.msg=eEnum.getMsg(); + this.code=eEnum.getCode(); + } + + public MyException(ErrorEnum eEnum){ + this.msg=eEnum.getMsg(); + this.code=eEnum.getCode(); + } + + public MyException(String exception){ + this.msg=exception; + } + +} diff --git a/src/main/java/com/fc/test/common/exception/enums/ErrorEnum.java b/src/main/java/com/fc/test/common/exception/enums/ErrorEnum.java new file mode 100644 index 0000000..8ebbe98 --- /dev/null +++ b/src/main/java/com/fc/test/common/exception/enums/ErrorEnum.java @@ -0,0 +1,42 @@ +package com.fc.test.common.exception.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * ErrorEnum + * + * @author bobbi + * @date 2018/10/07 14:19 + * @email 571002217@qq.com + * @description error类型枚举类 + */ +@Getter +@AllArgsConstructor +public enum ErrorEnum { + + // 系统错误 + UNKNOWN(500,"系统内部错误，请联系管理员"), + PATH_NOT_FOUND(404,"路径不存在，请检查路径"), + NO_AUTH(403,"没有权限，请联系管理员"), + DUPLICATE_KEY(501,"数据库中已存在该记录"), + TOKEN_GENERATOR_ERROR(502,"token生成失败"), + NO_UUID(503,"uuid为空"), + SQL_ILLEGAL(504,"sql非法"), + + //用户权限错误 + INVALID_TOKEN(1001,"token不合法"), + + //登录模块错误 + LOGIN_FAIL(10001,"登录失败"), + CAPTCHA_WRONG(10002,"验证码错误"), + USERNAME_OR_PASSWORD_WRONG(10003,"用户名或密码错误"), + + //七牛OSS错误 + OSS_CONFIG_ERROR(10050,"七牛配置信息错误"), + OSS_UPLOAD_ERROR(10051,"OSSBookNote上传失败"); + + private int code; + private String msg; + +} diff --git a/src/main/java/com/fc/test/controller/admin/QiNiuCloudController.java b/src/main/java/com/fc/test/controller/admin/QiNiuCloudController.java new file mode 100644 index 0000000..043ebc8 --- /dev/null +++ b/src/main/java/com/fc/test/controller/admin/QiNiuCloudController.java @@ -0,0 +1,66 @@ +package com.fc.test.controller.admin; + +import com.fc.test.common.base.BaseController; +import com.fc.test.common.domain.AjaxResult; +import com.fc.test.model.auto.TsysFile; +import com.fc.test.model.custom.Tablepar; +import com.fc.test.model.custom.TitleVo; +import com.fc.test.service.QiNiuCloudService; +import com.fc.test.util.Result; +import com.fc.test.util.StringUtils; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; + +/** + * @ClassName dell + * @Description TOOD + * @Author X + * @Data 2019/11/13 + * @Version 1.0 + **/ +@Controller +@RequestMapping("QiNiuCloudController") +public class QiNiuCloudController extends BaseController { + + @Autowired + private QiNiuCloudService qiNiuCloudService; + + //跳转页面参数 + private String prefix = "admin/fileCloud"; + + /** + * 文件上传云库展示页面 + * TODO(请说明这个方法的作用). + * @param model + * @return + */ + @GetMapping("/view") + @RequiresPermissions("system:file:view") + public String view(ModelMap model) + { + String str="图片上传云库"; + setTitle(model, new TitleVo("列表", str+"管理", true,"欢迎进入"+str+"页面", true, false)); + return prefix + "/list"; + } + + + @PostMapping("/uploadToQiNiu") + @ResponseBody + public Result upload(@RequestParam("file")MultipartFile uploadFile){ + try { + return qiNiuCloudService.uploadToQiNiu(uploadFile); + } catch (IOException e){ + e.printStackTrace(); + return Result.error(e.getMessage()); + } + } +} diff --git a/src/main/java/com/fc/test/service/QiNiuCloudService.java b/src/main/java/com/fc/test/service/QiNiuCloudService.java new file mode 100644 index 0000000..091a79b --- /dev/null +++ b/src/main/java/com/fc/test/service/QiNiuCloudService.java @@ -0,0 +1,66 @@ +package com.fc.test.service; + +import com.fc.test.util.Result; +import com.google.gson.Gson; +import com.qiniu.http.Response; +import com.qiniu.storage.Configuration; +import com.qiniu.storage.Region; +import com.qiniu.storage.UploadManager; +import com.qiniu.storage.model.DefaultPutRet; +import com.qiniu.util.Auth; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.util.UUID; + +/** + * @ClassName dell + * @Description TOOD + * @Author X + * @Data 2019/11/13 + * @Version 1.0 + **/ +@Service +public class QiNiuCloudService { + + @Value("${oss.qiniu.accessKey}") + private String accessKey; + + @Value("${oss.qiniu.bucket}") + private String bucket; + + @Value("${oss.qiniu.secretKey}") + private String secretKey; + + @Value("${oss.qiniu.domain}") + private String domain; + + public Result uploadToQiNiu(MultipartFile uploadFile) throws IOException { + + //构造一个带指定 Region 对象的配置类 + Configuration cfg = new Configuration(Region.huanan()); + //文件上传管理器 + UploadManager uploadManager = new UploadManager(cfg); + //生成上传凭证，然后准备上传 + Auth auth = Auth.create(accessKey, secretKey); + String upToken = auth.uploadToken(bucket); + //给图片重新设定名字 + String fileName = uploadFile.getOriginalFilename(); + String suffix = fileName.substring(fileName.lastIndexOf(".")); + String uuid = UUID.randomUUID().toString().toUpperCase().replace("-", ""); + fileName = uuid + suffix; + //默认不指定key的情况下，以文件内容的hash值作为文件名 + Response response = uploadManager.put(uploadFile.getBytes(), fileName, upToken); + //解析上传成功的结果 + DefaultPutRet putRet = new Gson().fromJson(response.bodyString(), DefaultPutRet.class); + // System.out.println(putRet.key); + //System.out.println(putRet.hash); + //成功 返回url name + Result r = Result.ok() + .put("url", domain + "/" + putRet.key) + .put("name", putRet.key); + return r; + } +} diff --git a/src/main/java/com/fc/test/util/Result.java b/src/main/java/com/fc/test/util/Result.java new file mode 100644 index 0000000..fa6057e --- /dev/null +++ b/src/main/java/com/fc/test/util/Result.java @@ -0,0 +1,65 @@ +package com.fc.test.util; + +import com.fc.test.common.exception.enums.ErrorEnum; + +import java.util.HashMap; + +/** + * Result + * + * @author bobbi + * @date 2018/10/07 13:28 + * @email 571002217@qq.com + * @description 通用返回类 + */ +public class Result extends HashMap { + + public Result() { + put("code", 200); + put("msg", "success"); + } + + public static Result ok() { + return new Result(); + } + + public static Result error() { + return error(ErrorEnum.UNKNOWN); + } + + public static Result error(ErrorEnum eEnum) { + return new Result().put("code", eEnum.getCode()).put("msg", eEnum.getMsg()); + } + + public static Result error(String msg) { + return new Result().put("msg",msg).put("code", ErrorEnum.UNKNOWN.getCode()); + } + + public static Result error(Integer code , String msg){ + return new Result().put("code",code).put("msg",msg); + } + + public static Result exception() { + return exception(ErrorEnum.UNKNOWN); + } + + public static Result exception(ErrorEnum eEnum) { + return new Result().put("code", eEnum.getCode()).put("msg", eEnum.getMsg()); + } + + + + /** + * 封装业务数据 + * + * @param key + * @param value + * @return + */ + @Override + public Result put(String key, Object value) { + super.put(key, value); + //将HashMap对象本身返回 + return this; + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 048672d..36e4819 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -44,6 +44,17 @@ spring : wall: config: multi-statement-allow: true + +# 七牛云配置 +# bucket是创建的存储空间名 +# domain对应存储空间的访问域名 +# accessKey,secretKey秘钥 +oss: + qiniu: + domain: + accessKey: + secretKey: + bucket: #mysql 8.0 #spring : # datasource : diff --git a/src/main/resources/templates/admin/fileCloud/list.html b/src/main/resources/templates/admin/fileCloud/list.html new file mode 100644 index 0000000..3cbf613 --- /dev/null +++ b/src/main/resources/templates/admin/fileCloud/list.html @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+
+ +
+ +
+ +
+
+
+
拖拽区域
+
+ + + +
+
+ + + +
+
+ +
+ + +
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+ + + +
+
+
+
生成区域
+
+ + + +
+
+ + + +
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+ + +
+ +
+
+
+ + + + + +
+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + -- Gitee From 112b2cf712059556ccad7aefc4ec2e84ac988006 Mon Sep 17 00:00:00 2001 From: ainimini Date: Fri, 15 Nov 2019 13:05:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{MyException.java => QiNiuException.java} | 18 ++++----- .../{ErrorEnum.java => QiNiuErrorEnum.java} | 4 +- .../admin/QiNiuCloudController.java | 13 ++----- .../fc/test/service/QiNiuCloudService.java | 6 +-- .../util/{Result.java => QiNiuResult.java} | 38 +++++++++---------- 5 files changed, 36 insertions(+), 43 deletions(-) rename src/main/java/com/fc/test/common/exception/{MyException.java => QiNiuException.java} (52%) rename src/main/java/com/fc/test/common/exception/enums/{ErrorEnum.java => QiNiuErrorEnum.java} (95%) rename src/main/java/com/fc/test/util/{Result.java => QiNiuResult.java} (32%) diff --git a/src/main/java/com/fc/test/common/exception/MyException.java b/src/main/java/com/fc/test/common/exception/QiNiuException.java similarity index 52% rename from src/main/java/com/fc/test/common/exception/MyException.java rename to src/main/java/com/fc/test/common/exception/QiNiuException.java index d997e2b..59d7cd0 100644 --- a/src/main/java/com/fc/test/common/exception/MyException.java +++ b/src/main/java/com/fc/test/common/exception/QiNiuException.java @@ -1,11 +1,11 @@ package com.fc.test.common.exception; -import com.fc.test.common.exception.enums.ErrorEnum; +import com.fc.test.common.exception.enums.QiNiuErrorEnum; import lombok.Data; /** - * MyException + * QiNiuException * * @author bobbi * @date 2018/10/07 13:54 @@ -13,28 +13,28 @@ import lombok.Data; * @description 自定义异常 */ @Data -public class MyException extends RuntimeException{ +public class QiNiuException extends RuntimeException{ private String msg; private int code = 500; - public MyException(){ - super(ErrorEnum.UNKNOWN.getMsg()); - this.msg= ErrorEnum.UNKNOWN.getMsg(); + public QiNiuException(){ + super(QiNiuErrorEnum.UNKNOWN.getMsg()); + this.msg= QiNiuErrorEnum.UNKNOWN.getMsg(); } - public MyException(ErrorEnum eEnum, Throwable e){ + public QiNiuException(QiNiuErrorEnum eEnum, Throwable e){ super(eEnum.getMsg(),e); this.msg=eEnum.getMsg(); this.code=eEnum.getCode(); } - public MyException(ErrorEnum eEnum){ + public QiNiuException(QiNiuErrorEnum eEnum){ this.msg=eEnum.getMsg(); this.code=eEnum.getCode(); } - public MyException(String exception){ + public QiNiuException(String exception){ this.msg=exception; } diff --git a/src/main/java/com/fc/test/common/exception/enums/ErrorEnum.java b/src/main/java/com/fc/test/common/exception/enums/QiNiuErrorEnum.java similarity index 95% rename from src/main/java/com/fc/test/common/exception/enums/ErrorEnum.java rename to src/main/java/com/fc/test/common/exception/enums/QiNiuErrorEnum.java index 8ebbe98..a71dc0e 100644 --- a/src/main/java/com/fc/test/common/exception/enums/ErrorEnum.java +++ b/src/main/java/com/fc/test/common/exception/enums/QiNiuErrorEnum.java @@ -4,7 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; /** - * ErrorEnum + * QiNiuErrorEnum * * @author bobbi * @date 2018/10/07 14:19 @@ -13,7 +13,7 @@ import lombok.Getter; */ @Getter @AllArgsConstructor -public enum ErrorEnum { +public enum QiNiuErrorEnum { // 系统错误 UNKNOWN(500,"系统内部错误，请联系管理员"), diff --git a/src/main/java/com/fc/test/controller/admin/QiNiuCloudController.java b/src/main/java/com/fc/test/controller/admin/QiNiuCloudController.java index 043ebc8..c4d7968 100644 --- a/src/main/java/com/fc/test/controller/admin/QiNiuCloudController.java +++ b/src/main/java/com/fc/test/controller/admin/QiNiuCloudController.java @@ -1,15 +1,9 @@ package com.fc.test.controller.admin; import com.fc.test.common.base.BaseController; -import com.fc.test.common.domain.AjaxResult; -import com.fc.test.model.auto.TsysFile; -import com.fc.test.model.custom.Tablepar; import com.fc.test.model.custom.TitleVo; import com.fc.test.service.QiNiuCloudService; -import com.fc.test.util.Result; -import com.fc.test.util.StringUtils; -import com.github.pagehelper.PageInfo; -import io.swagger.annotations.Api; +import com.fc.test.util.QiNiuResult; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -17,7 +11,6 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.servlet.http.HttpServletRequest; import java.io.IOException; /** @@ -55,12 +48,12 @@ public class QiNiuCloudController extends BaseController { @PostMapping("/uploadToQiNiu") @ResponseBody - public Result upload(@RequestParam("file")MultipartFile uploadFile){ + public QiNiuResult upload(@RequestParam("file")MultipartFile uploadFile){ try { return qiNiuCloudService.uploadToQiNiu(uploadFile); } catch (IOException e){ e.printStackTrace(); - return Result.error(e.getMessage()); + return QiNiuResult.error(e.getMessage()); } } } diff --git a/src/main/java/com/fc/test/service/QiNiuCloudService.java b/src/main/java/com/fc/test/service/QiNiuCloudService.java index 091a79b..2f506aa 100644 --- a/src/main/java/com/fc/test/service/QiNiuCloudService.java +++ b/src/main/java/com/fc/test/service/QiNiuCloudService.java @@ -1,6 +1,6 @@ package com.fc.test.service; -import com.fc.test.util.Result; +import com.fc.test.util.QiNiuResult; import com.google.gson.Gson; import com.qiniu.http.Response; import com.qiniu.storage.Configuration; @@ -37,7 +37,7 @@ public class QiNiuCloudService { @Value("${oss.qiniu.domain}") private String domain; - public Result uploadToQiNiu(MultipartFile uploadFile) throws IOException { + public QiNiuResult uploadToQiNiu(MultipartFile uploadFile) throws IOException { //构造一个带指定 Region 对象的配置类 Configuration cfg = new Configuration(Region.huanan()); @@ -58,7 +58,7 @@ public class QiNiuCloudService { // System.out.println(putRet.key); //System.out.println(putRet.hash); //成功 返回url name - Result r = Result.ok() + QiNiuResult r = QiNiuResult.ok() .put("url", domain + "/" + putRet.key) .put("name", putRet.key); return r; diff --git a/src/main/java/com/fc/test/util/Result.java b/src/main/java/com/fc/test/util/QiNiuResult.java similarity index 32% rename from src/main/java/com/fc/test/util/Result.java rename to src/main/java/com/fc/test/util/QiNiuResult.java index fa6057e..ff09430 100644 --- a/src/main/java/com/fc/test/util/Result.java +++ b/src/main/java/com/fc/test/util/QiNiuResult.java @@ -1,50 +1,50 @@ package com.fc.test.util; -import com.fc.test.common.exception.enums.ErrorEnum; +import com.fc.test.common.exception.enums.QiNiuErrorEnum; import java.util.HashMap; /** - * Result + * QiNiuResult * * @author bobbi * @date 2018/10/07 13:28 * @email 571002217@qq.com * @description 通用返回类 */ -public class Result extends HashMap { +public class QiNiuResult extends HashMap { - public Result() { + public QiNiuResult() { put("code", 200); put("msg", "success"); } - public static Result ok() { - return new Result(); + public static QiNiuResult ok() { + return new QiNiuResult(); } - public static Result error() { - return error(ErrorEnum.UNKNOWN); + public static QiNiuResult error() { + return error(QiNiuErrorEnum.UNKNOWN); } - public static Result error(ErrorEnum eEnum) { - return new Result().put("code", eEnum.getCode()).put("msg", eEnum.getMsg()); + public static QiNiuResult error(QiNiuErrorEnum eEnum) { + return new QiNiuResult().put("code", eEnum.getCode()).put("msg", eEnum.getMsg()); } - public static Result error(String msg) { - return new Result().put("msg",msg).put("code", ErrorEnum.UNKNOWN.getCode()); + public static QiNiuResult error(String msg) { + return new QiNiuResult().put("msg",msg).put("code", QiNiuErrorEnum.UNKNOWN.getCode()); } - public static Result error(Integer code , String msg){ - return new Result().put("code",code).put("msg",msg); + public static QiNiuResult error(Integer code , String msg){ + return new QiNiuResult().put("code",code).put("msg",msg); } - public static Result exception() { - return exception(ErrorEnum.UNKNOWN); + public static QiNiuResult exception() { + return exception(QiNiuErrorEnum.UNKNOWN); } - public static Result exception(ErrorEnum eEnum) { - return new Result().put("code", eEnum.getCode()).put("msg", eEnum.getMsg()); + public static QiNiuResult exception(QiNiuErrorEnum eEnum) { + return new QiNiuResult().put("code", eEnum.getCode()).put("msg", eEnum.getMsg()); } @@ -57,7 +57,7 @@ public class Result extends HashMap { * @return */ @Override - public Result put(String key, Object value) { + public QiNiuResult put(String key, Object value) { super.put(key, value); //将HashMap对象本身返回 return this; -- Gitee From c941fc7256e947bc6bef6fe13b6310daf7b8e176 Mon Sep 17 00:00:00 2001 From: ainimini Date: Fri, 15 Nov 2019 13:31:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=B2=A1=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fc/test/common/exception/enums/QiNiuErrorEnum.java | 9 --------- src/main/java/com/fc/test/util/QiNiuResult.java | 3 --- 2 files changed, 12 deletions(-) diff --git a/src/main/java/com/fc/test/common/exception/enums/QiNiuErrorEnum.java b/src/main/java/com/fc/test/common/exception/enums/QiNiuErrorEnum.java index a71dc0e..2653834 100644 --- a/src/main/java/com/fc/test/common/exception/enums/QiNiuErrorEnum.java +++ b/src/main/java/com/fc/test/common/exception/enums/QiNiuErrorEnum.java @@ -5,10 +5,6 @@ import lombok.Getter; /** * QiNiuErrorEnum - * - * @author bobbi - * @date 2018/10/07 14:19 - * @email 571002217@qq.com * @description error类型枚举类 */ @Getter @@ -27,11 +23,6 @@ public enum QiNiuErrorEnum { //用户权限错误 INVALID_TOKEN(1001,"token不合法"), - //登录模块错误 - LOGIN_FAIL(10001,"登录失败"), - CAPTCHA_WRONG(10002,"验证码错误"), - USERNAME_OR_PASSWORD_WRONG(10003,"用户名或密码错误"), - //七牛OSS错误 OSS_CONFIG_ERROR(10050,"七牛配置信息错误"), OSS_UPLOAD_ERROR(10051,"OSSBookNote上传失败"); diff --git a/src/main/java/com/fc/test/util/QiNiuResult.java b/src/main/java/com/fc/test/util/QiNiuResult.java index ff09430..ecfee9e 100644 --- a/src/main/java/com/fc/test/util/QiNiuResult.java +++ b/src/main/java/com/fc/test/util/QiNiuResult.java @@ -7,9 +7,6 @@ import java.util.HashMap; /** * QiNiuResult * - * @author bobbi - * @date 2018/10/07 13:28 - * @email 571002217@qq.com * @description 通用返回类 */ public class QiNiuResult extends HashMap { -- Gitee From 421f725a8b77d9ccc75a33d04806f8a02ed87d5e Mon Sep 17 00:00:00 2001 From: ainimini Date: Wed, 20 Nov 2019 20:14:25 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=83=E7=89=9B?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 10 ---------- src/main/resources/application.yml | 13 ++++++++++++- .../resources/templates/admin/fileCloud/list.html | 8 +++----- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 36e4819..240dd25 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -45,16 +45,6 @@ spring : config: multi-statement-allow: true -# 七牛云配置 -# bucket是创建的存储空间名 -# domain对应存储空间的访问域名 -# accessKey,secretKey秘钥 -oss: - qiniu: - domain: - accessKey: - secretKey: - bucket: #mysql 8.0 #spring : # datasource : diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 98a7063..0835868 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -81,4 +81,15 @@ pagehelper: helperDialect: mysql reasonable: true supportMethodsArguments: true - params: count=countSql \ No newline at end of file + params: count=countSql + +# 七牛云配置 +# bucket是创建的存储空间名 +# domain对应存储空间的访问域名 +# accessKey,secretKey秘钥 +oss: + qiniu: + domain: + accessKey: + secretKey: + bucket: \ No newline at end of file diff --git a/src/main/resources/templates/admin/fileCloud/list.html b/src/main/resources/templates/admin/fileCloud/list.html index 3cbf613..3780a98 100644 --- a/src/main/resources/templates/admin/fileCloud/list.html +++ b/src/main/resources/templates/admin/fileCloud/list.html @@ -9,8 +9,6 @@ - -