diff --git a/java/local/pom.xml b/java/local/pom.xml index 00c9bde..36ab1a1 100644 --- a/java/local/pom.xml +++ b/java/local/pom.xml @@ -84,16 +84,6 @@ qiniu-java-sdk ${qiniu.version} - - com.squareup.okhttp3 - okhttp - compile - - - com.google.code.gson - gson - compile - diff --git a/java/local/src/main/java/cn/toesbieya/jxc/aspect/LockAspect.java b/java/local/src/main/java/cn/toesbieya/jxc/aspect/LockAspect.java index 8573cf2..9ddbd7d 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/aspect/LockAspect.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/aspect/LockAspect.java @@ -2,8 +2,8 @@ package cn.toesbieya.jxc.aspect; import cn.toesbieya.jxc.annoation.Lock; import cn.toesbieya.jxc.model.vo.Result; -import cn.toesbieya.jxc.utils.RedisUtil; -import cn.toesbieya.jxc.utils.SpringUtil; +import cn.toesbieya.jxc.util.RedisUtil; +import cn.toesbieya.jxc.util.SpringUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.*; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/handler/GlobalExceptionHandler.java b/java/local/src/main/java/cn/toesbieya/jxc/aspect/RestExceptionAspect.java similarity index 69% rename from java/local/src/main/java/cn/toesbieya/jxc/handler/GlobalExceptionHandler.java rename to java/local/src/main/java/cn/toesbieya/jxc/aspect/RestExceptionAspect.java index 7786a0c..0724eb4 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/handler/GlobalExceptionHandler.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/aspect/RestExceptionAspect.java @@ -1,15 +1,18 @@ -package cn.toesbieya.jxc.handler; +package cn.toesbieya.jxc.aspect; import cn.toesbieya.jxc.enumeration.UserActionEnum; import cn.toesbieya.jxc.exception.JsonResultException; import cn.toesbieya.jxc.model.entity.RecUserAction; -import cn.toesbieya.jxc.utils.ThreadUtil; -import cn.toesbieya.jxc.utils.Util; -import cn.toesbieya.jxc.service.RecService; import cn.toesbieya.jxc.model.vo.Result; +import cn.toesbieya.jxc.service.RecService; +import cn.toesbieya.jxc.util.ThreadUtil; +import cn.toesbieya.jxc.util.Util; +import cn.toesbieya.jxc.util.WebUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.util.StringUtils; import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.multipart.MaxUploadSizeExceededException; @@ -18,7 +21,7 @@ import javax.annotation.Resource; @Slf4j @RestControllerAdvice -public class GlobalExceptionHandler { +public class RestExceptionAspect { @Resource private RecService service; @@ -35,6 +38,20 @@ public class GlobalExceptionHandler { return Result.fail("请求方法有误"); } + //@RequestParam没有匹配到值 + @ExceptionHandler(MissingServletRequestParameterException.class) + public Result handle(MissingServletRequestParameterException e) { + log.error(e.getMessage(), e); + return Result.fail("get参数有误"); + } + + //@RequestBody没有匹配到值 + @ExceptionHandler(HttpMessageNotReadableException.class) + public Result handle(HttpMessageNotReadableException e) { + log.error(e.getMessage(), e); + return Result.fail("post参数有误"); + } + //上传文件过大 @ExceptionHandler(MaxUploadSizeExceededException.class) public Result handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) { @@ -46,7 +63,7 @@ public class GlobalExceptionHandler { //最终捕获 @ExceptionHandler(Exception.class) public Result handleException(Exception e) { - log.error("服务运行异常", e); + log.error(String.format("服务运行异常,访问路径：%s", WebUtil.getRequest().getServletPath()), e); recordUserAction(e); return Result.fail("服务运行异常"); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/aspect/UserActionAspect.java b/java/local/src/main/java/cn/toesbieya/jxc/aspect/UserActionAspect.java index be6afb9..31d00ee 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/aspect/UserActionAspect.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/aspect/UserActionAspect.java @@ -5,8 +5,8 @@ import cn.toesbieya.jxc.enumeration.UserActionEnum; import cn.toesbieya.jxc.model.entity.RecUserAction; import cn.toesbieya.jxc.service.RecService; import cn.toesbieya.jxc.model.vo.Result; -import cn.toesbieya.jxc.utils.SpringUtil; -import cn.toesbieya.jxc.utils.ThreadUtil; +import cn.toesbieya.jxc.util.SpringUtil; +import cn.toesbieya.jxc.util.ThreadUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuConfig.java index c60088c..369d870 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuConfig.java @@ -1,22 +1,16 @@ package cn.toesbieya.jxc.config; -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.DependsOn; -@Component -@ConfigurationProperties("qiniu") -@Data +@Configuration +@EnableConfigurationProperties(QiniuProperty.class) +@DependsOn("redisUtil") public class QiniuConfig { - private String accessKey; - - private String secretKey; - - private String bucket; - - //临时上传凭证的有效期，单位秒 - private Integer tokenExpire = 3600; - - //临时上传凭证的redis键名 - private String redisCacheKey = "qiniu-token"; + @Bean + public QiniuTemplate qiniuTemplate(QiniuProperty property) { + return new QiniuTemplate(property); + } } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuProperty.java b/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuProperty.java new file mode 100644 index 0000000..5bd56f8 --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuProperty.java @@ -0,0 +1,43 @@ +package cn.toesbieya.jxc.config; + +import com.qiniu.storage.Region; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Data +@ConfigurationProperties("qiniu") +public class QiniuProperty { + private String accessKey; + + private String secretKey; + + private String bucket; + + //机房区域，默认为自动 + private QiniuRegion region = QiniuRegion.auto; + + //临时上传凭证的有效期，单位秒 + private Integer tokenExpire = 3600; + + //临时上传凭证的redis键名 + private String redisCacheKey = "qiniu-token"; + + enum QiniuRegion { + auto(Region.autoRegion()), + huadong(Region.huadong()), + huabei(Region.huabei()), + huanan(Region.huanan()), + beimei(Region.beimei()), + xinjiapo(Region.xinjiapo()); + + private final Region region; + + QiniuRegion(Region region) { + this.region = region; + } + + public Region getRegion() { + return this.region; + } + } +} diff --git a/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuTemplate.java b/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuTemplate.java new file mode 100644 index 0000000..a1ccd0b --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/QiniuTemplate.java @@ -0,0 +1,54 @@ +package cn.toesbieya.jxc.config; + +import cn.toesbieya.jxc.util.RedisUtil; +import com.qiniu.common.QiniuException; +import com.qiniu.storage.BucketManager; +import com.qiniu.storage.Configuration; +import com.qiniu.util.Auth; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public class QiniuTemplate { + private final QiniuProperty property; + private final Auth auth; + private final BucketManager bucketManager; + + public QiniuTemplate(QiniuProperty property) { + this.property = property; + this.auth = Auth.create(property.getAccessKey(), property.getSecretKey()); + this.bucketManager = new BucketManager(this.auth, new Configuration(property.getRegion().getRegion())); + } + + public String getToken() { + String key = property.getRedisCacheKey(); + + String token = (String) RedisUtil.get(key); + + if (token == null) { + token = auth.uploadToken(property.getBucket()); + RedisUtil.set(key, token, property.getTokenExpire()); + } + + return token; + } + + public void delete(String key) { + try { + bucketManager.delete(property.getBucket(), key); + } + catch (QiniuException e) { + log.info("七牛云删除单个文件失败,{}", e.getMessage()); + } + } + + public void deleteBatch(String... key) { + BucketManager.BatchOperations batchOperations = new BucketManager.BatchOperations(); + batchOperations.addDeleteOp(property.getBucket(), key); + try { + bucketManager.batch(batchOperations); + } + catch (QiniuException e) { + log.info("七牛云批量删除文件失败,{}", e.getMessage()); + } + } +} diff --git a/java/local/src/main/java/cn/toesbieya/jxc/config/RedisEventListenerConfig.java b/java/local/src/main/java/cn/toesbieya/jxc/config/RedisEventListenerConfig.java index a97a8f0..0af50c5 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/config/RedisEventListenerConfig.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/config/RedisEventListenerConfig.java @@ -4,8 +4,8 @@ import cn.toesbieya.jxc.constant.SessionConstant; import cn.toesbieya.jxc.constant.SocketConstant; import cn.toesbieya.jxc.model.vo.SocketEventVo; import cn.toesbieya.jxc.module.WebSocketServer; -import cn.toesbieya.jxc.utils.RedisUtil; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.RedisUtil; +import cn.toesbieya.jxc.util.SessionUtil; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java index bac5e40..5167612 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/AccountController.java @@ -5,8 +5,8 @@ import cn.toesbieya.jxc.model.vo.PasswordUpdateParam; import cn.toesbieya.jxc.model.vo.RegisterParam; import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.service.AccountService; -import cn.toesbieya.jxc.utils.SessionUtil; -import cn.toesbieya.jxc.utils.IpUtil; +import cn.toesbieya.jxc.util.SessionUtil; +import cn.toesbieya.jxc.util.IpUtil; import cn.toesbieya.jxc.model.vo.Result; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/FileController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/FileController.java index 24c00d7..2fc9e13 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/FileController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/FileController.java @@ -1,13 +1,14 @@ package cn.toesbieya.jxc.controller; -import cn.toesbieya.jxc.utils.QiniuUtil; import cn.toesbieya.jxc.model.vo.Result; +import cn.toesbieya.jxc.service.FileService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -15,14 +16,17 @@ import java.net.URLDecoder; @RequestMapping("file") @Slf4j public class FileController { + @Resource + private FileService service; + @GetMapping("delete") public Result delete(@RequestParam String url) throws UnsupportedEncodingException { - QiniuUtil.delete(URLDecoder.decode(url, "utf-8")); + service.delete(URLDecoder.decode(url, "utf-8")); return Result.success("删除成功"); } @GetMapping("getToken") public Result getToken() { - return Result.success(null, QiniuUtil.getToken()); + return Result.success(null, service.getToken()); } } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/RecController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/RecController.java index 857996c..f1c9d00 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/RecController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/RecController.java @@ -3,9 +3,9 @@ package cn.toesbieya.jxc.controller; import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.LoginHistorySearch; import cn.toesbieya.jxc.model.vo.search.UserActionSearch; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import cn.toesbieya.jxc.service.RecService; -import cn.toesbieya.jxc.utils.DateUtil; +import cn.toesbieya.jxc.util.DateUtil; import cn.toesbieya.jxc.model.vo.Result; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/PurchaseInboundController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/PurchaseInboundController.java index 27df739..3415f40 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/PurchaseInboundController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/PurchaseInboundController.java @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.PurchaseInboundSearch; import cn.toesbieya.jxc.model.vo.update.DocStatusUpdate; import cn.toesbieya.jxc.service.doc.BizPurchaseInboundService; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/PurchaseOrderController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/PurchaseOrderController.java index b943430..7df207e 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/PurchaseOrderController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/PurchaseOrderController.java @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.PurchaseOrderSearch; import cn.toesbieya.jxc.model.vo.update.DocStatusUpdate; import cn.toesbieya.jxc.service.doc.BizPurchaseOrderService; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/SellOrderController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/SellOrderController.java index 5bca6ac..3af9691 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/SellOrderController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/SellOrderController.java @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.SellOrderSearch; import cn.toesbieya.jxc.model.vo.update.DocStatusUpdate; import cn.toesbieya.jxc.service.doc.BizSellOrderService; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/SellOutboundController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/SellOutboundController.java index 270c17c..6d54a4d 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/SellOutboundController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/doc/SellOutboundController.java @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.SellOutboundSearch; import cn.toesbieya.jxc.model.vo.update.DocStatusUpdate; import cn.toesbieya.jxc.service.doc.BizSellOutboundService; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java index 035bb3a..369ef8c 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/ManageController.java @@ -6,7 +6,7 @@ import cn.toesbieya.jxc.model.vo.Result; import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.MsgSearch; import cn.toesbieya.jxc.service.msg.MsgService; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/UserController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/UserController.java index 1e6ddae..a066784 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/UserController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/msg/UserController.java @@ -4,7 +4,7 @@ import cn.toesbieya.jxc.model.vo.Result; import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.MsgPersonalSearch; import cn.toesbieya.jxc.service.msg.MsgUserService; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java index 15a733f..915d6ab 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/RoleController.java @@ -3,7 +3,7 @@ package cn.toesbieya.jxc.controller.sys; import cn.toesbieya.jxc.model.entity.SysRole; import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.search.RoleSearch; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import cn.toesbieya.jxc.service.sys.SysRoleService; import cn.toesbieya.jxc.model.vo.Result; import org.springframework.util.StringUtils; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/UserController.java b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/UserController.java index d2b8938..f6c7a56 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/UserController.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/controller/sys/UserController.java @@ -3,7 +3,7 @@ package cn.toesbieya.jxc.controller.sys; import cn.toesbieya.jxc.model.entity.RecUserAction; import cn.toesbieya.jxc.model.entity.SysUser; import cn.toesbieya.jxc.model.vo.search.UserSearch; -import cn.toesbieya.jxc.utils.ThreadUtil; +import cn.toesbieya.jxc.util.ThreadUtil; import cn.toesbieya.jxc.service.sys.SysUserService; import cn.toesbieya.jxc.model.vo.Result; import org.springframework.util.StringUtils; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/RateControlInterceptor.java b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/RateControlInterceptor.java index e889436..fa4fe6a 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/RateControlInterceptor.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/RateControlInterceptor.java @@ -3,7 +3,7 @@ package cn.toesbieya.jxc.interceptor; import cn.toesbieya.jxc.model.vo.Result; import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.module.request.RequestModule; -import cn.toesbieya.jxc.utils.*; +import cn.toesbieya.jxc.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java index a1512f8..86f16da 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/SecurityInterceptor.java @@ -3,7 +3,7 @@ package cn.toesbieya.jxc.interceptor; import cn.toesbieya.jxc.model.vo.Result; import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.module.PermissionModule; -import cn.toesbieya.jxc.utils.*; +import cn.toesbieya.jxc.util.*; import lombok.extern.slf4j.Slf4j; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java index 6c466af..ae3a2b0 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/interceptor/UserActionInterceptor.java @@ -1,6 +1,6 @@ package cn.toesbieya.jxc.interceptor; -import cn.toesbieya.jxc.utils.ThreadUtil; +import cn.toesbieya.jxc.util.ThreadUtil; import org.springframework.web.servlet.HandlerInterceptor; import javax.servlet.http.HttpServletRequest; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/module/WebSocketServer.java b/java/local/src/main/java/cn/toesbieya/jxc/module/WebSocketServer.java index bebc116..604e5d9 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/module/WebSocketServer.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/module/WebSocketServer.java @@ -3,14 +3,14 @@ package cn.toesbieya.jxc.module; import cn.toesbieya.jxc.constant.SessionConstant; import cn.toesbieya.jxc.constant.SocketConstant; import cn.toesbieya.jxc.model.vo.SocketOfflineVo; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import com.corundumstudio.socketio.AckRequest; import com.corundumstudio.socketio.SocketIOClient; import com.corundumstudio.socketio.SocketIOServer; import com.corundumstudio.socketio.annotation.OnConnect; import com.corundumstudio.socketio.annotation.OnDisconnect; import com.corundumstudio.socketio.annotation.OnEvent; -import cn.toesbieya.jxc.utils.RedisUtil; +import cn.toesbieya.jxc.util.RedisUtil; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/module/request/RequestModule.java b/java/local/src/main/java/cn/toesbieya/jxc/module/request/RequestModule.java index dc37b89..84b2440 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/module/request/RequestModule.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/module/request/RequestModule.java @@ -2,7 +2,7 @@ package cn.toesbieya.jxc.module.request; import cn.toesbieya.jxc.model.vo.ResourceVo; import cn.toesbieya.jxc.service.sys.SysResourceService; -import cn.toesbieya.jxc.utils.RedisUtil; +import cn.toesbieya.jxc.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/schedule/DocTask.java b/java/local/src/main/java/cn/toesbieya/jxc/schedule/DocTask.java index 4691f40..38eeee5 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/schedule/DocTask.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/schedule/DocTask.java @@ -1,8 +1,8 @@ package cn.toesbieya.jxc.schedule; import cn.toesbieya.jxc.constant.DocConstant; -import cn.toesbieya.jxc.utils.DateUtil; -import cn.toesbieya.jxc.utils.RedisUtil; +import cn.toesbieya.jxc.util.DateUtil; +import cn.toesbieya.jxc.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.DependsOn; import org.springframework.scheduling.annotation.Async; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/schedule/SessionTask.java b/java/local/src/main/java/cn/toesbieya/jxc/schedule/SessionTask.java index 3b2d804..a4bf0be 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/schedule/SessionTask.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/schedule/SessionTask.java @@ -4,7 +4,7 @@ import cn.toesbieya.jxc.constant.SessionConstant; import cn.toesbieya.jxc.constant.SocketConstant; import cn.toesbieya.jxc.model.vo.SocketOfflineVo; import com.alibaba.fastjson.JSONObject; -import cn.toesbieya.jxc.utils.RedisUtil; +import cn.toesbieya.jxc.util.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.DependsOn; import org.springframework.scheduling.annotation.Async; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/schedule/StatisticTask.java b/java/local/src/main/java/cn/toesbieya/jxc/schedule/StatisticTask.java index 25dbc23..621567d 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/schedule/StatisticTask.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/schedule/StatisticTask.java @@ -4,7 +4,7 @@ import cn.toesbieya.jxc.model.entity.StatFinishOrder; import cn.toesbieya.jxc.model.entity.StatProfitGoods; import cn.toesbieya.jxc.model.entity.StatProfitTotal; import cn.toesbieya.jxc.mapper.StatisticMapper; -import cn.toesbieya.jxc.utils.DateUtil; +import cn.toesbieya.jxc.util.DateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java index d5585b1..0f378e1 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/AccountService.java @@ -12,8 +12,7 @@ import cn.toesbieya.jxc.model.vo.*; import cn.toesbieya.jxc.service.sys.SysDepartmentService; import cn.toesbieya.jxc.service.sys.SysResourceService; import cn.toesbieya.jxc.service.sys.SysRoleService; -import cn.toesbieya.jxc.utils.QiniuUtil; -import cn.toesbieya.jxc.utils.SessionUtil; +import cn.toesbieya.jxc.util.SessionUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -33,6 +32,8 @@ public class AccountService { private SysDepartmentService departmentService; @Resource private SysRoleService roleService; + @Resource + private FileService fileService; @TimeCost public Result login(LoginParam param, String ip) { @@ -197,7 +198,7 @@ public class AccountService { if (rows > 0) { String oldAvatar = user.getAvatar(); if (!StringUtils.isEmpty(oldAvatar)) { - QiniuUtil.delete(oldAvatar); + fileService.delete(oldAvatar); } user.setAvatar(avatar); SessionUtil.save(user); @@ -205,7 +206,7 @@ public class AccountService { } //否则删除此次上传至云的头像 - QiniuUtil.delete(avatar); + fileService.delete(avatar); return Result.fail("上传头像失败"); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/BizStockService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/BizStockService.java index d757b53..4777d4f 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/BizStockService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/BizStockService.java @@ -6,7 +6,7 @@ import cn.toesbieya.jxc.model.vo.export.StockExport; import cn.toesbieya.jxc.model.vo.result.PageResult; import cn.toesbieya.jxc.model.vo.result.StockSearchResult; import cn.toesbieya.jxc.model.vo.search.StockSearch; -import cn.toesbieya.jxc.utils.ExcelUtil; +import cn.toesbieya.jxc.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/FileService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/FileService.java new file mode 100644 index 0000000..e34f88c --- /dev/null +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/FileService.java @@ -0,0 +1,29 @@ +package cn.toesbieya.jxc.service; + +import cn.toesbieya.jxc.config.QiniuTemplate; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class FileService { + @Resource + private QiniuTemplate template; + + public String getToken() { + return template.getToken(); + } + + public void delete(String key) { + template.delete(key); + } + + public void deleteBatch(String... key) { + template.deleteBatch(key); + } + + public void deleteBatch(List key) { + deleteBatch(key.toArray(new String[0])); + } +} diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/RecService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/RecService.java index 9860a0b..efdde34 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/RecService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/RecService.java @@ -9,8 +9,7 @@ import cn.toesbieya.jxc.model.entity.RecUserAction; import cn.toesbieya.jxc.model.vo.result.PageResult; import cn.toesbieya.jxc.model.vo.search.LoginHistorySearch; import cn.toesbieya.jxc.model.vo.search.UserActionSearch; -import cn.toesbieya.jxc.utils.IpUtil; -import cn.toesbieya.jxc.utils.QiniuUtil; +import cn.toesbieya.jxc.util.IpUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; @@ -34,6 +33,8 @@ public class RecService { private RecUserActionMapper userActionMapper; @Resource private RecAttachmentMapper attachmentMapper; + @Resource + private FileService fileService; public PageResult searchLoginHistory(LoginHistorySearch vo) { Integer uid = vo.getUid(); @@ -104,7 +105,7 @@ public class RecService { Wrappers.lambdaQuery(RecAttachment.class) .in(RecAttachment::getUrl, deleteImageList) ); - QiniuUtil.deleteBatch(deleteImageList); + fileService.deleteBatch(deleteImageList); } } @@ -119,7 +120,7 @@ public class RecService { attachmentMapper.delete(Wrappers.lambdaQuery(RecAttachment.class).eq(RecAttachment::getPid, pid)); List urls = list.stream().map(RecAttachment::getUrl).collect(Collectors.toList()); - QiniuUtil.deleteBatch(urls); + fileService.deleteBatch(urls); } @Async("dbInsertExecutor") diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/StatisticService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/StatisticService.java index 1dcd97b..d60cd33 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/StatisticService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/StatisticService.java @@ -4,9 +4,9 @@ import cn.toesbieya.jxc.model.entity.StatFinishOrder; import cn.toesbieya.jxc.model.entity.StatProfitGoods; import cn.toesbieya.jxc.model.entity.StatProfitTotal; import cn.toesbieya.jxc.model.vo.statictis.FourBlockStat; -import cn.toesbieya.jxc.utils.WebSocketUtil; +import cn.toesbieya.jxc.util.WebSocketUtil; import cn.toesbieya.jxc.mapper.StatisticMapper; -import cn.toesbieya.jxc.utils.DateUtil; +import cn.toesbieya.jxc.util.DateUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java index b289d3b..6737f7b 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseInboundService.java @@ -16,9 +16,9 @@ import cn.toesbieya.jxc.model.vo.result.PageResult; import cn.toesbieya.jxc.model.vo.search.PurchaseInboundSearch; import cn.toesbieya.jxc.model.vo.update.DocStatusUpdate; import cn.toesbieya.jxc.service.RecService; -import cn.toesbieya.jxc.utils.DocUtil; -import cn.toesbieya.jxc.utils.ExcelUtil; -import cn.toesbieya.jxc.utils.Util; +import cn.toesbieya.jxc.util.DocUtil; +import cn.toesbieya.jxc.util.ExcelUtil; +import cn.toesbieya.jxc.util.Util; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java index cf80393..ef7a524 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizPurchaseOrderService.java @@ -19,8 +19,8 @@ import cn.toesbieya.jxc.model.vo.result.PageResult; import cn.toesbieya.jxc.model.vo.search.PurchaseOrderSearch; import cn.toesbieya.jxc.model.vo.update.DocStatusUpdate; import cn.toesbieya.jxc.service.RecService; -import cn.toesbieya.jxc.utils.DocUtil; -import cn.toesbieya.jxc.utils.ExcelUtil; +import cn.toesbieya.jxc.util.DocUtil; +import cn.toesbieya.jxc.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java index 47a94b9..3f9eea3 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOrderService.java @@ -19,8 +19,8 @@ import cn.toesbieya.jxc.model.vo.search.StockSearch; import cn.toesbieya.jxc.model.vo.update.DocStatusUpdate; import cn.toesbieya.jxc.service.BizStockService; import cn.toesbieya.jxc.service.RecService; -import cn.toesbieya.jxc.utils.DocUtil; -import cn.toesbieya.jxc.utils.ExcelUtil; +import cn.toesbieya.jxc.util.DocUtil; +import cn.toesbieya.jxc.util.ExcelUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java index d699d84..c46d784 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/doc/BizSellOutboundService.java @@ -17,9 +17,9 @@ import cn.toesbieya.jxc.model.vo.search.SellOutboundSearch; import cn.toesbieya.jxc.model.vo.update.DocStatusUpdate; import cn.toesbieya.jxc.service.BizStockService; import cn.toesbieya.jxc.service.RecService; -import cn.toesbieya.jxc.utils.DocUtil; -import cn.toesbieya.jxc.utils.ExcelUtil; -import cn.toesbieya.jxc.utils.Util; +import cn.toesbieya.jxc.util.DocUtil; +import cn.toesbieya.jxc.util.ExcelUtil; +import cn.toesbieya.jxc.util.Util; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java index b9ace9d..9d971ce 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/msg/MsgService.java @@ -9,7 +9,7 @@ import cn.toesbieya.jxc.model.vo.Result; import cn.toesbieya.jxc.model.vo.SocketEventVo; import cn.toesbieya.jxc.model.vo.result.PageResult; import cn.toesbieya.jxc.model.vo.search.MsgSearch; -import cn.toesbieya.jxc.utils.WebSocketUtil; +import cn.toesbieya.jxc.util.WebSocketUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysCustomerService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysCustomerService.java index b628f89..9e85a0c 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysCustomerService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysCustomerService.java @@ -11,7 +11,7 @@ import cn.toesbieya.jxc.model.vo.Result; import cn.toesbieya.jxc.model.vo.result.PageResult; import cn.toesbieya.jxc.model.vo.result.RegionValueResult; import cn.toesbieya.jxc.model.vo.search.CustomerSearch; -import cn.toesbieya.jxc.utils.Util; +import cn.toesbieya.jxc.util.Util; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysDepartmentService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysDepartmentService.java index fea6510..907ef76 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysDepartmentService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysDepartmentService.java @@ -8,7 +8,7 @@ import cn.toesbieya.jxc.model.entity.SysRole; import cn.toesbieya.jxc.model.entity.SysUser; import cn.toesbieya.jxc.model.vo.DepartmentVo; import cn.toesbieya.jxc.model.vo.Result; -import cn.toesbieya.jxc.utils.Util; +import cn.toesbieya.jxc.util.Util; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysSupplierService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysSupplierService.java index 794ffde..eb7ac7c 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysSupplierService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysSupplierService.java @@ -11,7 +11,7 @@ import cn.toesbieya.jxc.model.vo.SupplierVo; import cn.toesbieya.jxc.model.vo.result.PageResult; import cn.toesbieya.jxc.model.vo.result.RegionValueResult; import cn.toesbieya.jxc.model.vo.search.SupplierSearch; -import cn.toesbieya.jxc.utils.Util; +import cn.toesbieya.jxc.util.Util; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysUserService.java b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysUserService.java index 1f30f00..2509be7 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysUserService.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/service/sys/SysUserService.java @@ -9,8 +9,8 @@ import cn.toesbieya.jxc.model.vo.Result; import cn.toesbieya.jxc.model.vo.UserVo; import cn.toesbieya.jxc.model.vo.result.PageResult; import cn.toesbieya.jxc.model.vo.search.UserSearch; -import cn.toesbieya.jxc.utils.Util; -import cn.toesbieya.jxc.utils.WebSocketUtil; +import cn.toesbieya.jxc.util.Util; +import cn.toesbieya.jxc.util.WebSocketUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/DateUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/DateUtil.java similarity index 98% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/DateUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/DateUtil.java index 51d88cf..a5ce3ac 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/DateUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/DateUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import java.time.Instant; import java.time.LocalDateTime; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/DocUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/DocUtil.java similarity index 99% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/DocUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/DocUtil.java index 2678f1e..bf77eaf 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/DocUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/DocUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import cn.toesbieya.jxc.constant.DocConstant; import cn.toesbieya.jxc.model.entity.BizDoc; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/ExcelUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/ExcelUtil.java similarity index 99% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/ExcelUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/ExcelUtil.java index 0bea83b..f0cb4c3 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/ExcelUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/ExcelUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import cn.toesbieya.jxc.model.vo.Result; import com.alibaba.excel.EasyExcel; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/IpUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/IpUtil.java similarity index 99% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/IpUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/IpUtil.java index b15f3c6..5436e83 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/IpUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/IpUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/RedisUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/RedisUtil.java similarity index 99% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/RedisUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/RedisUtil.java index e53976f..18655e4 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/RedisUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/RedisUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import com.google.common.io.ByteStreams; import lombok.extern.slf4j.Slf4j; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/SecurityUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/SecurityUtil.java similarity index 94% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/SecurityUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/SecurityUtil.java index 54ceedb..af907e9 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/SecurityUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/SecurityUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import cn.toesbieya.jxc.model.vo.UserVo; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/SessionUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/SessionUtil.java similarity index 98% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/SessionUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/SessionUtil.java index c922d55..af678a8 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/SessionUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/SessionUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import cn.toesbieya.jxc.model.entity.SysUser; import com.alibaba.fastjson.JSONObject; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/SpringUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/SpringUtil.java similarity index 98% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/SpringUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/SpringUtil.java index ddb9072..dc0a2a1 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/SpringUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/SpringUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/ThreadUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/ThreadUtil.java similarity index 97% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/ThreadUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/ThreadUtil.java index fac7bab..3561f77 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/ThreadUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/ThreadUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import cn.toesbieya.jxc.model.entity.RecUserAction; import cn.toesbieya.jxc.model.vo.UserVo; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/Util.java b/java/local/src/main/java/cn/toesbieya/jxc/util/Util.java similarity index 98% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/Util.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/Util.java index d7b9b81..782026b 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/Util.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/Util.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import org.springframework.util.StringUtils; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/WebSocketUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/WebSocketUtil.java similarity index 97% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/WebSocketUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/WebSocketUtil.java index c1acdb4..7ae7f0d 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/WebSocketUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/WebSocketUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import cn.toesbieya.jxc.constant.SocketConstant; import cn.toesbieya.jxc.model.vo.SocketEventVo; diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/WebUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/util/WebUtil.java similarity index 96% rename from java/local/src/main/java/cn/toesbieya/jxc/utils/WebUtil.java rename to java/local/src/main/java/cn/toesbieya/jxc/util/WebUtil.java index 7a4b7eb..9f009ef 100644 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/WebUtil.java +++ b/java/local/src/main/java/cn/toesbieya/jxc/util/WebUtil.java @@ -1,4 +1,4 @@ -package cn.toesbieya.jxc.utils; +package cn.toesbieya.jxc.util; import cn.toesbieya.jxc.model.vo.Result; import com.alibaba.fastjson.JSON; @@ -14,7 +14,6 @@ public class WebUtil { public static void responseJson(HttpServletResponse response, Result result) throws IOException { response.setCharacterEncoding("UTF-8"); response.setContentType("application/json; charset=utf-8"); - response.getWriter().print(JSON.toJSONString(result)); } diff --git a/java/local/src/main/java/cn/toesbieya/jxc/utils/QiniuUtil.java b/java/local/src/main/java/cn/toesbieya/jxc/utils/QiniuUtil.java deleted file mode 100644 index b37aaf5..0000000 --- a/java/local/src/main/java/cn/toesbieya/jxc/utils/QiniuUtil.java +++ /dev/null @@ -1,71 +0,0 @@ -package cn.toesbieya.jxc.utils; - -import cn.toesbieya.jxc.config.QiniuConfig; -import com.qiniu.common.QiniuException; -import com.qiniu.storage.BucketManager; -import com.qiniu.storage.Configuration; -import com.qiniu.storage.Region; -import com.qiniu.util.Auth; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.DependsOn; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; - -import java.util.List; - -@Slf4j -@Component -@DependsOn("redisUtil") -public class QiniuUtil { - private static QiniuConfig config; - private static Auth AUTH ; - private static BucketManager BUCKET_MANAGER; - - @Autowired - public QiniuUtil(QiniuConfig config) { - QiniuUtil.config = config; - - if (StringUtils.isEmpty(config.getAccessKey())) { - QiniuUtil.AUTH = null; - QiniuUtil.BUCKET_MANAGER = null; - return; - } - - QiniuUtil.AUTH = Auth.create(config.getAccessKey(), config.getSecretKey()); - QiniuUtil.BUCKET_MANAGER = new BucketManager(QiniuUtil.AUTH, new Configuration(Region.huadong())); - } - - public static String getToken() { - String token = (String) RedisUtil.get(config.getRedisCacheKey()); - - if (token == null) { - token = AUTH.uploadToken(config.getBucket()); - RedisUtil.set(config.getRedisCacheKey(), token, config.getTokenExpire()); - } - - return token; - } - - public static void delete(String key) { - try { - BUCKET_MANAGER.delete(config.getBucket(), key); - } catch (QiniuException e) { - log.info("七牛云删除单个文件失败,{}", e.getMessage()); - } - } - - public static void deleteBatch(String... key) { - BucketManager.BatchOperations batchOperations = new BucketManager.BatchOperations(); - batchOperations.addDeleteOp(config.getBucket(), key); - try { - BUCKET_MANAGER.batch(batchOperations); - } catch (QiniuException e) { - log.info("七牛云批量删除文件失败,{}", e.getMessage()); - } - } - - public static void deleteBatch(List key) { - deleteBatch(key.toArray(new String[0])); - } -}